Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PSP-7832: Automation changes for IS74 #3814

Merged
merged 18 commits into from
Feb 23, 2024
Merged

PSP-7832: Automation changes for IS74 #3814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e5b4f96
Merge pull request #3723 from bcgov/v4.2.0-69.18-release-temp
asanchezr Jan 18, 2024
beee21f
Automation refactoring - Change of models and functions to avois warn…
stairaku Feb 1, 2024
fa97e4f
Merge branch 'automation-branch' of https://github.com/stairaku/PSP i…
stairaku Feb 1, 2024
893096d
Automation refactoring - Change of models and functions to avois warn…
stairaku Feb 1, 2024
b60551d
Automation fixes related to new modals
stairaku Feb 7, 2024
005583c
Resolved conflicts from merging
stairaku Feb 7, 2024
c513d46
Merge branch 'dev' of https://github.com/bcgov/PSP into automation-br…
stairaku Feb 7, 2024
66ea647
Merge branch 'dev' into automation-branch
devinleighsmith Feb 8, 2024
5648e40
Merge branch 'bcgov:dev' into automation-branch
stairaku Feb 9, 2024
01d765d
Disposition Files - Offers and Sale Tab
stairaku Feb 9, 2024
d146619
Merge branch 'automation-branch' of https://github.com/stairaku/PSP i…
stairaku Feb 9, 2024
74bbc4e
Disposition Files - Offers and Sale Tab
stairaku Feb 9, 2024
fdae7de
Merge branch 'bcgov:dev' into automation-branch
stairaku Feb 14, 2024
156dd37
Update Nuget packages
stairaku Feb 15, 2024
4744235
Merge branch 'automation-branch' of https://github.com/stairaku/PSP i…
stairaku Feb 15, 2024
474fb9c
Merge branch 'bcgov:dev' into automation-branch
stairaku Feb 23, 2024
418c2b4
Changes on automation to adapt changes on PIMS IS74
stairaku Feb 23, 2024
1709719
Merge branch 'automation-branch' of https://github.com/stairaku/PSP i…
stairaku Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions testing/PIMS.Tests.Automation/Classes/AcquisitionFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,17 @@ public class TeamMember

public class AcquisitionOwner
{
public string ContactType { get; set; } = null!;
public bool isPrimary { get; set; } = false;
public string GivenNames { get; set; } = null!;
public string LastName { get; set; } = null!;
public string OtherName { get; set; } = null!;
public string CorporationName { get; set; } = null!;
public string IncorporationNumber { get; set; } = null!;
public string RegistrationNumber { get; set; } = null!;
public string MailAddressLine1 { get; set; } = null!;
public string MailAddressLine2 { get; set; } = null!;
public string MailAddressLine3 { get; set; } = null!;
public string MailCity { get; set; } = null!;
public string MailProvince { get; set; } = null!;
public string MailCountry { get; set; } = null!;
public string MailOtherCountry { get; set; } = null!;
public string MailPostalCode { get; set; } = null!;
public string Email { get; set; } = null!;
public string Phone { get; set; } = null!;
public string OwnerContactType { get; set; } = null!;
public bool OwnerIsPrimary { get; set; } = false;
public string OwnerGivenNames { get; set; } = null!;
public string OwnerLastName { get; set; } = null!;
public string OwnerOtherName { get; set; } = null!;
public string OwnerCorporationName { get; set; } = null!;
public string OwnerIncorporationNumber { get; set; } = null!;
public string OwnerRegistrationNumber { get; set; } = null!;
public Address OwnerMailAddress { get; set; } = new Address();
public string OwnerEmail { get; set; } = null!;
public string OwnerPhone { get; set; } = null!;
}

public class AcquisitionFileChecklist
Expand Down
2 changes: 2 additions & 0 deletions testing/PIMS.Tests.Automation/Classes/DispositionFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
public class DispositionFile
{
public string DispositionFileStatus { get; set; } = null!;
public string DispositionProject { get; set; } = null!;
public string DispositionProjProduct { get; set; } = null!;
public string DispositionProjFunding { get; set; } = null!;
public string DispositionAssignedDate { get; set; } = null!;
public string DispositionCompletedDate { get; set; } = null!;
Expand Down
Binary file modified testing/PIMS.Tests.Automation/Data/PIMS_Testing_Data.xlsx
View file
Open in desktop
Binary file not shown.
13 changes: 2 additions & 11 deletions testing/PIMS.Tests.Automation/Drivers/BrowserDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,10 @@ private IWebDriver CreateChromeWebDriver()
{
var options = new ChromeOptions();
if (runAutomationHeadless)
{
options.AddArguments("window-size=1920,1080", "headless", "no-sandbox");
}
else
{
options.AddArguments("start-maximized");
}

var chromeDriver = new ChromeDriver(ChromeDriverService.CreateDefaultService(), options);
//chromeDriver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(120);
//chromeDriver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(120);
Expand All @@ -49,14 +46,10 @@ private IWebDriver CreateEdgeWebDriver()
{
var options = new EdgeOptions();
if (runAutomationHeadless)
{
options.AddArguments("window-size=1920,1080", "headless");
}
else
{
options.AddArguments("start-maximized");
}


var edgeDriver = new EdgeDriver(EdgeDriverService.CreateDefaultService(), options, TimeSpan.FromMinutes(3));
edgeDriver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(120);
edgeDriver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(120);
Expand All @@ -75,9 +68,7 @@ private IConfiguration ReadConfiguration() =>
public void Dispose()
{
if (currentWebDriverLazy.IsValueCreated && closeBrowserOnDispose)
{
Current.Quit();
}
}
}
}
4 changes: 4 additions & 0 deletions testing/PIMS.Tests.Automation/Features/DispositionFiles.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@ Scenario: 06. Disposition File Notes
Scenario: 07. Disposition File from PIN
Given I create a new Disposition File from row number 12
Then A new Disposition file is created successfully

Scenario: 08. Disposition Files List View
Given I search for an existing Disposition File from row number 2
Then Expected Disposition File Content is displayed on Disposition File List View
28 changes: 28 additions & 0 deletions testing/PIMS.Tests.Automation/Features/DispositionFiles.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions testing/PIMS.Tests.Automation/PIMS.Tests.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Selenium.Support" Version="4.17.0" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="121.0.6167.8500" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Selenium.Support" Version="4.18.1" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.5700" />
<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading
Loading