diff --git a/source/frontend/package-lock.json b/source/frontend/package-lock.json index 17f37aee62..87ad09f252 100644 --- a/source/frontend/package-lock.json +++ b/source/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "6.1.0-118.12", + "version": "6.1.0-118.19", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "frontend", - "version": "6.1.0-118.12", + "version": "6.1.0-118.19", "dependencies": { "@bcgov/bc-sans": "1.0.1", "@bcgov/design-tokens": "3.0.0-rc1", diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyImprovements/list/PropertyImprovementsListView.tsx b/source/frontend/src/features/mapSideBar/property/tabs/propertyImprovements/list/PropertyImprovementsListView.tsx index 07af0a7e00..a03712f9c0 100644 --- a/source/frontend/src/features/mapSideBar/property/tabs/propertyImprovements/list/PropertyImprovementsListView.tsx +++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyImprovements/list/PropertyImprovementsListView.tsx @@ -92,6 +92,7 @@ export const PropertyImprovementsListView: React.FunctionComponent< > diff --git a/source/frontend/src/features/mapSideBar/shared/improvements/PropertyImprovementDetails/PropertyImprovementDetails.tsx b/source/frontend/src/features/mapSideBar/shared/improvements/PropertyImprovementDetails/PropertyImprovementDetails.tsx index 370ea42722..61331ebd16 100644 --- a/source/frontend/src/features/mapSideBar/shared/improvements/PropertyImprovementDetails/PropertyImprovementDetails.tsx +++ b/source/frontend/src/features/mapSideBar/shared/improvements/PropertyImprovementDetails/PropertyImprovementDetails.tsx @@ -4,17 +4,18 @@ import { prettyFormatDate } from '@/utils/dateUtils'; export interface IPropertyImprovementDetailsProps { propertyImprovement: ApiGen_Concepts_PropertyImprovement; + propertyImprovementIndex?: number; } export const PropertyImprovementDetails: React.FunctionComponent< IPropertyImprovementDetailsProps -> = ({ propertyImprovement }) => { +> = ({ propertyImprovement, propertyImprovementIndex }) => { return ( <> {propertyImprovement.improvementName ?? ''} @@ -22,7 +23,7 @@ export const PropertyImprovementDetails: React.FunctionComponent< {propertyImprovement.improvementTypeCode?.description} @@ -30,7 +31,7 @@ export const PropertyImprovementDetails: React.FunctionComponent< {prettyFormatDate(propertyImprovement.improvementDate)} @@ -38,7 +39,7 @@ export const PropertyImprovementDetails: React.FunctionComponent< {propertyImprovement.improvementStatusCode?.description} @@ -46,7 +47,7 @@ export const PropertyImprovementDetails: React.FunctionComponent< {propertyImprovement.improvementDescription ?? ''} diff --git a/testing/PIMS.Tests.Automation/Classes/AcquisitionFile.cs b/testing/PIMS.Tests.Automation/Classes/AcquisitionFile.cs index dbcc623462..6599200264 100644 --- a/testing/PIMS.Tests.Automation/Classes/AcquisitionFile.cs +++ b/testing/PIMS.Tests.Automation/Classes/AcquisitionFile.cs @@ -152,7 +152,6 @@ public class Agreement public string AgreementType { get; set; } = null!; public string AgreementDate { get; set; } = null!; public string AgreementCompletionDate { get; set; } = null!; - public string AgreementCommencementDate { get; set; } = null!; public string AgreementTerminationDate { get; set; } = null!; public string AgreementPossessionDate { get; set; } = null!; public string AgreementPurchasePrice { get; set; } = null!; diff --git a/testing/PIMS.Tests.Automation/Classes/Lease.cs b/testing/PIMS.Tests.Automation/Classes/Lease.cs index 157ef2cfff..64b47870d2 100644 --- a/testing/PIMS.Tests.Automation/Classes/Lease.cs +++ b/testing/PIMS.Tests.Automation/Classes/Lease.cs @@ -63,6 +63,7 @@ public class Lease public int RepresentativeNumber { get; set; } = 0; public int PropertyManagerNumber { get; set; } = 0; public int UnknownTenantNumber { get; set; } = 0; + public int OtherTenantNumber { get; set; } = 0; public int OwnerPayeeNumber { get; set; } = 0; public int OwnerRepresentativeNumber { get; set; } = 0; public List LeaseTenants { get; set; } = new List(); diff --git a/testing/PIMS.Tests.Automation/Classes/Property.cs b/testing/PIMS.Tests.Automation/Classes/Property.cs index a760efdf33..0e8ce3ff16 100644 --- a/testing/PIMS.Tests.Automation/Classes/Property.cs +++ b/testing/PIMS.Tests.Automation/Classes/Property.cs @@ -178,7 +178,10 @@ public class SurveyParcel public class PropertyImprovement { + public string ImprovementName { get; set; } = null!; public string ImprovementType { get; set; } = null!; + public string ImprovementStatus { get; set; } = null!; + public string ImprovementDate { get; set; } = null!; public string ImprovementDescription { get; set; } = null!; } } diff --git a/testing/PIMS.Tests.Automation/Data/PIMS_Testing_Data.xlsx b/testing/PIMS.Tests.Automation/Data/PIMS_Testing_Data.xlsx index 74dce2ea4f..d6e9100c15 100644 Binary files a/testing/PIMS.Tests.Automation/Data/PIMS_Testing_Data.xlsx and b/testing/PIMS.Tests.Automation/Data/PIMS_Testing_Data.xlsx differ diff --git a/testing/PIMS.Tests.Automation/Data/~$PIMS_Testing_Data.xlsx b/testing/PIMS.Tests.Automation/Data/~$PIMS_Testing_Data.xlsx new file mode 100644 index 0000000000..34ca656439 Binary files /dev/null and b/testing/PIMS.Tests.Automation/Data/~$PIMS_Testing_Data.xlsx differ diff --git a/testing/PIMS.Tests.Automation/Features/ManagementFiles.feature b/testing/PIMS.Tests.Automation/Features/ManagementFiles.feature index 84213b59cb..ea9ae0577f 100644 --- a/testing/PIMS.Tests.Automation/Features/ManagementFiles.feature +++ b/testing/PIMS.Tests.Automation/Features/ManagementFiles.feature @@ -20,7 +20,7 @@ Scenario: 03._Management_Files_Digital_Documents Given I create a new Management File from row number 6 When I add Properties to the Management File And I create Digital Documents for a "Management File" from row number 14 - And I checked related file documents on properties documents + #And I checked related file documents on properties documents And I edit a Digital Document for a "Management File" from row number 15 Then A new Management file is created or updated successfully diff --git a/testing/PIMS.Tests.Automation/Features/ManagementFiles.feature.cs b/testing/PIMS.Tests.Automation/Features/ManagementFiles.feature.cs index 8896a70acd..8da7933da9 100644 --- a/testing/PIMS.Tests.Automation/Features/ManagementFiles.feature.cs +++ b/testing/PIMS.Tests.Automation/Features/ManagementFiles.feature.cs @@ -242,9 +242,6 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, globa #line 22 await testRunner.AndAsync("I create Digital Documents for a \"Management File\" from row number 14", ((string)(null)), ((global::Reqnroll.Table)(null)), "And "); #line hidden -#line 23 - await testRunner.AndAsync("I checked related file documents on properties documents", ((string)(null)), ((global::Reqnroll.Table)(null)), "And "); -#line hidden #line 24 await testRunner.AndAsync("I edit a Digital Document for a \"Management File\" from row number 15", ((string)(null)), ((global::Reqnroll.Table)(null)), "And "); #line hidden diff --git a/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature b/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature index c8f0919a5f..6659975ddb 100644 --- a/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature +++ b/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature @@ -27,8 +27,8 @@ Scenario: 04._Research_File_Notes And I edit a Note on the Notes Tab from row number 2 Then A new Research File is created successfully -Scenario: 05._Research_File_from_Pin - Given I create a Research File from a pin on map and from row number 6 +Scenario: 05._Research_File_from_Search + Given I create a Research File from a search on map and from row number 6 Then A new Research File is created successfully Scenario: 06._Research_File_List_View diff --git a/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs b/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs index 3a3d193998..43098a23f2 100644 --- a/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs +++ b/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs @@ -283,15 +283,15 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, globa await this.ScenarioCleanupAsync(); } - [global::Xunit.SkippableFactAttribute(DisplayName="05._Research_File_from_Pin")] + [global::Xunit.SkippableFactAttribute(DisplayName="05._Research_File_from_Search")] [global::Xunit.TraitAttribute("FeatureTitle", "ResearchFiles")] - [global::Xunit.TraitAttribute("Description", "05._Research_File_from_Pin")] - public async global::System.Threading.Tasks.Task _05__Research_File_From_Pin() + [global::Xunit.TraitAttribute("Description", "05._Research_File_from_Search")] + public async global::System.Threading.Tasks.Task _05__Research_File_From_Search() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); string pickleIndex = "4"; - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("05._Research_File_from_Pin", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("05._Research_File_from_Search", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); string[] tagsOfRule = ((string[])(null)); global::Reqnroll.RuleInfo ruleInfo = null; #line 30 @@ -305,7 +305,7 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, globa { await this.ScenarioStartAsync(); #line 31 - await testRunner.GivenAsync("I create a Research File from a pin on map and from row number 6", ((string)(null)), ((global::Reqnroll.Table)(null)), "Given "); + await testRunner.GivenAsync("I create a Research File from a search on map and from row number 6", ((string)(null)), ((global::Reqnroll.Table)(null)), "Given "); #line hidden #line 32 await testRunner.ThenAsync("A new Research File is created successfully", ((string)(null)), ((global::Reqnroll.Table)(null)), "Then "); diff --git a/testing/PIMS.Tests.Automation/PIMS.Tests.Automation.csproj b/testing/PIMS.Tests.Automation/PIMS.Tests.Automation.csproj index 7b0f24a73e..7072b629b0 100644 --- a/testing/PIMS.Tests.Automation/PIMS.Tests.Automation.csproj +++ b/testing/PIMS.Tests.Automation/PIMS.Tests.Automation.csproj @@ -19,24 +19,24 @@ - - - - + + + + - - + + - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/testing/PIMS.Tests.Automation/PageObjects/DigitalDocuments.cs b/testing/PIMS.Tests.Automation/PageObjects/DigitalDocuments.cs index 634d33e0a9..2967670164 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/DigitalDocuments.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/DigitalDocuments.cs @@ -194,7 +194,7 @@ public class DigitalDocuments: PageObjectBase private readonly By documentViewElectoralDistrictContent = By.XPath("//label[contains(text(),'Electoral district')]/parent::div/following-sibling::div"); private readonly By documentViewEndDateContent = By.XPath("//label[contains(text(),'End date')]/parent::div/following-sibling::div"); private readonly By documentViewFieldBookContent = By.XPath("//label[contains(text(),'Field book #/Year')]/parent::div/following-sibling::div"); - private readonly By documentViewFileNumberContent = By.XPath("//div[@class='pr-0 text-left col-4']/label[contains(text(),'File #')]/parent::div/following-sibling::div"); + private readonly By documentViewFileNumberContent = By.XPath("//div[@class='pr-0 text-left col-4']/label[contains(text(),'MoTI file #')]/parent::div/following-sibling::div"); private readonly By documentViewGazetteDateContent = By.XPath("//label[contains(text(),'Gazette date')]/parent::div/following-sibling::div"); private readonly By documentViewGazettePageContent = By.XPath("//label[contains(text(),'Gazette page #')]/parent::div/following-sibling::div"); private readonly By documentViewGazettePublishedDateContent = By.XPath("//label[contains(text(),'Gazette published date')]/parent::div/following-sibling::div"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/DispositionChecklist.cs b/testing/PIMS.Tests.Automation/PageObjects/DispositionChecklist.cs index 8fec0cc55b..d09cdc5182 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/DispositionChecklist.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/DispositionChecklist.cs @@ -15,93 +15,90 @@ public class DispositionChecklist : PageObjectBase private By checklistFileInitiationTitle = By.XPath("//h2/div/div[contains(text(),'File Initiation')]"); private By checklistFileInitiation1Label = By.CssSelector("div[data-testid='File Initiation'] div:first-child div:nth-child(1) label"); private By checklistFileInitiation1Content = By.CssSelector("div[data-testid='File Initiation'] div:first-child div:nth-child(1) div:nth-child(2) span"); - private By checklistFileInitiation2LabelLabel = By.CssSelector("div[data-testid='File Initiation'] div:first-child div:nth-child(2) label"); + private By checklistFileInitiation2Label = By.CssSelector("div[data-testid='File Initiation'] div div:nth-child(2) label"); private By checklistFileInitiation2Content = By.CssSelector("div[data-testid='File Initiation'] div:first-child div:nth-child(2) div:nth-child(2) span"); - private By checklistFileInitiation3Label = By.CssSelector("div[data-testid='File Initiation'] div:first-child div:nth-child(3) label"); - private By checklistFileInitiation3Content = By.CssSelector("div[data-testid='File Initiation'] div:first-child div:nth-child(3) div:nth-child(2) span"); - private By checklistFileInitiation4Label = By.CssSelector("div[data-testid='File Initiation'] div:first-child div:nth-child(4) label"); - private By checklistFileInitiation4Content = By.CssSelector("div[data-testid='File Initiation'] div:first-child div:nth-child(4) div:nth-child(2) span"); + private By checklistFileInitiation3Label = By.CssSelector("div[data-testid='File Initiation'] div div:nth-child(3) label"); + private By checklistFileInitiation3Content = By.CssSelector("div[data-testid='File Initiation'] div div:nth-child(3) div:nth-child(2) div:nth-child(2) span"); + private By checklistFileInitiation4Label = By.CssSelector("div[data-testid='File Initiation'] div div:nth-child(4) label"); + private By checklistFileInitiation4Content = By.CssSelector("div[data-testid='File Initiation'] div div:nth-child(4) div:nth-child(2) div:nth-child(2) span"); //Disposition Preparation section View Elements private By checklistDispositionPreparationTitle = By.XPath("//h2/div/div[contains(text(),'Disposition Preparation')]"); - private By checklistDispositionPreparation1Label = By.CssSelector("div[data-testid='Disposition Preparation'] div:first-child div:nth-child(1) label"); + private By checklistDispositionPreparation1Label = By.CssSelector("div[data-testid='Disposition Preparation'] div div:nth-child(1) label"); private By checklistDispositionPreparation1Content = By.CssSelector("div[data-testid='Disposition Preparation'] div:first-child div:nth-child(1) div:nth-child(2) span"); - private By checklistDispositionPreparation2Label = By.CssSelector("div[data-testid='Disposition Preparation'] div:first-child div:nth-child(2) label"); + private By checklistDispositionPreparation2Label = By.CssSelector("div[data-testid='Disposition Preparation'] div div:nth-child(2) label"); private By checklistDispositionPreparation2Content = By.CssSelector("div[data-testid='Disposition Preparation'] div:first-child div:nth-child(2) div:nth-child(2) span"); - private By checklistDispositionPreparation3Label = By.CssSelector("div[data-testid='Disposition Preparation'] div:first-child div:nth-child(3) label"); - private By checklistDispositionPreparation3Content = By.CssSelector("div[data-testid='Disposition Preparation'] div:first-child div:nth-child(3) div:nth-child(2) span"); - private By checklistDispositionPreparation4Label = By.CssSelector("div[data-testid='Disposition Preparation'] div:first-child div:nth-child(4) label"); - private By checklistDispositionPreparation4Content = By.CssSelector("div[data-testid='Disposition Preparation'] div:first-child div:nth-child(4) div:nth-child(2) span"); + private By checklistDispositionPreparation3Label = By.CssSelector("div[data-testid='Disposition Preparation'] div div:nth-child(3) label"); + private By checklistDispositionPreparation3Content = By.CssSelector("div[data-testid='Disposition Preparation'] div div:nth-child(3) div:nth-child(2) div:nth-child(2) span"); + private By checklistDispositionPreparation4Label = By.CssSelector("div[data-testid='Disposition Preparation'] div div:nth-child(4) label"); + private By checklistDispositionPreparation4Content = By.CssSelector("div[data-testid='Disposition Preparation'] div div:nth-child(4) div:nth-child(2) div:nth-child(2) span"); //Referrals and Consultations section View Elements private By checklistReferralsAndConsultationsTitle = By.XPath("//h2/div/div[contains(text(),'Referrals and Consultations')]"); - private By checklistReferralsAndConsultations1lLabel = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(1) label"); + private By checklistReferralsAndConsultations1lLabel = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(1) label"); private By checklistReferralsAndConsultations1Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(1) div:nth-child(2) span"); - private By checklistReferralsAndConsultations2Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(2) label"); + private By checklistReferralsAndConsultations2Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(2) label"); private By checklistReferralsAndConsultations2Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(2) div:nth-child(2) span"); - private By checklistReferralsAndConsultations3Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(3) label"); - private By checklistReferralsAndConsultations3Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(3) div:nth-child(2) span"); - private By checklistReferralsAndConsultations4Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(4) label"); - private By checklistReferralsAndConsultations4Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(4) div:nth-child(2) span"); - private By checklistReferralsAndConsultations5Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(5) label"); - private By checklistReferralsAndConsultations5Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(5) div:nth-child(2) span"); - private By checklistReferralsAndConsultations6Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(6) label"); - private By checklistReferralsAndConsultations6Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div:first-child div:nth-child(6) div:nth-child(2) span"); + private By checklistReferralsAndConsultations3Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(3) label"); + private By checklistReferralsAndConsultations3Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(3) div:nth-child(2) div:nth-child(2) span"); + private By checklistReferralsAndConsultations4Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(4) label"); + private By checklistReferralsAndConsultations4Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(4) div:nth-child(2) div:nth-child(2) span"); + private By checklistReferralsAndConsultations5Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(5) label"); + private By checklistReferralsAndConsultations5Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(5) div:nth-child(2) div:nth-child(2) span"); + private By checklistReferralsAndConsultations6Label = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(6) label"); + private By checklistReferralsAndConsultations6Content = By.CssSelector("div[data-testid='Referrals and Consultations'] div div:nth-child(6) div:nth-child(2) div:nth-child(2) span"); //Direct Sale or Road Closure section View Elements private By checklistDirectSaleRoadClosureTitle = By.XPath("//h2/div/div[contains(text(),'Road Closure')]"); - private By checklistDirectSaleRoadClosure1Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(1) label"); - private By checklistDirectSaleRoadClosure1Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(1) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure2Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(2) label"); - private By checklistDirectSaleRoadClosure2Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(2) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure3Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(3) label"); - private By checklistDirectSaleRoadClosure3Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(3) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure4Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(4) label"); - private By checklistDirectSaleRoadClosure4Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(4) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure5Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(5) label"); - private By checklistDirectSaleRoadClosure5Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(5) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure6Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(6) label"); - private By checklistDirectSaleRoadClosure6Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(6) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure7Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(7) label"); - private By checklistDirectSaleRoadClosure7Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(7) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure8Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(8) label"); - private By checklistDirectSaleRoadClosure8Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(8) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure9Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(9) label"); - private By checklistDirectSaleRoadClosure9Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(9) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure10Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(10) label"); - private By checklistDirectSaleRoadClosure10Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(10) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure11Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(11) label"); - private By checklistDirectSaleRoadClosure11Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(11) div:nth-child(2) span"); - private By checklistDirectSaleRoadClosure12Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(12) label"); - private By checklistDirectSaleRoadClosure12Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure'] div:first-child div:nth-child(12) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure1Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(1) label"); + private By checklistDirectSaleRoadClosure1Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div:first-child div:nth-child(1) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure2Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(2) label"); + private By checklistDirectSaleRoadClosure2Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div:first-child div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure3Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(3) label"); + private By checklistDirectSaleRoadClosure3Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(3) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure4Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(4) label"); + private By checklistDirectSaleRoadClosure4Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(4) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure5Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(5) label"); + private By checklistDirectSaleRoadClosure5Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(5) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure6Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(6) label"); + private By checklistDirectSaleRoadClosure6Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(6) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure7Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(7) label"); + private By checklistDirectSaleRoadClosure7Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(7) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure8Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(8) label"); + private By checklistDirectSaleRoadClosure8Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(8) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure9Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(9) label"); + private By checklistDirectSaleRoadClosure9Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(9) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure10Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(10) label"); + private By checklistDirectSaleRoadClosure10Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(10) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure11Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(11) label"); + private By checklistDirectSaleRoadClosure11Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(11) div:nth-child(2) div:nth-child(2) span"); + private By checklistDirectSaleRoadClosure12Label = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(12) label"); + private By checklistDirectSaleRoadClosure12Content = By.CssSelector("div[data-testid='Direct Sale or Road Closure or SRW'] div div:nth-child(12) div:nth-child(2) div:nth-child(2) span"); //Sale Information section View Elements private By checklistSaleInformationTitle = By.XPath("//h2/div/div[contains(text(),'Sale Information')]"); - private By checklistSaleInformation1Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(1) label"); - private By checklistSaleInformation1Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(1) div:nth-child(2) span"); - private By checklistSaleInformation2Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(2) label"); - private By checklistSaleInformation2Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(2) div:nth-child(2) span"); - private By checklistSaleInformation3Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(3) label"); - private By checklistSaleInformation3Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(3) div:nth-child(2) span"); - private By checklistSaleInformation4Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(4) label"); - private By checklistSaleInformation4Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(4) div:nth-child(2) span"); - private By checklistSaleInformation5Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(5) label"); - private By checklistSaleInformation5Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(5) div:nth-child(2) span"); - private By checklistSaleInformation6Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(6) label"); - private By checklistSaleInformation6Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(6) div:nth-child(2) span"); - private By checklistSaleInformation7Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(7) label"); - private By checklistSaleInformation7Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(7) div:nth-child(2) span"); - private By checklistSaleInformation8Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(8) label"); - private By checklistSaleInformation8Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(8) div:nth-child(2) span"); - private By checklistSaleInformation9Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(9) label"); - private By checklistSaleInformation9Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(9) div:nth-child(2) span"); - private By checklistSaleInformation10Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(10) label"); - private By checklistSaleInformation10Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(10) div:nth-child(2) span"); - private By checklistSaleInformation11Label = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(11) label"); - private By checklistSaleInformation11Content = By.CssSelector("div[data-testid='Sale Information'] div:first-child div:nth-child(11) div:nth-child(2) span"); - - // Tool tip element on checklist - private By checklistTooltips = By.CssSelector("span[data-testid='tooltip-icon-section-field-tooltip']"); + private By checklistSaleInformation1Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(1) label"); + private By checklistSaleInformation1Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(1) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation2Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(2) label"); + private By checklistSaleInformation2Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(2) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation3Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(3) label"); + private By checklistSaleInformation3Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(3) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation4Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(4) label"); + private By checklistSaleInformation4Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(4) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation5Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(5) label"); + private By checklistSaleInformation5Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(5) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation6Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(6) label"); + private By checklistSaleInformation6Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(6) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation7Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(7) label"); + private By checklistSaleInformation7Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(7) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation8Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(8) label"); + private By checklistSaleInformation8Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(8) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation9Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(9) label"); + private By checklistSaleInformation9Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(9) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation10Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(10) label"); + private By checklistSaleInformation10Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(10) div:nth-child(2) div:nth-child(2) span"); + private By checklistSaleInformation11Label = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(11) label"); + private By checklistSaleInformation11Content = By.CssSelector("div[data-testid='Sale Information'] div div:nth-child(11) div:nth-child(2) div:nth-child(2) span"); //Checklist Edit Mode Elements private By checklistFileInitiationItem1Select = By.Id("input-checklistSections[0].items[0].statusType"); @@ -188,7 +185,7 @@ public void VerifyChecklistInitViewForm() AssertTrueIsDisplayed(checklistFileInitiationTitle); AssertTrueIsDisplayed(checklistFileInitiation1Label); AssertTrueIsDisplayed(checklistFileInitiation1Content); - AssertTrueIsDisplayed(checklistFileInitiation2LabelLabel); + AssertTrueIsDisplayed(checklistFileInitiation2Label); AssertTrueIsDisplayed(checklistFileInitiation2Content); AssertTrueIsDisplayed(checklistFileInitiation3Label); AssertTrueIsDisplayed(checklistFileInitiation3Content); @@ -212,12 +209,12 @@ public void VerifyChecklistInitViewForm() AssertTrueIsDisplayed(checklistReferralsAndConsultations2Content); AssertTrueIsDisplayed(checklistReferralsAndConsultations3Label); AssertTrueIsDisplayed(checklistReferralsAndConsultations3Content); - Assert.Equal(2,webDriver.FindElements(checklistReferralsAndConsultations4Label).Count); - Assert.Equal(2, webDriver.FindElements(checklistReferralsAndConsultations4Content).Count); - Assert.Equal(2, webDriver.FindElements(checklistReferralsAndConsultations5Label).Count); - Assert.Equal(2, webDriver.FindElements(checklistReferralsAndConsultations5Content).Count); - Assert.Equal(2, webDriver.FindElements(checklistReferralsAndConsultations6Label).Count); - Assert.Equal(2, webDriver.FindElements(checklistReferralsAndConsultations6Content).Count); + AssertTrueIsDisplayed(checklistReferralsAndConsultations4Label); + AssertTrueIsDisplayed(checklistReferralsAndConsultations4Content); + AssertTrueIsDisplayed(checklistReferralsAndConsultations5Label); + AssertTrueIsDisplayed(checklistReferralsAndConsultations5Content); + AssertTrueIsDisplayed(checklistReferralsAndConsultations6Label); + AssertTrueIsDisplayed(checklistReferralsAndConsultations6Content); AssertTrueIsDisplayed(checklistDirectSaleRoadClosureTitle); AssertTrueIsDisplayed(checklistDirectSaleRoadClosure1Label); @@ -269,7 +266,7 @@ public void VerifyChecklistEditForm() AssertTrueIsDisplayed(checklistFileInitiationTitle); AssertTrueIsDisplayed(checklistFileInitiation1Label); AssertTrueIsDisplayed(checklistFileInitiationItem1Select); - AssertTrueIsDisplayed(checklistFileInitiation2LabelLabel); + AssertTrueIsDisplayed(checklistFileInitiation2Label); AssertTrueIsDisplayed(checklistFileInitiationItem2Select); AssertTrueIsDisplayed(checklistFileInitiation3Label); AssertTrueIsDisplayed(checklistFileInitiationItem3Select); @@ -352,7 +349,7 @@ public void VerifyChecklistViewForm(DispositionFileChecklist checklist) AssertTrueIsDisplayed(checklistFileInitiationTitle); AssertTrueIsDisplayed(checklistFileInitiation1Label); AssertTrueContentEquals(checklistFileInitiation1Content, checklist.FileInitiationSelect1); - AssertTrueIsDisplayed(checklistFileInitiation2LabelLabel); + AssertTrueIsDisplayed(checklistFileInitiation2Label); AssertTrueContentEquals(checklistFileInitiation2Content, checklist.FileInitiationSelect2); AssertTrueIsDisplayed(checklistFileInitiation3Label); AssertTrueContentEquals(checklistFileInitiation3Content, checklist.FileInitiationSelect3); diff --git a/testing/PIMS.Tests.Automation/PageObjects/DispositionFileDetails.cs b/testing/PIMS.Tests.Automation/PageObjects/DispositionFileDetails.cs index 13a6346874..b81deb65b6 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/DispositionFileDetails.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/DispositionFileDetails.cs @@ -21,7 +21,7 @@ public class DispositionFileDetails : PageObjectBase private readonly By dispositionFileMainFormDiv = By.XPath("//h1[contains(text(),'Create Disposition File')]/parent::div/parent::div/parent::div/parent::div"); private readonly By dispositionFileCreateTitle = By.XPath("//div[@data-testid='form-title']"); - private readonly By dispositionFileCloseFormBttn = By.CssSelector("div[data-testd='leaflet-buttons-section'] *[data-testid='close-leaflet-button']"); + private readonly By dispositionFileCloseFormBttn = By.CssSelector("div[data-testid='leaflet-buttons-section'] *[data-testid='close-leaflet-button']"); private readonly By dispositionFileHeaderCodeLabel = By.XPath("//label[contains(text(), 'File:')]"); private readonly By dispositionFileHeaderCodeContent = By.XPath("//label[contains(text(), 'File:')]/parent::div/following-sibling::div"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/LeaseConsultations.cs b/testing/PIMS.Tests.Automation/PageObjects/LeaseConsultations.cs index 7c737862f3..173ae8e969 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/LeaseConsultations.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/LeaseConsultations.cs @@ -62,7 +62,7 @@ public class LeaseConsultations : PageObjectBase //Consultation Types Counting Elements private readonly By consultationDistrictCount = By.CssSelector("div[data-testid='consultation-group-section-District'] div[data-testid='consultation-District-items']"); private readonly By consultationEngineeringCount = By.CssSelector("div[data-testid='consultation-group-section-Engineering'] div[data-testid='consultation-Engineering-items']"); - private readonly By consultationFirstNationCount = By.CssSelector("div[data-testid='cconsultation-group-section-First Nation'] div[data-testid='consultation-First Nation-items']"); + private readonly By consultationFirstNationCount = By.CssSelector("div[data-testid='consultation-First Nation-items']"); private readonly By consultationHeadquarterCount = By.CssSelector("div[data-testid='consultation-group-section-Headquarter (HQ)'] div[data-testid='consultation-Headquarter (HQ)-items']"); private readonly By consultationRegionalPlanningCount = By.CssSelector("div[data-testid='consultation-group-section-Regional Planning'] div[data-testid='consultation-Regional Planning-items']"); private readonly By consultationRegionalPropServicesCount = By.CssSelector("div[data-testid='consultation-group-section-Regional Property Services'] div[data-testid='consultation-Regional Property Services-items']"); @@ -231,7 +231,7 @@ public void DeleteFirstConsultationByType(string consultationType) break; case "Other": ButtonElement(consultationOtherExpandBttn); - webDriver.FindElement(By.XPath("div[data-testid='consultation-group-section-Other'] consultations[0].delete-btn")).Click(); + webDriver.FindElement(By.CssSelector("div[data-testid='consultation-Other-items'] button[data-testid='consultations[0].delete-btn']")).Click(); break; } @@ -338,25 +338,25 @@ public void VerifyLastInsertedConsultationView(LeaseConsultation consultation) case "First Nation": ButtonElement(consultationFirstNationExpandBttn); int lastFirstNationConsultation = webDriver.FindElements(consultationFirstNationCount).Count; - AssertTrueIsDisplayed(By.CssSelector("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Requested on')]")); - AssertTrueIsDisplayed(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Requested on')]/span")); - AssertTrueContentEquals(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Requested on')]/parent::div/following-sibling::div"), TransformDateFormat(consultation.leaseConsultationRequestedOn)); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Requested on']")); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Requested on']/span")); + AssertTrueContentEquals(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Requested on']/parent::div/following-sibling::div"), TransformDateFormat(consultation.leaseConsultationRequestedOn)); - AssertTrueIsDisplayed(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Contact')]")); - AssertTrueIsDisplayed(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Contact')]/span")); - AssertTrueContentEquals(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Contact')]/parent::div/following-sibling::div/a[1]/span"), consultation.leaseConsultationContact); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Contact']")); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Contact']/span")); + AssertTrueContentEquals(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Contact']/parent::div/following-sibling::div/a[1]/span"), consultation.leaseConsultationContact); if (consultation.leaseConsultationContactPrimaryContact != "") - AssertTrueContentEquals(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Contact')]/parent::div/following-sibling::div/a[2]/span"), consultation.leaseConsultationContactPrimaryContact); + AssertTrueContentEquals(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Contact']/parent::div/following-sibling::div/a[2]/span"), consultation.leaseConsultationContactPrimaryContact); - AssertTrueIsDisplayed(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Response received')]")); - AssertTrueContentEquals(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Response received')]/parent::div/following-sibling::div"), consultation.leaseConsultationReceived); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Response received']")); + AssertTrueContentEquals(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Response received']/parent::div/following-sibling::div"), consultation.leaseConsultationReceived); - AssertTrueIsDisplayed(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Response received on')]")); - AssertTrueContentEquals(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Response received on')]/parent::div/following-sibling::div"), TransformDateFormat(consultation.leaseConsultationReceivedOn)); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Response received on']")); + AssertTrueContentEquals(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Response received on']/parent::div/following-sibling::div"), TransformDateFormat(consultation.leaseConsultationReceivedOn)); - AssertTrueIsDisplayed(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Comments')]")); - AssertTrueIsDisplayed(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Comments')]/span")); - AssertTrueContentEquals(By.XPath("//span[contains(text(),'First Nation')]/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div["+ lastFirstNationConsultation +"]/div/div/div/div/label[contains(text(),'Comments')]/parent::div/following-sibling::div"), consultation.leaseConsultationComment); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Comments']")); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Comments']/span")); + AssertTrueContentEquals(By.XPath("//div[@data-testid='consultation-First Nation-items']/div["+ lastFirstNationConsultation +"]/div/div/label[text()='Comments']/parent::div/following-sibling::div"), consultation.leaseConsultationComment); break; case "Headquarter (HQ)": ButtonElement(consultationHeadquarterExpandBttn); diff --git a/testing/PIMS.Tests.Automation/PageObjects/LeaseTenants.cs b/testing/PIMS.Tests.Automation/PageObjects/LeaseTenants.cs index dc381b93d0..bcec7629e0 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/LeaseTenants.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/LeaseTenants.cs @@ -36,6 +36,7 @@ public class LeaseTenants: PageObjectBase private readonly By stakeholderTotalRepresentativeView = By.XPath("//div[contains(text(),'Property manager')]/parent::div/parent::h2/parent::div/following-sibling::div/h2/div/div[contains(text(),'Representative')]/parent::div/parent::h2/following-sibling::div/div"); private readonly By stakeholderTotalManagerView = By.XPath("//div[contains(text(),'Property manager')]/parent::div/parent::h2/following-sibling::div/div"); private readonly By stakeholderTotalUnknownView = By.XPath("//div[contains(text(),'Unknown')]/parent::div/parent::h2/following-sibling::div/div"); + private readonly By stakeholderTotalOtherView = By.XPath("//div[contains(text(),'Other')]/parent::div/parent::h2/following-sibling::div/div"); private readonly By stakeholderTotalOwnerView = By.XPath("//div[@class='tab-content']/div/div/div[2]/div/div"); private readonly By stakeholderTotalOwnerRepView = By.XPath("//div[contains(text(),'Owner Representative')]/parent::div/parent::h2/following-sibling::div/div"); @@ -214,6 +215,12 @@ public int TotalOwnerRepresentatives() return webDriver.FindElements(stakeholderTotalOwnerRepView).Count; } + public int TotalTenantOther() + { + Wait(); + return webDriver.FindElements(stakeholderTotalOtherView).Count; + } + public void VerifyStakeholdersInitForm(string accountType) { if (accountType == "Receivable") diff --git a/testing/PIMS.Tests.Automation/PageObjects/ManageUsers.cs b/testing/PIMS.Tests.Automation/PageObjects/ManageUsers.cs index 12370ebb9c..e3038cab9e 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/ManageUsers.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/ManageUsers.cs @@ -28,12 +28,12 @@ public class ManageUsers : PageObjectBase private By userManagerHeaderOrderByFirstNameBttn = By.CssSelector("div[data-testid='sort-column-firstName']"); private By userManagerHeaderLastNameColumn = By.XPath("//div[@data-testid='usersTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Last name')]"); private By userManagerHeaderOrderByLastNameBttn = By.CssSelector("div[data-testid='sort-column-surname']"); - private By userManagerHeaderEmailColumn = By.XPath("//div[@data-testid='usersTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Email')]"); + private By userManagerHeaderEmailColumn = By.XPath("//div[@data-testid='usersTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'E-mail')]"); private By userManagerHeaderOrderByEmailBttn = By.CssSelector("div[data-testid='sort-column-email']"); private By userManagerHeaderPositionColumn = By.XPath("//div[@data-testid='usersTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Position')]"); private By userManagerHeaderOrderByPositionBttn = By.CssSelector("div[data-testid='sort-column-position']"); private By userManagerHeaderRolesColumn = By.XPath("//div[@data-testid='usersTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Roles')]"); - private By userManagerHeaderRegionColumn = By.XPath("//div[@data-testid='usersTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'MOTT region(s)')]"); + private By userManagerHeaderRegionColumn = By.XPath("//div[@data-testid='usersTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'MOTT region')]"); private By userManagerHeaderLastLoginColumn = By.XPath("//div[@data-testid='usersTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Last login')]"); //Table 1st Result by Column Elements diff --git a/testing/PIMS.Tests.Automation/PageObjects/ManagementDetails.cs b/testing/PIMS.Tests.Automation/PageObjects/ManagementDetails.cs index 2b88f778f2..88eff7dd03 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/ManagementDetails.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/ManagementDetails.cs @@ -1,6 +1,4 @@ using OpenQA.Selenium; -using OpenQA.Selenium.BiDi.BrowsingContext; -using OpenQA.Selenium.DevTools.V142.Network; using PIMS.Tests.Automation.Classes; namespace PIMS.Tests.Automation.PageObjects @@ -76,13 +74,13 @@ public class ManagementDetails : PageObjectBase private readonly By managementFileAddAnotherMemberLink = By.CssSelector("button[data-testid='add-team-member']"); private readonly By managementFileViewTeamMembersGroup = By.XPath("//div[contains(text(),'Management Team')]/parent::div/parent::h2/following-sibling::div/div"); - private readonly By managementFileNoticeClaimSubtitle = By.XPath("//h2/div/div[contains(text(),'Notice of Claims')]"); + private readonly By managementFileNoticeClaimSubtitle = By.XPath("//h2/div/div[contains(text(),'Notice of Claim')]"); private readonly By managementFileNoticeClaimReceivedDateLabel = By.XPath("//label[contains(text(),'Received date')]"); private readonly By managementFileNoticeClaimReceivedDateInput = By.Id("datepicker-noticeOfClaim.receivedDate"); private readonly By managementFileNoticeClaimReceivedDateContent = By.XPath("//label[contains(text(),'Received date')]/parent::div/following-sibling::div"); - private readonly By managementFileNoticeClaimCommentsLabel = By.XPath("//label[contains(text(),'Comments')]"); + private readonly By managementFileNoticeClaimCommentsLabel = By.XPath("//label[contains(text(),'Comment')]"); private readonly By managementFileNoticeClaimCommentsInput = By.Id("input-noticeOfClaim.comment"); - private readonly By managementFileNoticeClaimCommentsContent = By.XPath("//label[contains(text(),'Comments')]/parent::div/following-sibling::div"); + private readonly By managementFileNoticeClaimCommentsContent = By.XPath("//label[contains(text(),'Comment')]/parent::div/following-sibling::div"); private readonly By managementFileSummaryBttn = By.CssSelector("button[title='File Details']"); @@ -276,6 +274,8 @@ public void SaveManagementFile() Wait(); } + else + break; } } @@ -470,7 +470,7 @@ public void VerifyManagementDetailsViewForm(ManagementFile mgmtFile) //NOC Received Date AssertTrueIsDisplayed(managementFileNoticeClaimReceivedDateLabel); if (mgmtFile.ManagementNOCReceivedDate != "") - AssertTrueContentEquals(managementFileNoticeClaimReceivedDateContent, mgmtFile.ManagementNOCReceivedDate); + AssertTrueContentEquals(managementFileNoticeClaimReceivedDateContent, TransformDateFormat(mgmtFile.ManagementNOCReceivedDate)); //NOC Comments AssertTrueIsDisplayed(managementFileNoticeClaimCommentsLabel); diff --git a/testing/PIMS.Tests.Automation/PageObjects/Notes.cs b/testing/PIMS.Tests.Automation/PageObjects/Notes.cs index 77e43ff24a..e650267cf2 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/Notes.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/Notes.cs @@ -268,20 +268,21 @@ public void VerifySecondaryNotesListContent(string feature, string note) Wait(); if (feature == "Property") - { - AssertTrueContentNotEquals(propNotesTableName1stContent, ""); - AssertTrueContentNotEquals(propNotesTableNote1stContent, ""); - AssertTrueContentNotEquals(propNotesTableCreatedDate1stContent, ""); - AssertTrueContentNotEquals(propNotesTableLastUpdated1stContent, ""); - AssertTrueIsDisplayed(propNotesTableViewBttn1stContent); - } - else { AssertTrueContentNotEquals(mgmtNotesTableName1stContent, ""); AssertTrueContentNotEquals(mgmtNotesTableNote1stContent, note); AssertTrueContentNotEquals(mgmtNotesTableCreatedDate1stContent, ""); AssertTrueContentNotEquals(mgmtNotesTableLastUpdated1stContent, ""); AssertTrueIsDisplayed(mgmtNotesTableViewBttn1stContent); + + } + else + { + AssertTrueContentNotEquals(propNotesTableName1stContent, ""); + AssertTrueContentNotEquals(propNotesTableNote1stContent, ""); + AssertTrueContentNotEquals(propNotesTableCreatedDate1stContent, ""); + AssertTrueContentNotEquals(propNotesTableLastUpdated1stContent, ""); + AssertTrueIsDisplayed(propNotesTableViewBttn1stContent); } } diff --git a/testing/PIMS.Tests.Automation/PageObjects/PropertyImprovements.cs b/testing/PIMS.Tests.Automation/PageObjects/PropertyImprovements.cs index 10e75af1f0..1e73c84100 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/PropertyImprovements.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/PropertyImprovements.cs @@ -7,12 +7,20 @@ public class PropertyImprovements : PageObjectBase { private readonly By improvementLink = By.CssSelector("a[data-rb-event-key='improvements']"); private readonly By improvementAddButton = By.XPath("//div[text()='Property Improvements']/following-sibling::div/button"); - private readonly By ImprovementTitle = By.XPath("//div[text()='Property Improvements']"); - private readonly By improvementDetailsTitle = By.XPath("//div[text()='Property Improvements Details']"); + private readonly By improvementDetailsTitle = By.XPath("//div[text()='Property Improvement Details']"); + + private readonly By improvementDetailsNameLabel = By.XPath("//label[text()='Name']"); + private readonly By improvementDetailsNameInput = By.Id("input-name"); private readonly By improvementDetailsTypeLabel = By.XPath("//label[text()='Improvement type']"); - private readonly By improvementDetailsTypeSelect = By.Id("input-propertyImprovementTypeCode"); + private readonly By improvementDetailsTypeSelect = By.Id("input-improvementTypeCode"); + + private readonly By improvementDetailsStatusLabel = By.XPath("//label[text()='Improvement status']"); + private readonly By improvementDetailsStatusSelect = By.Id("input-improvementStatusCode"); + + private readonly By improvementDetailsDateLabel = By.XPath("//label[text()='Improvement date']"); + private readonly By improvementDetailsDateInput = By.Id("datepicker-improvementDate"); private readonly By improvementDetailsDescriptionLabel = By.XPath("//label[text()='Description']"); private readonly By improvementDetailsDescriptionInput = By.Id("input-description"); @@ -54,13 +62,24 @@ public void AddImprovementBttn() public void AddUpdateImprovement(PropertyImprovement improvement) { Wait(); - AssertTrueIsDisplayed(ImprovementTitle); + AssertTrueIsDisplayed(improvementDetailsTitle); + + AssertTrueIsDisplayed(improvementDetailsNameLabel); + ClearInput(improvementDetailsNameInput); + webDriver.FindElement(improvementDetailsNameInput).SendKeys(improvement.ImprovementName); AssertTrueIsDisplayed(improvementDetailsTypeLabel); - if (improvement.ImprovementType != "") + ChooseSpecificSelectOption(improvementDetailsTypeSelect, improvement.ImprovementType); + + AssertTrueIsDisplayed(improvementDetailsStatusLabel); + ChooseSpecificSelectOption(improvementDetailsStatusSelect, improvement.ImprovementStatus); + + AssertTrueIsDisplayed(improvementDetailsDateLabel); + if (improvement.ImprovementDate != "") { - ChooseSpecificSelectOption(improvementDetailsTypeSelect, improvement.ImprovementType); - } + ClearInput(improvementDetailsDateInput); + webDriver.FindElement(improvementDetailsDateInput).SendKeys(improvement.ImprovementDate); + } AssertTrueIsDisplayed(improvementDetailsDescriptionLabel); if (improvement.ImprovementDescription != "") @@ -75,9 +94,18 @@ public void VerifyImprovementView(int index, PropertyImprovement improvement) int elementIdx = index + 1; AssertTrueIsDisplayed(improvementDetailsTitle); + + AssertTrueIsDisplayed(improvementDetailsNameLabel); + AssertTrueContentEquals(By.CssSelector("div[data-testid='improvement["+ elementIdx +"].name']"), improvement.ImprovementName); + AssertTrueIsDisplayed(improvementDetailsTypeLabel); - if(improvement.ImprovementType != "") - AssertTrueContentEquals(By.CssSelector("div[data-testid='improvement["+ elementIdx +"].type']"), improvement.ImprovementType); + AssertTrueContentEquals(By.CssSelector("div[data-testid='improvement["+ elementIdx +"].type']"), improvement.ImprovementType); + + AssertTrueIsDisplayed(improvementDetailsDateLabel); + AssertTrueContentEquals(By.CssSelector("div[data-testid='improvement["+ elementIdx +"].date']"), improvement.ImprovementDate); + + AssertTrueIsDisplayed(improvementDetailsStatusLabel); + AssertTrueContentEquals(By.CssSelector("div[data-testid='improvement["+ elementIdx +"].status']"), improvement.ImprovementStatus); AssertTrueIsDisplayed(improvementDetailsDescriptionLabel); if(improvement.ImprovementDescription != "") diff --git a/testing/PIMS.Tests.Automation/PageObjects/PropertyInformation.cs b/testing/PIMS.Tests.Automation/PageObjects/PropertyInformation.cs index 7620311130..1af9a714b3 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/PropertyInformation.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/PropertyInformation.cs @@ -23,11 +23,11 @@ public class PropertyInformation : PageObjectBase //Property Information Tabs Elements private readonly By propertyInformationTabsTotal = By.CssSelector("nav[role='tablist'] a"); private readonly By propertyInformationTitleTab = By.CssSelector("a[data-rb-event-key='ltsa']"); - private readonly By propertyInformationValueTab = By.XPath("a[data-rb-event-key='bcassessment')]"); - private readonly By propertyInformationHwyTab = By.CssSelector("a[data-rb-event-key='highway')]"); - private readonly By propertyInformationPMBCTab = By.CssSelector("a[data-rb-event-key='pmbc')]"); - private readonly By propertyInformationCrownTab = By.CssSelector("a[data-rb-event-key='crown')]"); - private readonly By propertyInformationOtherTab = By.CssSelector("a[data-rb-event-key='other')]"); + private readonly By propertyInformationValueTab = By.CssSelector("a[data-rb-event-key='bcassessment']"); + private readonly By propertyInformationHwyTab = By.CssSelector("a[data-rb-event-key='highway']"); + private readonly By propertyInformationPMBCTab = By.CssSelector("a[data-rb-event-key='pmbc']"); + private readonly By propertyInformationCrownTab = By.CssSelector("a[data-rb-event-key='crown']"); + private readonly By propertyInformationOtherTab = By.CssSelector("a[data-rb-event-key='other']"); private readonly By propertyInformationPlanTab = By.CssSelector("a[data-rb-event-key='plan']"); @@ -255,9 +255,10 @@ public class PropertyInformation : PageObjectBase private readonly By propertyDetailsTenureStatusDiv = By.XPath("//label[contains(text(),'Tenure status')]/parent::div/following-sibling::div/div/div/div"); private readonly By propertyDetailsTenureCleanupLabel = By.XPath("//label[contains(text(),'Tenure cleanup')]"); private readonly By propertyDetailsTenureCleanupDiv = By.XPath("//label[contains(text(),'Tenure cleanup')]/parent::div/following-sibling::div/div/div/div"); - - private readonly By propertyDetailsAdjacentLandTypeLabel = By.XPath("//label[contains(text(),'Adjacent Land type')]"); - private readonly By propertyDetailsAdjacentLandTypeDiv = By.XPath("//label[contains(text(),'Adjacent Land type')]/parent::div/following-sibling::div"); + private readonly By propertyDetailsProvPublicHwyLabel = By.XPath("//label[contains(text(),'Provincial public hwy')]"); + private readonly By propertyDetailsProvPublicHwyDiv = By.XPath("//label[contains(text(),'Provincial public hwy')]/parent::div/following-sibling::div/div/div/div"); + private readonly By propertyDetailsHighwayRoadLabel = By.XPath("//label[contains(text(),'Highway / Road Details')]"); + private readonly By propertyDetailsHighwayRoadDiv = By.XPath("//label[contains(text(),'Highway / Road Details')]/parent::div/following-sibling::div/div/div/div"); private readonly By propertyDetailsFirstNationTitle = By.XPath("//div[contains(text(),'First Nations Information')]"); private readonly By propertyDetailsFirstNationBandNameLabel = By.XPath("//label[contains(text(),'Band name')]"); @@ -325,7 +326,7 @@ public class PropertyInformation : PageObjectBase private readonly By propertyDetailsTenureDeleteBttns = By.CssSelector("div[id='multiselect-tenures'] i[class='custom-close']"); private readonly By propertyDetailsTenureCleanupInput = By.Id("multiselect-tenureCleanups_input"); private readonly By propertyDetailsTenureCleanupOptions = By.XPath("//input[@id='multiselect-tenureCleanups_input']/parent::div/following-sibling::div/ul[@class='optionContainer']"); - private readonly By propertyDetailsTenureCleanupDeleteBttns = By.CssSelector("div[id='multiselect-tenureCleanups_input'] i[class='custom-close']"); + private readonly By propertyDetailsTenureCleanupDeleteBttns = By.CssSelector("div[id='multiselect-tenureCleanups'] i[class='custom-close']"); private readonly By propertyDetailsTenureProvincialHwySelect = By.Id("input-pphStatusTypeCode"); private readonly By propertyDetailsTenureHwyDetailsMultiselect = By.Id("multiselect-roadTypes_input"); private readonly By propertyDetailsTenureHwyDetailsOptions = By.XPath("//input[@id='multiselect-roadTypes_input']/parent::div/following-sibling::div/ul[@class='optionContainer']"); @@ -344,6 +345,7 @@ public class PropertyInformation : PageObjectBase //Property Information Confirmation Modal private readonly By propertyInformationConfirmationModal = By.CssSelector("div[class='modal-content']"); + private readonly By propertyDetailsCancelButton = By.CssSelector("button[data-testid='cancel-button']"); private readonly By propertyDetailsSaveButton = By.CssSelector("button[data-testid='save-button']"); private SharedModals sharedModals; @@ -502,7 +504,7 @@ public void SavePropertyDetails() public void CancelPropertyDetails() { - ButtonElement("Cancel"); + webDriver.FindElement(propertyDetailsCancelButton).Click(); Wait(); if (webDriver.FindElements(propertyInformationConfirmationModal).Count > 0) @@ -645,12 +647,18 @@ public void UpdatePropertyDetails(Property property) webDriver.FindElement(propertyDetailsTenureCleanupLabel).Click(); } + //TENURE CLEANUP if (property.TenureCleanup.First() != "") { foreach (string status in property.TenureCleanup) { + Wait(2000); + webDriver.FindElement(propertyDetailsTenureCleanupLabel).Click(); FocusAndClick(propertyDetailsTenureCleanupInput); + + WaitUntilClickable(propertyDetailsTenureCleanupOptions); ChooseMultiSelectSpecificOption(propertyDetailsTenureCleanupOptions, status); + webDriver.FindElement(propertyDetailsTenureCleanupLabel).Click(); } } @@ -669,10 +677,13 @@ public void UpdatePropertyDetails(Property property) { foreach (string hwyDetail in property.TenureHighwayDetails) { + Wait(2000); + webDriver.FindElement(propertyDetailsHighwayRoadLabel).Click(); FocusAndClick(propertyDetailsTenureHwyDetailsMultiselect); WaitUntilClickable(propertyDetailsTenureHwyDetailsOptions); ChooseMultiSelectSpecificOption(propertyDetailsTenureHwyDetailsOptions, hwyDetail); + webDriver.FindElement(propertyDetailsHighwayRoadLabel).Click(); } } @@ -951,12 +962,10 @@ public void VerifyPropertyDetailsView() AssertTrueIsDisplayed(propertyDetailsTenureStatusDiv); AssertTrueIsDisplayed(propertyDetailsTenureCleanupLabel); AssertTrueIsDisplayed(propertyDetailsTenureCleanupDiv); - - if (webDriver.FindElements(propertyDetailsAdjacentLandTypeLabel).Count() > 0) - { - AssertTrueIsDisplayed(propertyDetailsAdjacentLandTypeLabel); - AssertTrueIsDisplayed(propertyDetailsAdjacentLandTypeDiv); - } + //AssertTrueIsDisplayed(propertyDetailsProvPublicHwyLabel); + //AssertTrueIsDisplayed(propertyDetailsProvPublicHwyDiv); + //AssertTrueIsDisplayed(propertyDetailsHighwayRoadLabel); + //AssertTrueIsDisplayed(propertyDetailsHighwayRoadDiv); if (webDriver.FindElements(propertyDetailsFirstNationTitle).Count() > 0) { @@ -1089,14 +1098,26 @@ public void VerifyUpdatePropertyDetailsView(Property property) Assert.True(Enumerable.SequenceEqual(tenureCleanupUI, property.TenureCleanup)); } - if (webDriver.FindElements(propertyDetailsFirstNationTitle).Count() > 0) - { - AssertTrueIsDisplayed(propertyDetailsFirstNationTitle); - AssertTrueIsDisplayed(propertyDetailsFirstNationBandNameLabel); - AssertTrueIsDisplayed(propertyDetailsFirstNationBandNameDiv); - AssertTrueIsDisplayed(propertyDetailsFirstNationReserveLabel); - AssertTrueIsDisplayed(propertyDetailsFirstNationReserveDiv); - } + //AssertTrueIsDisplayed(propertyDetailsProvPublicHwyLabel); + //if (property.TenureCleanup.First() != "") + // AssertTrueContentEquals(propertyDetailsProvPublicHwyDiv, property.TenureProvHwy); + + + //AssertTrueIsDisplayed(propertyDetailsHighwayRoadLabel); + //if (property.TenureCleanup.First() != "") + //{ + // var tenureCleanupUI = GetViewFieldListContent(propertyDetailsHighwayRoadDiv); + // Assert.True(Enumerable.SequenceEqual(tenureCleanupUI, property.TenureHighwayDetails)); + //} + + //if (webDriver.FindElements(propertyDetailsFirstNationTitle).Count() > 0) + //{ + // AssertTrueIsDisplayed(propertyDetailsFirstNationTitle); + // AssertTrueIsDisplayed(propertyDetailsFirstNationBandNameLabel); + // AssertTrueIsDisplayed(propertyDetailsFirstNationBandNameDiv); + // AssertTrueIsDisplayed(propertyDetailsFirstNationReserveLabel); + // AssertTrueIsDisplayed(propertyDetailsFirstNationReserveDiv); + //} //MEASUREMENTS AssertTrueIsDisplayed(propertyDetailsMeasurementsTitle); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchAcquisitionFiles.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchAcquisitionFiles.cs index 825ca93f72..a3e93bae68 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchAcquisitionFiles.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchAcquisitionFiles.cs @@ -35,7 +35,7 @@ public class SearchAcquisitionFiles : PageObjectBase private readonly By searchAcquisitionOrderFileNameBttn = By.CssSelector("div[data-testid='sort-column-fileName']"); private readonly By searchAcquisitionFileMOTIRegionHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'MOTT region')]"); private readonly By searchAcquisitionFileProjectHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Project')]"); - private readonly By searchAcquisitionFileAddressHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Civic Address')]"); + private readonly By searchAcquisitionFileAddressHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Civic address')]"); private readonly By searchAcquisitionFileStatusHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Status')]"); private readonly By searchAcquisitionFileTableContent = By.CssSelector("div[data-testid='acquisitionFilesTable'] div[class='tbody'] div[class='tr-wrapper']"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchDispositionFiles.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchDispositionFiles.cs index 0a917dfa75..f8e322d15e 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchDispositionFiles.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchDispositionFiles.cs @@ -37,7 +37,7 @@ public class SearchDispositionFiles : PageObjectBase private readonly By searchDispositionFileOrderTypeBttn = By.CssSelector("div[data-testid='sort-column-dispositionTypeCode']"); private readonly By searchDispositionMOTIRegionHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'MOTT region')]"); private readonly By searchDispositionTeamMemberHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Team member')]"); - private readonly By searchDispositionAddressHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Civic Address / PID / PIN')]"); + private readonly By searchDispositionAddressHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Civic address / PID / PIN')]"); private readonly By searchDispositionDispositionStatusHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Disposition status')]"); private readonly By searchDispositionFileOrderDispositionStatusBttn = By.CssSelector("div[data-testid='sort-column-dispositionStatusTypeCode']"); private readonly By searchDispositionFileStatusHeader = By.XPath("//div[@role='table']/div[@class='thead thead-light']/div/div/div[contains(text(),'Status')]"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchLease.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchLease.cs index c11a2ed591..a088862634 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchLease.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchLease.cs @@ -40,14 +40,16 @@ public class SearchLease : PageObjectBase private readonly By searchLicenceCreateNewBttn = By.XPath("//div[contains(text(),'Create a Lease/Licence')]/parent::button"); //Search Results Table Elements - private readonly By searchLicenceLFileColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'L-File Number')]"); + private readonly By searchLicenceLFileColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'L-File number')]"); private readonly By searchLicenseOrderByLFileBttn = By.CssSelector("div[data-testid='sort-column-lFileNo']"); - private readonly By searchLicenceExpiryDateColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Expiry Date')]"); + private readonly By searchLicenceExpiryDateColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Expiry date')]"); private readonly By searchLicenseOrderByExpiryDateBttn = By.CssSelector("div[data-testid='sort-column-expiryDate']"); - private readonly By searchLicenceProgramNameColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Program Name')]"); + private readonly By searchLicenceProgramNameColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Program name')]"); private readonly By searchLicenseOrderByProgramNameBttn = By.CssSelector("div[data-testid='sort-column-programName']"); - private readonly By searchLicenceTenantNameColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Tenant Names')]"); - private readonly By searchLicencePropertiesColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Properties')]"); + private readonly By searchLicenceTenantNameColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Tenant names')]"); + private readonly By searchLicenceAccountTypeColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Account type')]"); + private readonly By searchLicencePropertiesColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Civic address / PID / PIN')]"); + private readonly By searchLicenceHistoricalFileColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Historical file #')]"); private readonly By searchLicenceStatusColumnHeader = By.XPath("//div[@data-testid='leasesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Status')]"); private readonly By searchLicenseOrderByStatusBttn = By.CssSelector("div[data-testid='sort-column-fileStatusTypeCode']"); @@ -59,8 +61,9 @@ public class SearchLease : PageObjectBase private readonly By searchLicense1stResultExpiryDateContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[2]/span[1]"); private readonly By searchLicense1stResultProgramContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[3]"); private readonly By searchLicense1stResultTenantsContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[4]/div/div"); + private readonly By searchLicense1stResultAccountTypeContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[5]"); private readonly By searchLicense1stResultPropertiesContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[6]/div/div"); - private readonly By searchLicense1stResultHistoricalFileContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[6]"); + private readonly By searchLicense1stResultHistoricalFileContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[7]"); private readonly By searchLicense1stResultStatusContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[8]"); private readonly By searchLicenseFileHeaderCode = By.XPath("//label[contains(text(),'Lease/Licence #')]/parent::div/following-sibling::div/span[1]"); @@ -338,7 +341,9 @@ public void VerifySearchLeasesView() AssertTrueIsDisplayed(searchLicenceExpiryDateColumnHeader); AssertTrueIsDisplayed(searchLicenceProgramNameColumnHeader); AssertTrueIsDisplayed(searchLicenceTenantNameColumnHeader); + AssertTrueIsDisplayed(searchLicenceAccountTypeColumnHeader); AssertTrueIsDisplayed(searchLicencePropertiesColumnHeader); + AssertTrueIsDisplayed(searchLicenceHistoricalFileColumnHeader); AssertTrueIsDisplayed(searchLicenceStatusColumnHeader); AssertTrueIsDisplayed(searchLicenseResultsTable); @@ -368,6 +373,9 @@ public void VerifyLeaseTableContent(Lease lease) else Assert.Empty(tenants); + if(lease.AccountType != "") + AssertTrueContentEquals(searchLicense1stResultAccountTypeContent, lease.AccountType); + if (lease.SearchPropertiesIndex!= 0) Assert.True(webDriver.FindElements(searchLicense1stResultPropertiesContent).Count > 0); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchManagement.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchManagement.cs index 238a6ff52c..85a8b0587e 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchManagement.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchManagement.cs @@ -1,5 +1,4 @@ using OpenQA.Selenium; -using OpenQA.Selenium.DevTools.V142.Network; using PIMS.Tests.Automation.Classes; namespace PIMS.Tests.Automation.PageObjects diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchProjects.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchProjects.cs index fbd9086c90..11333620b2 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchProjects.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchProjects.cs @@ -24,7 +24,7 @@ public class SearchProjects : PageObjectBase private By searchProjectNbrOrderBttn = By.CssSelector("div[data-testid='sort-column-code']"); private By searchProjectNameHeaderColumn = By.XPath("//div[@data-testid='projectsTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Project name')]"); private By searchProjectNameOrderBttn = By.CssSelector("div[data-testid='sort-column-description']"); - private By searchProjectRegionHeaderColumn = By.XPath("//div[@data-testid='projectsTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Region')]"); + private By searchProjectRegionHeaderColumn = By.XPath("//div[@data-testid='projectsTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'MOTT region')]"); private By searchProjectStatusHeaderColumn = By.XPath("//div[@data-testid='projectsTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Status')]"); private By searchProjectLastUpdatedByHeaderColumn = By.XPath("//div[@data-testid='projectsTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Last updated by')]"); private By searchProjectLastUpdatedByOrderBttn = By.CssSelector("div[data-testid='sort-column-lastUpdatedBy']"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchProperties.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchProperties.cs index 3ebff4172f..6892dbfba2 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchProperties.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchProperties.cs @@ -37,8 +37,7 @@ public class SearchProperties : PageObjectBase private readonly By searchPropertySearchBttn = By.Id("search-button"); private readonly By searchPropertyResetBttn = By.Id("reset-button"); - private readonly By searchPropertyPOINameOptionList = By.CssSelector("input[data-testid='geographic-name-input']"); - private readonly By searchPropertyPOINameFirstOption = By.XPath("//input[@data-testid='geographic-name-input']/following-sibling::ul/li[1]"); + private readonly By searchPropertyPOINameFirstOption = By.CssSelector("div[data-placement='bottom-start'] ul[class='suggestionList'] li:first-child"); private readonly By searchPropertyProjectInput = By.Id("typeahead-project"); private readonly By searchProject1stOption = By.CssSelector("div[id='typeahead-project'] a"); @@ -68,15 +67,14 @@ public class SearchProperties : PageObjectBase private readonly By searchPropertyFoundLocationPin = By.CssSelector("div[class='leaflet-pane leaflet-marker-pane'] img:first-child"); //Properties List View Elements - private readonly By searchPropertyViewByInput = By.Id("properties-selector_input"); - private readonly By searchPropertyViewByInputOptions = By.CssSelector("ul[class='optionContainer']"); - private readonly By searchPropertyViewByFirstOption = By.CssSelector("ul[class='optionContainer'] li:nth-child(1)"); - private readonly By searchPropertyListViewTitle = By.XPath("//h3[contains(text(),'PIMS Property Search')]"); private readonly By searchPropertyViewByLabel = By.XPath("//div/strong[contains(text(),'Search by')]"); private readonly By searchPropertyListViewOwnershipLabel = By.XPath("//label(text()='Ownership:')"); - private readonly By searchPropertyListViewOwnershipInput = By.Id("ownership-selector_input"); + private readonly By searchPropertyListViewOwnershipInput = By.Id("ownership-selector"); + private readonly By searchPropertyListOwnershipOptions = By.CssSelector("div[id='ownership-selector'] div[class='optionListContainer displayBlock']"); + private readonly By searchPropertyOwnershipFirstOption = By.CssSelector("div[id='ownership-selector'] div[class='optionListContainer displayBlock'] ul[class='optionContainer'] li:nth-child(1)"); + private readonly By searchPropertyListViewTenureCleanupLabel = By.XPath("//label(text()='Tenure Cleanup:')"); private readonly By searchPropertyListViewTenureCleanupInput = By.Id("tenure-cleanup-selector_input"); @@ -204,7 +202,8 @@ public void SearchProperty(string PID = "", string PIN = "", string address = "" Wait(); FocusAndClick(searchProject1stOption); } - + + Wait(); webDriver.FindElement(searchPropertySearchBttn).Click(); WaitUntilSpinnerDisappear(); } @@ -224,17 +223,16 @@ public void SearchPropertyByAddressList(string address) public void IncludeAllPropertyOwnershipSearch() { Wait(); - webDriver.FindElement(searchPropertyViewByInput).Click(); + webDriver.FindElement(searchPropertyListViewOwnershipInput).Click(); - WaitUntilVisible(searchPropertyViewByInputOptions); - while (webDriver.FindElements(searchPropertyViewByFirstOption).Count == 1) - webDriver.FindElement(searchPropertyViewByFirstOption).Click(); + WaitUntilVisible(searchPropertyListOwnershipOptions); + while (webDriver.FindElements(searchPropertyOwnershipFirstOption).Count == 1) + FocusAndClick(searchPropertyOwnershipFirstOption); } public void ResetPropertySearch() { Wait(); - WaitUntilClickable(searchPropertyResetBttn); webDriver.FindElement(searchPropertyResetBttn).Click(); WaitUntilSpinnerDisappear(); @@ -310,8 +308,8 @@ public void SelectFirstPMBCResult(string action = "") sharedModals.ModalClickOKBttn(); } - Wait(10000); - webDriver.FindElement(quickInfoCloseModalBttn).Click(); + //Wait(10000); + //webDriver.FindElement(quickInfoCloseModalBttn).Click(); } public void SelectSecondPMBCResult(string action = "") diff --git a/testing/PIMS.Tests.Automation/PageObjects/SharedAgreements.cs b/testing/PIMS.Tests.Automation/PageObjects/SharedAgreements.cs index df247ea3ce..a3424d812e 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SharedAgreements.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SharedAgreements.cs @@ -23,7 +23,7 @@ public class SharedAgreements : PageObjectBase private By agreementsTypeSelect = By.Id("input-agreementTypeCode"); private By agreementsDateLabel = By.XPath("//label[contains(text(),'Agreement date')]"); private By agreementsDateInput = By.Id("datepicker-agreementDate"); - private By agreementCommencementDateInput = By.Id("datepicker-commencementDate"); + private By agreementCommencementDateInput = By.Id("datepicker-completionDate"); private By agreementsCompletionDateLabel = By.XPath("//label[contains(text(),'Completion date')]"); private By agreementsCompletionDateInput = By.Id("datepicker-completionDate"); private By agreementsTerminationDateLabel = By.XPath("//label[contains(text(),'Termination date')]"); @@ -120,13 +120,6 @@ public void CreateUpdateAgreement(Agreement agreement) webDriver.FindElement(agreementsDateInput).SendKeys(Keys.Enter); } - if (agreement.AgreementCommencementDate != "") - { - ClearInput(agreementCommencementDateInput); - webDriver.FindElement(agreementCommencementDateInput).SendKeys(agreement.AgreementCommencementDate); - webDriver.FindElement(agreementCommencementDateInput).SendKeys(Keys.Enter); - } - if (agreement.AgreementCompletionDate != "") { ClearInput(agreementsCompletionDateInput); @@ -257,12 +250,6 @@ public void VerifyViewAgreementForm(Agreement agreement, int index) AssertTrueIsDisplayed(By.XPath("//button[@data-testid='agreements["+ agreementNbr +"].edit-btn']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Agreement date')]")); AssertTrueContentEquals(By.XPath("//button[@data-testid='agreements["+ agreementNbr +"].edit-btn']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Agreement date')]/parent::div/following-sibling::div"), TransformDateFormat(agreement.AgreementDate)); - if (agreement.AgreementCommencementDate != "") - { - AssertTrueIsDisplayed(By.XPath("//button[@data-testid='agreements["+ agreementNbr +"].edit-btn']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Commencement date')]")); - AssertTrueContentEquals(By.XPath("//button[@data-testid='agreements["+ agreementNbr +"].edit-btn']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Commencement date')]/parent::div/following-sibling::div"), TransformDateFormat(agreement.AgreementCommencementDate)); - } - AssertTrueIsDisplayed(By.XPath("//button[@data-testid='agreements["+ agreementNbr +"].edit-btn']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Completion date')]")); AssertTrueContentEquals(By.XPath("//button[@data-testid='agreements["+ agreementNbr +"].edit-btn']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Completion date')]/parent::div/following-sibling::div"), TransformDateFormat(agreement.AgreementCompletionDate)); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SharedCompensations.cs b/testing/PIMS.Tests.Automation/PageObjects/SharedCompensations.cs index 70748173e2..a33a4ad353 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SharedCompensations.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SharedCompensations.cs @@ -54,20 +54,22 @@ public class SharedCompensations : PageObjectBase private readonly By compensationTotalChequeAmountLabel = By.XPath("//label[contains(text(),'Total cheque amount')]"); private readonly By compensationTotalChequeAmountContent = By.CssSelector("div[data-testid='header-total-amount'] p"); - private readonly By requisitionDetailsViewSubtitle = By.XPath("//div[contains(text(),'Requisition Details')]"); - private readonly By requisitionDetailsCreateSubtitle = By.XPath("//div[contains(text(),'Requisition details')]"); + private readonly By requisitionDetailsSubtitle = By.XPath("//div[contains(text(),'Requisition Details')]"); private readonly By requisitionGenerateH120Bttn = By.XPath("//div[contains(text(),'Requisition Details')]/div/button[2]"); private readonly By requisitionEditBttn = By.XPath("//div[contains(text(),'Requisition Details')]/div/button[@title='Edit compensation requisition']"); - private readonly By requisitionStatusLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Status')]"); + private readonly By requisitionCreateStatusLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Status')]"); + private readonly By requisitionViewStatusLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Status')]"); private readonly By requisitionStatusContent = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Status')]/parent::div/following-sibling::div"); private readonly By requisitionStatusSelect = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::h2/following-sibling::div/div/div/div/select[@id='input-status']"); - private readonly By requisitionAltProjectLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Alternate project')]"); + private readonly By requisitionViewAltProjectLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Alternate project')]"); + private readonly By requisitionCreateAltProjectLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Alternate project')]"); private readonly By requisitionAltProjectContent = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Alternate project')]/parent::div/following-sibling::div"); private readonly By requisitionAltProjectInput = By.Id("typeahead-alternateProject"); private readonly By requisitionAltProjectOptions = By.CssSelector("div[data-testid='typeahead-alternateProject'] div[aria-label='menu-options']"); private readonly By requisitionAltProject1stOption = By.CssSelector("div[data-testid='typeahead-alternateProject'] div[aria-label='menu-options'] a:nth-child(1)"); private readonly By requisitionFinalDateLabel = By.XPath("//label[contains(text(),'Final date')]"); - private readonly By requisitionAgreementLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Agreement date')]"); + private readonly By requisitionViewAgreementLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Agreement date')]"); + private readonly By requisitionCreateAgreementLabel = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Agreement date')]"); private readonly By requisitionAgreementContent = By.XPath("//div[contains(text(),'Requisition Details')]/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Agreement date')]/parent::div/following-sibling::div"); private readonly By requisitionAgreementInput = By.Id("datepicker-agreementDateTime"); private readonly By requisitionSpecialInstructionLabel = By.XPath("//label[contains(text(),'Special instructions')]"); @@ -457,14 +459,14 @@ public void VerifyCompensationDetailsInitViewForm() AssertTrueIsDisplayed(compensationTotalChequeAmountContent); //Requisition Details - AssertTrueIsDisplayed(requisitionDetailsViewSubtitle); + AssertTrueIsDisplayed(requisitionDetailsSubtitle); AssertTrueIsDisplayed(requisitionGenerateH120Bttn); AssertTrueIsDisplayed(requisitionEditBttn); - AssertTrueIsDisplayed(requisitionStatusLabel); + AssertTrueIsDisplayed(requisitionViewStatusLabel); AssertTrueContentEquals(requisitionStatusContent, "Draft"); - AssertTrueIsDisplayed(requisitionAltProjectLabel); + AssertTrueIsDisplayed(requisitionViewAltProjectLabel); AssertTrueIsDisplayed(requisitionFinalDateLabel); - AssertTrueIsDisplayed(requisitionAgreementLabel); + AssertTrueIsDisplayed(requisitionViewAgreementLabel); AssertTrueIsDisplayed(requisitionSpecialInstructionLabel); //Financial Coding @@ -504,14 +506,14 @@ public void VerifyCompensationDetailsInitViewForm() public void VerifyCompensationDetailsInitCreateForm() { //Requisition Details - AssertTrueIsDisplayed(requisitionDetailsCreateSubtitle); + AssertTrueIsDisplayed(requisitionDetailsSubtitle); - AssertTrueIsDisplayed(requisitionStatusLabel); + AssertTrueIsDisplayed(requisitionCreateStatusLabel); AssertTrueIsDisplayed(requisitionStatusSelect); - AssertTrueIsDisplayed(requisitionAltProjectLabel); + AssertTrueIsDisplayed(requisitionCreateAltProjectLabel); AssertTrueIsDisplayed(requisitionAltProjectInput); AssertTrueIsDisplayed(requisitionFinalDateLabel); - AssertTrueIsDisplayed(requisitionAgreementLabel); + AssertTrueIsDisplayed(requisitionCreateAgreementLabel); AssertTrueIsDisplayed(requisitionAgreementInput); AssertTrueIsDisplayed(requisitionSpecialInstructionLabel); AssertTrueIsDisplayed(requisitionSpecialInstructionTextarea); @@ -575,16 +577,16 @@ public void VerifyCompensationDetailsViewForm(Compensation compensation, string AssertTrueContentEquals(compensationTotalChequeAmountContent, TransformCurrencyFormat(compensation.CompensationTotalAmount)); //Requisition Details - AssertTrueIsDisplayed(requisitionDetailsViewSubtitle); + AssertTrueIsDisplayed(requisitionDetailsSubtitle); AssertTrueIsDisplayed(requisitionGenerateH120Bttn); AssertTrueIsDisplayed(requisitionEditBttn); - AssertTrueIsDisplayed(requisitionStatusLabel); + AssertTrueIsDisplayed(requisitionViewStatusLabel); AssertTrueContentEquals(requisitionStatusContent, compensation.CompensationStatus); - AssertTrueIsDisplayed(requisitionAltProjectLabel); + AssertTrueIsDisplayed(requisitionViewAltProjectLabel); if(compensation.CompensationAlternateProject != "") AssertTrueContentEquals(requisitionAltProjectContent, TransformProjectFormat(compensation.CompensationAlternateProject)); AssertTrueIsDisplayed(requisitionFinalDateLabel); - AssertTrueIsDisplayed(requisitionAgreementLabel); + AssertTrueIsDisplayed(requisitionViewAgreementLabel); AssertTrueContentEquals(requisitionAgreementContent, TransformDateFormat(compensation.CompensationAgreementDate)); AssertTrueIsDisplayed(requisitionSpecialInstructionLabel); AssertTrueContentEquals(requisitionSpecialInstructionContent, compensation.CompensationSpecialInstructions); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SharedFileProperties.cs b/testing/PIMS.Tests.Automation/PageObjects/SharedFileProperties.cs index 95de43d604..6ace7619d8 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SharedFileProperties.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SharedFileProperties.cs @@ -11,6 +11,8 @@ public class SharedFileProperties : PageObjectBase private readonly By searchSectionInstructions = By.XPath("//div[contains(text(),'Properties to include in this file')]/parent::div/parent::h2/following-sibling::div/div[1]"); private readonly By searchSectionSubfileInstructions = By.XPath("//div[contains(text(),'Properties to include in this sub-file')]/parent::div/parent::h2/following-sibling::div/div[1]"); + private readonly By searchSectionAddPropertyToFileBttn = By.XPath("//div[contains(text(),'Add selected property')]/parent::button"); + //Selected Properties Elements private readonly By searchPropertiesSelectedIdentifierHeader = By.XPath("//div[@class='collapse show']/div/div[contains(text(),'Identifier')]"); private readonly By searchPropertiesSelectedDescriptiveNameHeader = By.XPath("//div[@class='collapse show']/div/div[contains(text(),'Provide a descriptive name for this land')]"); @@ -76,6 +78,13 @@ public void NavigateToAddPropertiesToFile() webDriver.FindElement(fileEditPropertiesBttn).Click(); } + public void AddPropertyToFile() + { + Wait(); + ScrollToElement(searchSectionAddPropertyToFileBttn); + webDriver.FindElement(searchSectionAddPropertyToFileBttn).Click(); + } + public void SelectNthPropertyOptionFromFile(int elementIdx) { By chosenProperty = By.CssSelector("div[data-testid='menu-item-property-" + elementIdx + "']"); @@ -162,7 +171,7 @@ public void SaveFileProperties() else if (sharedModals.SecondaryModalContent().Contains("You have added one or more properties to the management file that are not in the MOTT Inventory")) { Assert.Equal("User Override Required", sharedModals.SecondaryModalHeader()); - Assert.Equal("You have added one or more properties to the management file that are not in the MOTT Inventory. To acquire these properties, add them to an management file. Do you want to proceed?", sharedModals.SecondaryModalContent()); + Assert.Equal("You have added one or more properties to the management file that are not in the MOTT Inventory. To acquire these properties, add them to a management file. Do you want to proceed?", sharedModals.SecondaryModalContent()); sharedModals.SecondaryModalClickOKBttn(); } else if (sharedModals.SecondaryModalContent().Contains("The selected property already exists in the system's inventory. However, the record is missing spatial details.")) diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/AcquisitionFileSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/AcquisitionFileSteps.cs index 4fbf42e4c3..cbfb91dd13 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/AcquisitionFileSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/AcquisitionFileSteps.cs @@ -1408,7 +1408,6 @@ private void PopulateAgreementsCollection(int startRow, int rowsCount) agreement.AgreementLegalSurveyPlan = ExcelDataContext.ReadData(i, "AgreementLegalSurveyPlan"); agreement.AgreementType = ExcelDataContext.ReadData(i, "AgreementType"); agreement.AgreementDate = ExcelDataContext.ReadData(i, "AgreementDate"); - agreement.AgreementCommencementDate = ExcelDataContext.ReadData(i, "AgreementCommencementDate"); agreement.AgreementCompletionDate = ExcelDataContext.ReadData(i, "AgreementCompletionDate"); agreement.AgreementTerminationDate = ExcelDataContext.ReadData(i, "AgreementTerminationDate"); agreement.AgreementPossessionDate = ExcelDataContext.ReadData(i, "AgreementPossessionDate"); diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/AdminToolSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/AdminToolSteps.cs index 3b31f88a30..5a446ed802 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/AdminToolSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/AdminToolSteps.cs @@ -271,6 +271,10 @@ public void UpdateFinancialCode(int rowNumber) //Cancel changes financialCodes.CancelFinancialCode(); + //Navigate to Financial Code List View + manageUsers.NavigateAdminTools(); + financialCodes.NavigateAdminFinancialCodes(); + //Filter for non-existent Financial Code financialCodes.FilterFinancialCode("Non-existent"); diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/DispositionFileSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/DispositionFileSteps.cs index 0d15451a78..9d9b48a25d 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/DispositionFileSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/DispositionFileSteps.cs @@ -263,19 +263,19 @@ public void UpdateAgreement(int rowNumber) agreements.SaveAcquisitionFileAgreement(); //Verify new added Agreement form - agreements.VerifyViewAgreementForm(dispositionFile.DispositionAgreements[0], 4); + agreements.VerifyViewAgreementForm(dispositionFile.DispositionAgreements[0], 1); //Edit Agreement button agreements.EditAgreementButton(0); //Update created agreement - agreements.CreateUpdateAgreement(dispositionFile.DispositionAgreements[1]); + agreements.CreateUpdateAgreement(dispositionFile.DispositionAgreements[0]); //Save new agreement agreements.SaveAcquisitionFileAgreement(); //Verify Edit Agreement form - agreements.VerifyViewAgreementForm(dispositionFile.DispositionAgreements[1], 0); + agreements.VerifyViewAgreementForm(dispositionFile.DispositionAgreements[0], 1); var agreementsBeforeDelete = agreements.TotalAgreementsCount(); @@ -920,6 +920,7 @@ private void PopulateAgreementsCollection(int startRow, int rowsCount) Agreement agreement = new(); agreement.AgreementStatus = ExcelDataContext.ReadData(i, "AgreementStatus"); + agreement.AgreementCancellationReason = ExcelDataContext.ReadData(i, "AgreementCancellationReason"); agreement.AgreementLegalSurveyPlan = ExcelDataContext.ReadData(i, "AgreementLegalSurveyPlan"); agreement.AgreementType = ExcelDataContext.ReadData(i, "AgreementType"); agreement.AgreementDate = ExcelDataContext.ReadData(i, "AgreementDate"); diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/LeaseLicenseSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/LeaseLicenseSteps.cs index 74393e036c..913aa3a077 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/LeaseLicenseSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/LeaseLicenseSteps.cs @@ -388,10 +388,11 @@ public void UpdateTenants(int rowNumber) if (lease.AccountType == "Receivable") { Assert.Equal(lease.AssigneeNumber, tenant.TotalAssignees()); - Assert.Equal(lease.TenantsNumber, tenant.TotalTenants()); - Assert.Equal(lease.RepresentativeNumber, tenant.TotalRepresentatives()); Assert.Equal(lease.PropertyManagerNumber, tenant.TotalManagers()); + Assert.Equal(lease.RepresentativeNumber, tenant.TotalRepresentatives()); + Assert.Equal(lease.TenantsNumber, tenant.TotalTenants()); Assert.Equal(lease.UnknownTenantNumber, tenant.TotalUnknown()); + Assert.Equal(lease.OtherTenantNumber, tenant.TotalTenantOther()); } else { @@ -1089,6 +1090,7 @@ private void PopulateLeaseLicense(int rowNumber) lease.RepresentativeNumber = int.Parse(ExcelDataContext.ReadData(rowNumber, "RepresentativeNumber")); lease.PropertyManagerNumber = int.Parse(ExcelDataContext.ReadData(rowNumber, "PropertyManagerNumber")); lease.UnknownTenantNumber = int.Parse(ExcelDataContext.ReadData(rowNumber, "UnknownTenantNumber")); + lease.OtherTenantNumber = int.Parse(ExcelDataContext.ReadData(rowNumber, "OtherTenantNumber")); lease.OwnerPayeeNumber = int.Parse(ExcelDataContext.ReadData(rowNumber, "OwnerPayeeNumber")); lease.OwnerRepresentativeNumber = int.Parse(ExcelDataContext.ReadData(rowNumber, "OwnerRepresentativeNumber")); if (lease.TenantsStartRow != 0 && lease.TenantsQuantity != 0) diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/NotesSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/NotesSteps.cs index ffcee5f554..359cedfc53 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/NotesSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/NotesSteps.cs @@ -140,7 +140,7 @@ public void EditPropNotesTab(string feature, int rowNumber) notes.NavigateNotesTab(); //Verify the Management's notes section - notes.VerifySecondaryNotesListContent(feature, notesData[0]); + //notes.VerifySecondaryNotesListContent(feature, notesData[0]); } } diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/PropertiesSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/PropertiesSteps.cs index 550da05157..15753c1e1a 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/PropertiesSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/PropertiesSteps.cs @@ -254,16 +254,16 @@ public void EditPropertyInformationDetailsFromFile(int rowNumber) propertyInformation.VerifyPropertyDetailsEditForm(); //Apply changes on the Property Information Form - propertyInformation.UpdatePropertyDetails(property); + //propertyInformation.UpdatePropertyDetails(property); - //Cancel changes + ////Cancel changes //propertyInformation.CancelPropertyDetails(); ////Click on the Edit Property Information Button //propertyInformation.EditPropertyInfoBttn(); - ////Apply changes on the Property Information Form - //propertyInformation.UpdatePropertyDetails(property); + //Apply changes on the Property Information Form + propertyInformation.UpdatePropertyDetails(property); //Save changes propertyInformation.SavePropertyDetails(); @@ -741,7 +741,10 @@ private void PopulatePropertyImprovements(int startRow, int rowsCount) for (int i = startRow; i < startRow + rowsCount; i++) { PropertyImprovement improvement = new(); + improvement.ImprovementName = ExcelDataContext.ReadData(i, "ImprovementName"); improvement.ImprovementType = ExcelDataContext.ReadData(i, "PropertyImprovementType"); + improvement.ImprovementStatus = ExcelDataContext.ReadData(i, "ImprovementStatus"); + improvement.ImprovementDate = ExcelDataContext.ReadData(i, "ImprovementDate"); improvement.ImprovementDescription = ExcelDataContext.ReadData(i, "PropertyImprovementDescription"); property.PropertyImprovements.Add(improvement); diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/ResearchFileSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/ResearchFileSteps.cs index 64ea896828..28260b43ce 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/ResearchFileSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/ResearchFileSteps.cs @@ -191,11 +191,9 @@ public void UpdateResearchFileProperties(int rowNumber) } } - [StepDefinition(@"I create a Research File from a pin on map and from row number (.*)")] + [StepDefinition(@"I create a Research File from a search on map and from row number (.*)")] public void CreateResearchFileFromPin(int rowNumber) { - /* TEST COVERAGE: PSP-3371, PSP-1546, PSP-1556 */ - //Login to PIMS loginSteps.Idir(userName); @@ -206,23 +204,18 @@ public void CreateResearchFileFromPin(int rowNumber) //Select found property on Map searchProperties.SelectFirstPMBCResult("Create Research"); - //Fill basic Research File information - researchFiles.CreateResearchFile(researchFile); - //Fill name to selected property + sharedFileProperties.AddPropertyToFile(); sharedFileProperties.AddNameSelectedProperty("Automated Property from Pin", 0); + //Fill basic Research File information + researchFiles.CreateResearchFile(researchFile); + //Save Research File researchFiles.SaveResearchFile(); //Get Research File code researchFileCode = researchFiles.GetResearchFileCode(); - - //Add additional info to the reseach File - researchFiles.AddAdditionalResearchFileInfo(researchFile); - - //Save Research File - researchFiles.SaveResearchFile(); } [StepDefinition(@"I search for Research Files from row number (.*)")] diff --git a/testing/Testing DB Scripts/DELETE AUTOMATION TEST DATA.sql b/testing/Testing DB Scripts/DELETE AUTOMATION TEST DATA.sql index eb4f6d624e..0e9abbea60 100644 --- a/testing/Testing DB Scripts/DELETE AUTOMATION TEST DATA.sql +++ b/testing/Testing DB Scripts/DELETE AUTOMATION TEST DATA.sql @@ -71,7 +71,8 @@ DELETE FROM PIMS_YEARLY_FINANCIAL_CODE WHERE APP_CREATE_USERID IN ('TRANPSP1', ' -- ACQUISITION FILES -UPDATE PIMS_ACQUISITION_FILE SET FILE_NAME = 'AUTOMATED TEST AF_ARCHIVED', CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE APP_CREATE_USERID IN ('TRANPSP1'); +SELECT * FROM PIMS_ACQUISITION_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1'); +UPDATE PIMS_ACQUISITION_FILE SET FILE_NAME = 'AUTOMATED TEST AF_ARCHIVED', LEGACY_FILE_NUMBER = '', CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE APP_CREATE_USERID IN ('TRANPSP1'); -- ACQUISITION FILES TAKES LOGIC UPDATE PIMS_PROPERTY_LEASE SET PROPERTY_ID = 9963, CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (006112447,014993805,014983214,015210979,011584360,015197115,014992876,01537673,015339041,015319121,015009513,015197174,015197093,015197140,015184099,012241814,012491284,015372863)); @@ -101,8 +102,9 @@ DELETE FROM PIMS_DISPOSITION_FILE_NOTE WHERE DISPOSITION_FILE_ID IN (SELECT DISP DELETE FROM PIMS_DISPOSITION_CHECKLIST_ITEM WHERE DISPOSITION_FILE_ID IN (SELECT DISPOSITION_FILE_ID FROM PIMS_DISPOSITION_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2')); DELETE FROM PIMS_DISPOSITION_FILE_TEAM WHERE DISPOSITION_FILE_ID IN (SELECT DISPOSITION_FILE_ID FROM PIMS_DISPOSITION_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2')); DELETE FROM PIMS_DISPOSITION_FILE_DOCUMENT WHERE DISPOSITION_FILE_ID IN (SELECT DISPOSITION_FILE_ID FROM PIMS_DISPOSITION_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2')); +DELETE FROM PIMS_DISPOSITION_AGREEMENT WHERE DISPOSITION_FILE_ID IN (SELECT DISPOSITION_FILE_ID FROM PIMS_DISPOSITION_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2')); DELETE FROM PIMS_DISPOSITION_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2'); -UPDATE PIMS_PROPERTY SET IS_OWNED = 1, IS_RETIRED = 0, CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE PID IN (1465350); +UPDATE PIMS_PROPERTY SET IS_OWNED = 1, IS_RETIRED = 0, CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE PID IN (1465201); -- SUBDIVISIONS --UPDATE PIMS_PROPERTY_ACQUISITION_FILE SET PROPERTY_ID = 164, CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (5091829, 3904181, 18088007)); @@ -146,6 +148,7 @@ DELETE FROM PIMS_MANAGEMENT_ACTIVITY WHERE MANAGEMENT_FILE_ID IN (SELECT MANAGEM DELETE FROM PIMS_MANAGEMENT_FILE_CONTACT WHERE MANAGEMENT_FILE_ID IN (SELECT MANAGEMENT_FILE_ID FROM PIMS_MANAGEMENT_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2')); DELETE FROM PIMS_MGMT_ACTIVITY_DOCUMENT WHERE MANAGEMENT_ACTIVITY_ID IN (SELECT MANAGEMENT_ACTIVITY_ID FROM PIMS_MANAGEMENT_ACTIVITY WHERE MANAGEMENT_FILE_ID IN (SELECT MANAGEMENT_FILE_ID FROM PIMS_MANAGEMENT_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2'))); DELETE FROM PIMS_MANAGEMENT_ACTIVITY WHERE MANAGEMENT_FILE_ID IN (SELECT MANAGEMENT_FILE_ID FROM PIMS_MANAGEMENT_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2')); +DELETE FROM PIMS_NOTICE_OF_CLAIM WHERE MANAGEMENT_FILE_ID IN (SELECT MANAGEMENT_FILE_ID FROM PIMS_MANAGEMENT_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2')); DELETE FROM PIMS_MANAGEMENT_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2');