diff --git a/testing/PIMS.Tests.Automation/Data/PIMS_Testing_Data.xlsx b/testing/PIMS.Tests.Automation/Data/PIMS_Testing_Data.xlsx index b4f0da306a..225adf7b5f 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/Features/Properties.feature b/testing/PIMS.Tests.Automation/Features/Properties.feature index e0efa31381..57877b5b79 100644 --- a/testing/PIMS.Tests.Automation/Features/Properties.feature +++ b/testing/PIMS.Tests.Automation/Features/Properties.feature @@ -14,14 +14,14 @@ Scenario: 02. Property PIMS Files Tab Then PIMS Files Tab has rendered successfully Scenario: 03. Property Management Tab - Given I search for a property in the inventory by PID from row number 25 + Given I search for a property in the inventory by PID from row number 23 When I insert information in the Property Management Tab from row number 1 And I update information in the Property Management Tab from row number 2 And I clean up the Property Management Tab from row number 3 Then Property Management Tab has been updated successfully Scenario: 04. Property Management Activity Digital Documents - Given I search for a property in the inventory by PID from row number 25 + Given I search for a property in the inventory by PID from row number 23 When I insert activities to the Property Management Tab from row number 4 And I create Digital Documents for a Property Management row number 11 And I delete all activities from the Property Management Tab @@ -33,7 +33,7 @@ Scenario: 05. Properties Map and List Filters Then Properties filters works successfully Scenario: 06. Non-Inventory Property Information - Given I search for a non MOTI property from row number 24 + Given I search for a non MOTI property from row number 6 Then Non-Inventory property renders correctly Scenario: 07. Invalid Property Not Found diff --git a/testing/PIMS.Tests.Automation/Features/Properties.feature.cs b/testing/PIMS.Tests.Automation/Features/Properties.feature.cs index 2939ba0fbf..ecca9841c9 100644 --- a/testing/PIMS.Tests.Automation/Features/Properties.feature.cs +++ b/testing/PIMS.Tests.Automation/Features/Properties.feature.cs @@ -163,7 +163,7 @@ public void _03_PropertyManagementTab() { this.ScenarioStart(); #line 17 - testRunner.Given("I search for a property in the inventory by PID from row number 25", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); + testRunner.Given("I search for a property in the inventory by PID from row number 23", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 18 testRunner.When("I insert information in the Property Management Tab from row number 1", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); @@ -200,7 +200,7 @@ public void _04_PropertyManagementActivityDigitalDocuments() { this.ScenarioStart(); #line 24 - testRunner.Given("I search for a property in the inventory by PID from row number 25", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); + testRunner.Given("I search for a property in the inventory by PID from row number 23", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 25 testRunner.When("I insert activities to the Property Management Tab from row number 4", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); @@ -269,7 +269,7 @@ public void _06_Non_InventoryPropertyInformation() { this.ScenarioStart(); #line 36 - testRunner.Given("I search for a non MOTI property from row number 24", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); + testRunner.Given("I search for a non MOTI property from row number 6", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 37 testRunner.Then("Non-Inventory property renders correctly", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); diff --git a/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs b/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs index 6b145f819d..59aa7a77e0 100644 --- a/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs +++ b/testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs @@ -141,7 +141,7 @@ public void _02_ResearchFileProperties() testRunner.When("I add Properties to a Research File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 15 - testRunner.And("I update a Property details from a file from row number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I update a Research File Properties from row number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden #line 16 testRunner.Then("A new Research File is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); diff --git a/testing/PIMS.Tests.Automation/Features/SmokeTest.feature b/testing/PIMS.Tests.Automation/Features/SmokeTest.feature index 0c24a859f6..06d5f3d230 100644 --- a/testing/PIMS.Tests.Automation/Features/SmokeTest.feature +++ b/testing/PIMS.Tests.Automation/Features/SmokeTest.feature @@ -13,98 +13,66 @@ Scenario: 02. Organization Contact When I search for an existing contact from type "Organization" row number 5 Then Expected Content is displayed on Contacts Table from contact type "Organization" -Scenario: 03. Lease and License File Details - Given I create a new minimum Lease from row number 5 - When I add additional Information to the Lease Details - Then A new lease is created successfully - -Scenario: 04. Lease and License Tenants +Scenario: 03. Lease and License Tenants Given I create a new minimum Lease from row number 5 When I add Tenants to the Lease Then A new lease is created successfully -Scenario: 05. Lease and License Improvements +Scenario: 04. Lease and License Improvements Given I create a new minimum Lease from row number 5 When I add Improvements to the Lease Then A new lease is created successfully -Scenario: 06. Lease and License Insurance +Scenario: 05. Lease and License Insurance Given I create a new minimum Lease from row number 5 When I add Insurance to the Lease Then A new lease is created successfully -Scenario: 07. Lease and License Deposits +Scenario: 06. Lease and License Deposits Given I create a new minimum Lease from row number 5 When I add Deposits to the Lease Then A new lease is created successfully -Scenario: 08. Lease and License Payments +Scenario: 07. Lease and License Payments Given I create a new minimum Lease from row number 5 When I add Payments to the Lease Then A new lease is created successfully -Scenario: 09. Research File Details - Given I create a basic Research File from row number 9 - When I add additional details to Research File - Then A new Research File is created successfully - -Scenario: 10. Research File Properties +Scenario: 08. Research File Properties Given I create a basic Research File from row number 10 When I add Properties to a Research File Then A new Research File is created successfully -Scenario: 11. Research File Documents - Given I create a basic Research File from row number 9 - When I create Digital Documents for a "Research File" row number 10 - Then A new Research File is created successfully - -Scenario: 12. Research File Notes +Scenario: 09. Research File Notes Given I create a basic Research File from row number 9 When I create a new Note on the Notes Tab from row number 8 Then A new Research File is created successfully -Scenario: 13. Acquisition File Details - Given I create a new Acquisition File from row number 18 - When I add additional information to the Acquisition File Details - Then A new Acquisition file is created successfully - -Scenario: 14. Acquisition File Property Takes - Given I create a new Acquisition File from row number 18 - When I add Properties to the Acquisition File - And I create Takes within Acquisition File's Properties - Then A new Acquisition file is created successfully - -Scenario: 15. Acquisition Checklist Tab +Scenario: 10. Acquisition Checklist Tab Given I create a new Acquisition File from row number 18 When I insert Checklist information to an Acquisition File Then Acquisition File's Checklist has been saved successfully -Scenario: 16. Acquisition File Agreements Tab +Scenario: 11. Acquisition File Agreements Tab Given I create a new Acquisition File from row number 18 When I create Agreements within an Acquisition File Then A new Acquisition file is created successfully -Scenario: 17. Acquisition File Stakeholders Tab - Given I create a new Acquisition File from row number 18 - When I add Properties to the Acquisition File - And I create Stakeholders within an Acquisition File - Then A new Acquisition file is created successfully - -Scenario: 18. Acquisition File Compensation Tab - Given I create a new Acquisition File from row number 18 - When I add additional information to the Acquisition File Details - And I add Properties to the Acquisition File - And I create Stakeholders within an Acquisition File - And I create Compensation Requisition within an Acquisition File - Then A new Acquisition file is created successfully - -Scenario: 19. Acquisition File Expropriation Tab - Given I create a new Acquisition File from row number 18 - When I add additional information to the Acquisition File Details - And I add Properties to the Acquisition File - And I create Stakeholders within an Acquisition File - And I create Expropriations within an Acquisition File - Then A new Acquisition file is created successfully - - +#Scenario: 12. Acquisition File Compensation Tab +# Given I create a new Acquisition File from row number 18 +# When I add additional information to the Acquisition File Details +# And I add Properties to the Acquisition File +# And I create Stakeholders within an Acquisition File +# And I create Compensation Requisition within an Acquisition File +# Then A new Acquisition file is created successfully + +#Scenario: 13. Disposition Checklist Tab +# Given I create a new Disposition File from row number 1 +# When I insert Checklist information to an Disposition File +# Then Disposition File's Checklist has been saved successfully + +Scenario: 12. Disposition Offers and Sale Tab + Given I create a new Disposition File from row number 1 + When I create Appraisal, Assessment, Offers and Sales Details within a Disposition File + Then A new Disposition file is created successfully diff --git a/testing/PIMS.Tests.Automation/Features/SmokeTest.feature.cs b/testing/PIMS.Tests.Automation/Features/SmokeTest.feature.cs index 350d1d58cb..ee0638e6e2 100644 --- a/testing/PIMS.Tests.Automation/Features/SmokeTest.feature.cs +++ b/testing/PIMS.Tests.Automation/Features/SmokeTest.feature.cs @@ -144,14 +144,14 @@ public void _02_OrganizationContact() this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="03. Lease and License File Details")] + [Xunit.SkippableFactAttribute(DisplayName="03. Lease and License Tenants")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "03. Lease and License File Details")] - public void _03_LeaseAndLicenseFileDetails() + [Xunit.TraitAttribute("Description", "03. Lease and License Tenants")] + public void _03_LeaseAndLicenseTenants() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("03. Lease and License File Details", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("03. Lease and License Tenants", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 16 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -166,7 +166,7 @@ public void _03_LeaseAndLicenseFileDetails() testRunner.Given("I create a new minimum Lease from row number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 18 - testRunner.When("I add additional Information to the Lease Details", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I add Tenants to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 19 testRunner.Then("A new lease is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); @@ -175,14 +175,14 @@ public void _03_LeaseAndLicenseFileDetails() this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="04. Lease and License Tenants")] + [Xunit.SkippableFactAttribute(DisplayName="04. Lease and License Improvements")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "04. Lease and License Tenants")] - public void _04_LeaseAndLicenseTenants() + [Xunit.TraitAttribute("Description", "04. Lease and License Improvements")] + public void _04_LeaseAndLicenseImprovements() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("04. Lease and License Tenants", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("04. Lease and License Improvements", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 21 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -197,7 +197,7 @@ public void _04_LeaseAndLicenseTenants() testRunner.Given("I create a new minimum Lease from row number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 23 - testRunner.When("I add Tenants to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I add Improvements to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 24 testRunner.Then("A new lease is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); @@ -206,14 +206,14 @@ public void _04_LeaseAndLicenseTenants() this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="05. Lease and License Improvements")] + [Xunit.SkippableFactAttribute(DisplayName="05. Lease and License Insurance")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "05. Lease and License Improvements")] - public void _05_LeaseAndLicenseImprovements() + [Xunit.TraitAttribute("Description", "05. Lease and License Insurance")] + public void _05_LeaseAndLicenseInsurance() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("05. Lease and License Improvements", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("05. Lease and License Insurance", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 26 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -228,7 +228,7 @@ public void _05_LeaseAndLicenseImprovements() testRunner.Given("I create a new minimum Lease from row number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 28 - testRunner.When("I add Improvements to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I add Insurance to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 29 testRunner.Then("A new lease is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); @@ -237,14 +237,14 @@ public void _05_LeaseAndLicenseImprovements() this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="06. Lease and License Insurance")] + [Xunit.SkippableFactAttribute(DisplayName="06. Lease and License Deposits")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "06. Lease and License Insurance")] - public void _06_LeaseAndLicenseInsurance() + [Xunit.TraitAttribute("Description", "06. Lease and License Deposits")] + public void _06_LeaseAndLicenseDeposits() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("06. Lease and License Insurance", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("06. Lease and License Deposits", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 31 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -259,7 +259,7 @@ public void _06_LeaseAndLicenseInsurance() testRunner.Given("I create a new minimum Lease from row number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 33 - testRunner.When("I add Insurance to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I add Deposits to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 34 testRunner.Then("A new lease is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); @@ -268,14 +268,14 @@ public void _06_LeaseAndLicenseInsurance() this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="07. Lease and License Deposits")] + [Xunit.SkippableFactAttribute(DisplayName="07. Lease and License Payments")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "07. Lease and License Deposits")] - public void _07_LeaseAndLicenseDeposits() + [Xunit.TraitAttribute("Description", "07. Lease and License Payments")] + public void _07_LeaseAndLicensePayments() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("07. Lease and License Deposits", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("07. Lease and License Payments", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 36 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -290,7 +290,7 @@ public void _07_LeaseAndLicenseDeposits() testRunner.Given("I create a new minimum Lease from row number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 38 - testRunner.When("I add Deposits to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I add Payments to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 39 testRunner.Then("A new lease is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); @@ -299,14 +299,14 @@ public void _07_LeaseAndLicenseDeposits() this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="08. Lease and License Payments")] + [Xunit.SkippableFactAttribute(DisplayName="08. Research File Properties")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "08. Lease and License Payments")] - public void _08_LeaseAndLicensePayments() + [Xunit.TraitAttribute("Description", "08. Research File Properties")] + public void _08_ResearchFileProperties() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("08. Lease and License Payments", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("08. Research File Properties", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 41 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -318,26 +318,26 @@ public void _08_LeaseAndLicensePayments() { this.ScenarioStart(); #line 42 - testRunner.Given("I create a new minimum Lease from row number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); + testRunner.Given("I create a basic Research File from row number 10", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 43 - testRunner.When("I add Payments to the Lease", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I add Properties to a Research File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 44 - testRunner.Then("A new lease is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.Then("A new Research File is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden } this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="09. Research File Details")] + [Xunit.SkippableFactAttribute(DisplayName="09. Research File Notes")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "09. Research File Details")] - public void _09_ResearchFileDetails() + [Xunit.TraitAttribute("Description", "09. Research File Notes")] + public void _09_ResearchFileNotes() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("09. Research File Details", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("09. Research File Notes", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 46 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -352,7 +352,7 @@ public void _09_ResearchFileDetails() testRunner.Given("I create a basic Research File from row number 9", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 48 - testRunner.When("I add additional details to Research File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I create a new Note on the Notes Tab from row number 8", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 49 testRunner.Then("A new Research File is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); @@ -361,14 +361,14 @@ public void _09_ResearchFileDetails() this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="10. Research File Properties")] + [Xunit.SkippableFactAttribute(DisplayName="10. Acquisition Checklist Tab")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "10. Research File Properties")] - public void _10_ResearchFileProperties() + [Xunit.TraitAttribute("Description", "10. Acquisition Checklist Tab")] + public void _10_AcquisitionChecklistTab() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("10. Research File Properties", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("10. Acquisition Checklist Tab", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 51 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -380,26 +380,26 @@ public void _10_ResearchFileProperties() { this.ScenarioStart(); #line 52 - testRunner.Given("I create a basic Research File from row number 10", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); + testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 53 - testRunner.When("I add Properties to a Research File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I insert Checklist information to an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 54 - testRunner.Then("A new Research File is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.Then("Acquisition File\'s Checklist has been saved successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden } this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="11. Research File Documents")] + [Xunit.SkippableFactAttribute(DisplayName="11. Acquisition File Agreements Tab")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "11. Research File Documents")] - public void _11_ResearchFileDocuments() + [Xunit.TraitAttribute("Description", "11. Acquisition File Agreements Tab")] + public void _11_AcquisitionFileAgreementsTab() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("11. Research File Documents", null, tagsOfScenario, argumentsOfScenario, featureTags); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("11. Acquisition File Agreements Tab", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 56 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -411,219 +411,27 @@ public void _11_ResearchFileDocuments() { this.ScenarioStart(); #line 57 - testRunner.Given("I create a basic Research File from row number 9", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); + testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden #line 58 - testRunner.When("I create Digital Documents for a \"Research File\" row number 10", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I create Agreements within an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden #line 59 - testRunner.Then("A new Research File is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - } - this.ScenarioCleanup(); - } - - [Xunit.SkippableFactAttribute(DisplayName="12. Research File Notes")] - [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "12. Research File Notes")] - public void _12_ResearchFileNotes() - { - string[] tagsOfScenario = ((string[])(null)); - System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("12. Research File Notes", null, tagsOfScenario, argumentsOfScenario, featureTags); -#line 61 -this.ScenarioInitialize(scenarioInfo); -#line hidden - if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) - { - testRunner.SkipScenario(); - } - else - { - this.ScenarioStart(); -#line 62 - testRunner.Given("I create a basic Research File from row number 9", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 63 - testRunner.When("I create a new Note on the Notes Tab from row number 8", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 64 - testRunner.Then("A new Research File is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - } - this.ScenarioCleanup(); - } - - [Xunit.SkippableFactAttribute(DisplayName="13. Acquisition File Details")] - [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "13. Acquisition File Details")] - public void _13_AcquisitionFileDetails() - { - string[] tagsOfScenario = ((string[])(null)); - System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("13. Acquisition File Details", null, tagsOfScenario, argumentsOfScenario, featureTags); -#line 66 -this.ScenarioInitialize(scenarioInfo); -#line hidden - if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) - { - testRunner.SkipScenario(); - } - else - { - this.ScenarioStart(); -#line 67 - testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 68 - testRunner.When("I add additional information to the Acquisition File Details", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 69 testRunner.Then("A new Acquisition file is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden } this.ScenarioCleanup(); } - [Xunit.SkippableFactAttribute(DisplayName="14. Acquisition File Property Takes")] + [Xunit.SkippableFactAttribute(DisplayName="12. Disposition Offers and Sale Tab")] [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "14. Acquisition File Property Takes")] - public void _14_AcquisitionFilePropertyTakes() + [Xunit.TraitAttribute("Description", "12. Disposition Offers and Sale Tab")] + public void _12_DispositionOffersAndSaleTab() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("14. Acquisition File Property Takes", null, tagsOfScenario, argumentsOfScenario, featureTags); -#line 71 -this.ScenarioInitialize(scenarioInfo); -#line hidden - if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) - { - testRunner.SkipScenario(); - } - else - { - this.ScenarioStart(); -#line 72 - testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 73 - testRunner.When("I add Properties to the Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("12. Disposition Offers and Sale Tab", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 74 - testRunner.And("I create Takes within Acquisition File\'s Properties", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 75 - testRunner.Then("A new Acquisition file is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - } - this.ScenarioCleanup(); - } - - [Xunit.SkippableFactAttribute(DisplayName="15. Acquisition Checklist Tab")] - [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "15. Acquisition Checklist Tab")] - public void _15_AcquisitionChecklistTab() - { - string[] tagsOfScenario = ((string[])(null)); - System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("15. Acquisition Checklist Tab", null, tagsOfScenario, argumentsOfScenario, featureTags); -#line 77 -this.ScenarioInitialize(scenarioInfo); -#line hidden - if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) - { - testRunner.SkipScenario(); - } - else - { - this.ScenarioStart(); -#line 78 - testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 79 - testRunner.When("I insert Checklist information to an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 80 - testRunner.Then("Acquisition File\'s Checklist has been saved successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - } - this.ScenarioCleanup(); - } - - [Xunit.SkippableFactAttribute(DisplayName="16. Acquisition File Agreements Tab")] - [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "16. Acquisition File Agreements Tab")] - public void _16_AcquisitionFileAgreementsTab() - { - string[] tagsOfScenario = ((string[])(null)); - System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("16. Acquisition File Agreements Tab", null, tagsOfScenario, argumentsOfScenario, featureTags); -#line 82 -this.ScenarioInitialize(scenarioInfo); -#line hidden - if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) - { - testRunner.SkipScenario(); - } - else - { - this.ScenarioStart(); -#line 83 - testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 84 - testRunner.When("I create Agreements within an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 85 - testRunner.Then("A new Acquisition file is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - } - this.ScenarioCleanup(); - } - - [Xunit.SkippableFactAttribute(DisplayName="17. Acquisition File Stakeholders Tab")] - [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "17. Acquisition File Stakeholders Tab")] - public void _17_AcquisitionFileStakeholdersTab() - { - string[] tagsOfScenario = ((string[])(null)); - System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("17. Acquisition File Stakeholders Tab", null, tagsOfScenario, argumentsOfScenario, featureTags); -#line 87 -this.ScenarioInitialize(scenarioInfo); -#line hidden - if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) - { - testRunner.SkipScenario(); - } - else - { - this.ScenarioStart(); -#line 88 - testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 89 - testRunner.When("I add Properties to the Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 90 - testRunner.And("I create Stakeholders within an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 91 - testRunner.Then("A new Acquisition file is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - } - this.ScenarioCleanup(); - } - - [Xunit.SkippableFactAttribute(DisplayName="18. Acquisition File Compensation Tab")] - [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "18. Acquisition File Compensation Tab")] - public void _18_AcquisitionFileCompensationTab() - { - string[] tagsOfScenario = ((string[])(null)); - System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("18. Acquisition File Compensation Tab", null, tagsOfScenario, argumentsOfScenario, featureTags); -#line 93 this.ScenarioInitialize(scenarioInfo); #line hidden if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) @@ -633,63 +441,15 @@ public void _18_AcquisitionFileCompensationTab() else { this.ScenarioStart(); -#line 94 - testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 95 - testRunner.When("I add additional information to the Acquisition File Details", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 96 - testRunner.And("I add Properties to the Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 97 - testRunner.And("I create Stakeholders within an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 98 - testRunner.And("I create Compensation Requisition within an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 99 - testRunner.Then("A new Acquisition file is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - } - this.ScenarioCleanup(); - } - - [Xunit.SkippableFactAttribute(DisplayName="19. Acquisition File Expropriation Tab")] - [Xunit.TraitAttribute("FeatureTitle", "SmokeTest")] - [Xunit.TraitAttribute("Description", "19. Acquisition File Expropriation Tab")] - public void _19_AcquisitionFileExpropriationTab() - { - string[] tagsOfScenario = ((string[])(null)); - System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("19. Acquisition File Expropriation Tab", null, tagsOfScenario, argumentsOfScenario, featureTags); -#line 101 -this.ScenarioInitialize(scenarioInfo); -#line hidden - if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) - { - testRunner.SkipScenario(); - } - else - { - this.ScenarioStart(); -#line 102 - testRunner.Given("I create a new Acquisition File from row number 18", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line hidden -#line 103 - testRunner.When("I add additional information to the Acquisition File Details", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden -#line 104 - testRunner.And("I add Properties to the Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden -#line 105 - testRunner.And("I create Stakeholders within an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 75 + testRunner.Given("I create a new Disposition File from row number 1", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line hidden -#line 106 - testRunner.And("I create Expropriations within an Acquisition File", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 76 + testRunner.When("I create Appraisal, Assessment, Offers and Sales Details within a Disposition Fil" + + "e", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden -#line 107 - testRunner.Then("A new Acquisition file is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 77 + testRunner.Then("A new Disposition file is created successfully", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line hidden } this.ScenarioCleanup(); diff --git a/testing/PIMS.Tests.Automation/PageObjects/AcquisitionDetails.cs b/testing/PIMS.Tests.Automation/PageObjects/AcquisitionDetails.cs index 46c8d8995e..6f812138c8 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/AcquisitionDetails.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/AcquisitionDetails.cs @@ -117,7 +117,6 @@ public class AcquisitionDetails : PageObjectBase //Acquisition File Confirmation Modal Elements private By acquisitionFileConfirmationModal = By.CssSelector("div[class='modal-content']"); - private By acquisitionFileSaveConfirmationModal = By.XPath("//div[@class='modal-content']/div[@class='modal-header']/div[contains(text(),'User Override Required')]"); private SharedSelectContact sharedSelectContact; private SharedModals sharedModals; @@ -307,20 +306,22 @@ public void SaveAcquisitionFileDetails() ButtonElement("Save"); Wait(); - if (webDriver.FindElements(acquisitionFileSaveConfirmationModal).Count() > 0) + if (webDriver.FindElements(acquisitionFileConfirmationModal).Count() > 0) { if (sharedModals.ModalContent().Contains("The selected Ministry region is different from that associated to one or more selected properties")) { + Assert.Equal("Different Ministry region", sharedModals.ModalHeader()); Assert.Contains("The selected Ministry region is different from that associated to one or more selected properties", sharedModals.ModalContent()); Assert.Contains("Do you want to proceed?", sharedModals.ModalContent()); + sharedModals.ModalClickOKBttn(); } - else + else if(sharedModals.ModalContent().Contains("The selected property already exists in the system's inventory.")) { + Assert.Equal("User Override Required", sharedModals.ModalHeader()); Assert.Contains("The selected property already exists in the system's inventory. However, the record is missing spatial details.", sharedModals.ModalContent()); Assert.Contains("To add the property, the spatial details for this property will need to be updated. The system will attempt to update the property record with spatial information from the current selection.", sharedModals.ModalContent()); + sharedModals.ModalClickOKBttn(); } - - sharedModals.ModalClickOKBttn(); } } @@ -371,7 +372,7 @@ public void VerifyAcquisitionFileView(AcquisitionFile acquisition) AssertTrueContentEquals(acquisitionFileHeaderProductContent, acquisition.AcquisitionProjProductCode + " - " + acquisition.AcquisitionProjProduct); AssertTrueIsDisplayed(acquisitionFileHeaderHistoricalFileLabel); - Assert.True(webDriver.FindElements(acquisitionFileHeaderHistoricalFileContent).Count > 0); + //Assert.True(webDriver.FindElements(acquisitionFileHeaderHistoricalFileContent).Count > 0); AssertTrueIsDisplayed(acquisitionFileHeaderCreatedDateLabel); AssertTrueContentNotEquals(acquisitionFileHeaderCreatedDateContent, ""); diff --git a/testing/PIMS.Tests.Automation/PageObjects/AcquisitionTakes.cs b/testing/PIMS.Tests.Automation/PageObjects/AcquisitionTakes.cs index a9601c051e..86a03d41df 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/AcquisitionTakes.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/AcquisitionTakes.cs @@ -58,7 +58,7 @@ public class AcquisitionTakes : PageObjectBase private By takeLandActAcresInput = By.XPath("//input[@data-testid='radio-isnewlandact-yes']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::div/following-sibling::div/div/div/div/div/div/div/input[@name='area-acres']"); private By takeLandActEndDateInput = By.Id("datepicker-landActEndDt"); - private By takeLicenseConstructLabel = By.XPath("//label[contains(text(),'Is there a new License for Construction Access (TLCA/LTC)?')]"); + private By takeLicenseConstructLabel = By.XPath("//label[contains(text(),'Is there a new Licence for Construction Access (TLCA/LTC)?')]"); private By takeLicenseConstructRadioBttnGroup = By.CssSelector("input[name='isNewLicenseToConstruct']"); private By takeLicenseConstructSqMetresInput = By.XPath("//input[@data-testid='radio-isnewlicensetoconstruct-yes']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::div/following-sibling::div/div/div/div/div/div/div/input[@name='area-sq-meters']"); private By takeLicenseConstructSqFeetInput = By.XPath("//input[@data-testid='radio-isnewlicensetoconstruct-yes']/parent::div/parent::div/parent::div/parent::div/parent::div/parent::div/following-sibling::div/div/div/div/div/div/div/input[@name='area-sq-feet']"); @@ -276,7 +276,7 @@ public void InsertTake(Take take) if (sharedModals.ModalContent().Contains("You have created a Lease (Payable) Take")) { Assert.Contains("Follow-up required", sharedModals.ModalHeader()); - Assert.Contains("You have created a Lease (Payable) Take. You also need to create a Lease/License File.", sharedModals.ModalContent()); + Assert.Contains("You have created a Lease (Payable) Take. You also need to create a Lease/Licence File.", sharedModals.ModalContent()); } else { @@ -447,7 +447,7 @@ public void VerifyCreatedTakeViewForm(Take take) //License for Construction - AssertTrueIsDisplayed(By.XPath("//div[@data-testid='take-"+ index +"']/div/div/div/div/div/div/div/label[contains(text(),'Is there a new License for Construction Access (TLCA/LTC)')]")); + AssertTrueIsDisplayed(By.XPath("//div[@data-testid='take-"+ index +"']/div/div/div/div/div/div/div/label[contains(text(),'Is there a new Licence for Construction Access (TLCA/LTC)?')]")); Assert.Equal(2, webDriver.FindElements(By.XPath("//div[@data-testid='take-"+ index +"']/div/div/div/div/div/div/div/div/div/div/div/input[@id='input-licenseToConstructToggle']")).Count); if (take.IsLicenseConstruct.Equals("true")) { diff --git a/testing/PIMS.Tests.Automation/PageObjects/Contacts.cs b/testing/PIMS.Tests.Automation/PageObjects/Contacts.cs index 1f4aff9175..e0c2cb1665 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/Contacts.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/Contacts.cs @@ -1,6 +1,5 @@ using OpenQA.Selenium; using PIMS.Tests.Automation.Classes; -using System.Diagnostics.Contracts; namespace PIMS.Tests.Automation.PageObjects { @@ -77,25 +76,26 @@ public class Contacts : PageObjectBase private By contactCommentTextarea = By.CssSelector("textarea[name='comment']"); //Contacts Form View Elements - private By contactTitle = By.XPath("//h1[contains(text(),'Contact')]"); + private By contactTitle = By.XPath("//h1/div/div[contains(text(),'Contact')]"); private By contactEditButton = By.CssSelector("button[title='Edit Contact']"); - private By contactBreadcrumb = By.CssSelector("nav[aria-label='breadcrumb']"); + private By contactDetailsSubtitle = By.XPath("//div[contains(text(),'Contact Details')]"); - private By contactIndFullName = By.CssSelector("h2[data-testid='contact-person-fullname']"); - private By contactIndPrefNameLabel = By.XPath("//strong[contains(text(),'Preferred name')]"); - private By contactIndPrefNameContent = By.CssSelector("span[data-testid='contact-person-preferred']"); private By contactIndStatusSpan = By.CssSelector("span[data-testid='contact-person-status']"); - private By contactIndOrganizationLabel = By.XPath("//strong[contains(text(),'Organization(s)')]"); - private By contactIndOrganizationContent = By.CssSelector("a[data-testid='contact-person-organization']"); + private By contactIndFullName = By.CssSelector("div[data-testid='contact-person-fullname'] b"); + private By contactIndPrefNameLabel = By.XPath("//label[contains(text(),'Preferred name')]"); + private By contactIndPrefNameContent = By.CssSelector("div[data-testid='contact-person-preferred']"); + private By contactIndLinkedOrgsLabel = By.XPath("//label[contains(text(),'Linked organization')]"); + private By contactIndOrganizationContent = By.CssSelector("[data-testid='contact-person-organization'] a"); + private By contactIndContactInfoSubtitle = By.XPath("//h3[contains(text(),'Contact Info')]"); - private By contactOrgName = By.CssSelector("span[data-testid='contact-organization-fullname']"); - private By contactOrgAliasLabel = By.XPath("//strong[contains(text(),'Alias')]"); - private By contactOrgAliasContent = By.CssSelector("span[data-testid='contact-organization-alias']"); private By contactOrgStatusSpan = By.CssSelector("span[data-testid='contact-organization-status']"); - private By contactOrgIncorpNbrLabel = By.XPath("//strong[contains(text(),'Incorporation Number')]"); - private By contactOrgIncorpNbrContent = By.CssSelector("span[data-testid='contact-organization-incorporationNumber']"); + private By contactOrgName = By.CssSelector("div[data-testid='contact-organization-organizationName'] b"); + private By contactOrgAliasLabel = By.XPath("//label[contains(text(),'Alias')]"); + private By contactOrgAliasContent = By.CssSelector("div[data-testid='contact-organization-alias']"); + private By contactOrgIncorpNbrLabel = By.XPath("//label[contains(text(),'Incorporation number')]"); + private By contactOrgIncorpNbrContent = By.CssSelector("div[data-testid='contact-organization-incorporationNumber']"); + private By contactOrgPrefContactSubtitle = By.XPath("//h3[contains(text(),'Preferred Contact')]"); - private By contactInfoSubtitle = By.XPath("//h2[contains(text(),'Contact info')]"); private By contactEmailLabel = By.XPath("//strong[contains(text(),'Email')]"); private By contactEmail1Content = By.XPath("(//div[@data-testid='email-value'])[1]"); private By contactEmailType1Content = By.XPath("(//div[@data-testid='email-value']/parent::div)[1]/div/em"); @@ -108,7 +108,7 @@ public class Contacts : PageObjectBase private By contactPhoneType2Content = By.XPath("(//div[@data-testid='phone-value'])[2]/following-sibling::div/em"); private By contactAddressSubtitle = By.XPath("//h2[contains(text(),'Address')]"); - private By contactAddressMailSubtitle = By.XPath("//strong[contains(text(),'Mailing address')]"); + private By contactAddressMailSubtitle = By.XPath("//h3[contains(text(),'Mailing address')]"); private By contactAddressIndMailCounter = By.XPath("//div[1]/div/span[@data-testid='contact-person-address']/div"); private By contactAddressIndMailAddressLine1 = By.XPath("//div[1]/div/span[@data-testid='contact-person-address']/div[1]"); private By contactAddressIndMailAddressLine2 = By.XPath("//div[1]/div/span[@data-testid='contact-person-address']/div[2]"); @@ -116,7 +116,7 @@ public class Contacts : PageObjectBase private By contactAddressIndMailAddressLine4 = By.XPath("//div[1]/div/span[@data-testid='contact-person-address']/div[4]"); private By contactAddressIndMailAddressLine5 = By.XPath("//div[1]/div/span[@data-testid='contact-person-address']/div[5]"); private By contactAddressIndMailAddressLine6 = By.XPath("//div[1]/div/span[@data-testid='contact-person-address']/div[6]"); - private By contactAddressMailAddressRemoveBttn = By.XPath("//span[contains(text(),'Mailing Address')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/div/div/button/div/span[contains(text(),'Remove')]/parent::div/parent::button"); + private By contactAddressMailAddressRemoveBttn = By.XPath("//h3[contains(text(),'Mailing Address')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/div/div/button/div/span[contains(text(),'Remove')]/parent::div/parent::button"); private By contactAddressOrgMailCounter = By.XPath("//div[1]/div[@data-testid='contact-organization-address']/div"); private By contactAddressOrgMailAddressLine1 = By.XPath("//div[1]/div[@data-testid='contact-organization-address']/div[1]"); @@ -127,7 +127,7 @@ public class Contacts : PageObjectBase private By contactAddressOrgMailAddressLine6 = By.XPath("//div[1]/div[@data-testid='contact-organization-address']/div[6]"); private By contactAddressPropertyAddressRemoveBttn = By.XPath("//div[contains(text(),'Property Address')]/parent::div/parent::h2/following-sibling::div/div/div/div/div/button/div/span[contains(text(),'Remove')]/parent::div/parent::button"); - private By contactAddressPropertySubtitle = By.XPath("//strong[contains(text(),'Property address')]"); + private By contactAddressPropertySubtitle = By.XPath("//h3[contains(text(),'Property address')]"); private By contactAddressIndPropertyCounter = By.XPath("//div[2]/div/span[@data-testid='contact-person-address']/div"); private By contactAddressIndPropertyAddressLine1 = By.XPath("//div[2]/div/span[@data-testid='contact-person-address']/div[1]"); private By contactAddressIndPropertyAddressLine2 = By.XPath("//div[2]/div/span[@data-testid='contact-person-address']/div[2]"); @@ -145,7 +145,7 @@ public class Contacts : PageObjectBase private By contactAddressOrgPropertyAddressLine5 = By.XPath("//div[2]/div[@data-testid='contact-organization-address']/div[5]"); private By contactAddressOrgPropertyAddressLine6 = By.XPath("//div[2]/div[@data-testid='contact-organization-address']/div[6]"); - private By contactAddressBillingSubtitle = By.XPath("//strong[contains(text(),'Billing address')]"); + private By contactAddressBillingSubtitle = By.XPath("//h3[contains(text(),'Billing address')]"); private By contactAddressIndBillingCounter = By.XPath("//div[3]/div/span[@data-testid='contact-person-address']/div"); private By contactAddressIndBillingAddressLine1 = By.XPath("//div[3]/div/span[@data-testid='contact-person-address']/div[1]"); private By contactAddressIndBillingAddressLine2 = By.XPath("//div[3]/div/span[@data-testid='contact-person-address']/div[2]"); @@ -165,8 +165,8 @@ public class Contacts : PageObjectBase private By contactOrgIndividualContactsSubtitle = By.XPath("//h2[contains(text(),'Individual Contacts')]"); private By contactOrgIndividualContactsCount = By.CssSelector("a[data-testid='contact-organization-person']"); - private By commentsSubtitle = By.XPath("//strong[contains(text(),'Comments')]"); - private By commentsIndividualContent = By.CssSelector("span[data-testid='contact-person-comment']"); + private By commentsSubtitle = By.XPath("//h2[contains(text(),'Comments')]"); + private By commentsIndividualContent = By.CssSelector("div[data-testid='contact-person-comment']"); private By commentsOrganizationContent = By.CssSelector("div[data-testid='contact-organization-comment']"); //Contact Modal Element @@ -174,7 +174,6 @@ public class Contacts : PageObjectBase private By contactsSearchTable = By.CssSelector("div[data-testid='contactsTable']"); private By contactModalContinueSaveBttn = By.XPath("//button/div[contains(text(),'Continue Save')]"); - //private By contactConfirmCancelBttn = By.XPath("//button/div[contains(text(),'Confirm')]"); private SharedModals sharedModals; @@ -848,8 +847,6 @@ public void SaveContact() sharedModals.ModalClickOKBttn(); } - - AssertTrueIsDisplayed(contactBreadcrumb); } //Cancel Contact @@ -866,27 +863,26 @@ public void CancelContact() // ASSERT FUNCTIONS public void VerifyIndividualContactView(IndividualContact contact) { - Wait(3000); + Wait(); AssertTrueIsDisplayed(contactTitle); AssertTrueIsDisplayed(contactEditButton); + AssertTrueIsDisplayed(contactDetailsSubtitle); + + AssertTrueContentEquals(contactIndStatusSpan, contact.ContactStatus); - if(contact.FullName != "") + if (contact.FullName != "") AssertTrueContentEquals(contactIndFullName, contact.FullName); AssertTrueIsDisplayed(contactIndPrefNameLabel); if(contact.PreferableName != "") AssertTrueContentEquals(contactIndPrefNameContent, contact.PreferableName); - if(contact.ContactStatus != "") - AssertTrueContentEquals(contactIndStatusSpan, contact.ContactStatus); - - AssertTrueIsDisplayed(contactIndOrganizationLabel); - + AssertTrueIsDisplayed(contactIndLinkedOrgsLabel); if (contact.Organization != "") AssertTrueContentEquals(contactIndOrganizationContent, contact.Organization); - AssertTrueIsDisplayed(contactInfoSubtitle); + AssertTrueIsDisplayed(contactIndContactInfoSubtitle); AssertTrueIsDisplayed(contactEmailLabel); if (contact.IndEmail1 != "") @@ -1054,21 +1050,22 @@ public void VerifyOrganizationContactView(OrganizationContact contact) { AssertTrueIsDisplayed(contactTitle); AssertTrueIsDisplayed(contactEditButton); + AssertTrueIsDisplayed(contactDetailsSubtitle); - if(contact.OrganizationName != "") + AssertTrueContentEquals(contactOrgStatusSpan, contact.ContactStatus); + + if (contact.OrganizationName != "") AssertTrueContentEquals(contactOrgName, contact.OrganizationName); - AssertTrueIsDisplayed(contactOrgAliasLabel); + AssertTrueIsDisplayed(contactOrgAliasLabel); if(contact.Alias != "") AssertTrueContentEquals(contactOrgAliasContent, contact.Alias); - AssertTrueContentEquals(contactOrgStatusSpan, contact.ContactStatus); AssertTrueIsDisplayed(contactOrgIncorpNbrLabel); - if(contact.IncorporationNumber != "") AssertTrueContentEquals(contactOrgIncorpNbrContent,contact.IncorporationNumber); - AssertTrueIsDisplayed(contactInfoSubtitle); + AssertTrueIsDisplayed(contactOrgPrefContactSubtitle); AssertTrueIsDisplayed(contactEmailLabel); if (contact.OrgEmail1 != "") diff --git a/testing/PIMS.Tests.Automation/PageObjects/DispositionFileDetails.cs b/testing/PIMS.Tests.Automation/PageObjects/DispositionFileDetails.cs index b2f257594a..5da60eaed5 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/DispositionFileDetails.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/DispositionFileDetails.cs @@ -486,7 +486,7 @@ public void VerifyDispositionFileView(DispositionFile disposition) AssertTrueContentNotEquals(dispositionFileHeaderCodeContent, ""); AssertTrueIsDisplayed(dispositionFileHistoricalLabel); - Assert.True(webDriver.FindElements(dispositionFileHistoricalContent).Count > 0); + //Assert.True(webDriver.FindElements(dispositionFileHistoricalContent).Count > 0); AssertTrueIsDisplayed(dispositionFileHeaderCreatedDateLabel); AssertTrueContentNotEquals(dispositionFileHeaderCreatedDateContent, ""); diff --git a/testing/PIMS.Tests.Automation/PageObjects/LeaseDetails.cs b/testing/PIMS.Tests.Automation/PageObjects/LeaseDetails.cs index b6ad8415bd..76e6364cdd 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/LeaseDetails.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/LeaseDetails.cs @@ -7,16 +7,16 @@ namespace PIMS.Tests.Automation.PageObjects public class LeaseDetails : PageObjectBase { //Main Menu links Elements - private By menuManagementButton = By.CssSelector("div[data-testid='nav-tooltip-leases&licenses'] a"); - private By createLicenseButton = By.XPath("//a[contains(text(),'Create a Lease/License File')]"); + private By menuManagementButton = By.CssSelector("div[data-testid='nav-tooltip-leases&licences'] a"); + private By createLicenseButton = By.XPath("//a[contains(text(),'Create a Lease/Licence File')]"); //File Details Edit Icon private By licenseDetailsEditIcon = By.XPath("//div[@role='tabpanel']/div/div/div/button"); //Lease Header Elements - private By licenseHeaderNbrLabel = By.XPath("//label[contains(text(),'Lease/License #')]"); - private By licenseHeaderNbrContent = By.XPath("//label[contains(text(),'Lease/License #')]/parent::strong/parent::div/following-sibling::div/span[1]"); - private By licenseHeaderAccountType = By.XPath("//label[contains(text(),'Lease/License #')]/parent::strong/parent::div/following-sibling::div/span[2]"); + private By licenseHeaderNbrLabel = By.XPath("//label[contains(text(),'Lease/Licence #')]"); + private By licenseHeaderNbrContent = By.XPath("//label[contains(text(),'Lease/Licence #')]/parent::strong/parent::div/following-sibling::div/span[1]"); + private By licenseHeaderAccountType = By.XPath("//label[contains(text(),'Lease/Licence #')]/parent::strong/parent::div/following-sibling::div/span[2]"); private By licenseHeaderProperty = By.XPath("//label[contains(text(),'Property')]"); private By licenseHeaderPropertyContent = By.XPath("//label[contains(text(),'Property')]/parent::strong/parent::div/following-sibling::div/div/span"); private By licenseHeaderTenantLabel = By.XPath("//label[contains(text(),'Tenant')]"); @@ -37,11 +37,11 @@ public class LeaseDetails : PageObjectBase private By licenseHeaderExpiredFlag = By.XPath("//label[contains(text(),'Lease Start')]/parent::strong/parent::div/following-sibling::div[4]/div"); //Lease Details Elements - private By licenseDetailsLeaseDateSubtitle = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / License')]"); - private By licenseDetailsLeaseDateStartLabel = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / License')]/parent::div/div/label[contains(text(),'Start date')]"); - private By licenseDetailsLeaseDateStartContent = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / License')]/parent::div/div/label[contains(text(),'Start date')]/following-sibling::div"); - private By licenseDetailsLeaseDateEndLabel = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / License')]/parent::div/div/label[contains(text(),'Expiry')]"); - private By licenseDetailsLeaseDateEndContent = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / License')]/parent::div/div/label[contains(text(),'Expiry')]/following-sibling::div"); + private By licenseDetailsLeaseDateSubtitle = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / Licence')]"); + private By licenseDetailsLeaseDateStartLabel = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / Licence')]/parent::div/div/label[contains(text(),'Start date')]"); + private By licenseDetailsLeaseDateStartContent = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / Licence')]/parent::div/div/label[contains(text(),'Start date')]/following-sibling::div"); + private By licenseDetailsLeaseDateEndLabel = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / Licence')]/parent::div/div/label[contains(text(),'Expiry')]"); + private By licenseDetailsLeaseDateEndContent = By.XPath("//form/div/div/div/div/h4[contains(text(),'Lease / Licence')]/parent::div/div/label[contains(text(),'Expiry')]/following-sibling::div"); private By licenseDetailsCurrentTermSubtitle = By.XPath("//form/div/div/div/div/h4[contains(text(),'Current Term')]"); private By licenseDetailsCurrentTermStartLabel = By.XPath("//form/div/div/div/div/h4[contains(text(),'Current Term')]/parent::div/div/label[contains(text(),'Start date')]"); private By licenseDetailsCurrentTermStartContent = By.XPath("//form/div/div/div/div/h4[contains(text(),'Current Term')]/parent::div/div/label[contains(text(),'Start date')]/following-sibling::div"); @@ -62,7 +62,7 @@ public class LeaseDetails : PageObjectBase private By licenseDetailsProperty1LegalDescripContent = By.XPath("//h2/div/div[contains(text(),'Property Information')]/parent::div/parent::h2/following-sibling::div/div[1]/div/div/label[contains(text(),'Legal description')]/parent::div/following-sibling::div"); //Create Lease Details Elements - private By licenseCreateTitle = By.XPath("//h1[contains(text(),'Create Lease/License')]"); + private By licenseCreateTitle = By.XPath("//h1[contains(text(),'Create Lease/Licence')]"); private By licenseDetailsProjectSubtitle = By.XPath("//h2/div/div[contains(text(), 'Project')]"); private By licenseDetailsProjectLabel = By.XPath("//label[contains(text(),'Ministry project')]"); @@ -155,10 +155,10 @@ public class LeaseDetails : PageObjectBase private By licenseDetailsDocsSubtitle = By.XPath("//div[contains(text(),'Documentation')]"); private By licenseDetailsPhysicalLeaseExistViewLabel = By.XPath("//label[contains(text(),'Physical copy exists')]"); - private By licenseDetailsPhysicalLeaseExistLabel = By.XPath("//label[contains(text(),'Physical lease/license exists')]"); + private By licenseDetailsPhysicalLeaseExistLabel = By.XPath("//label[contains(text(),'Physical lease/licence exists')]"); private By licenseDetailsPhysicalLeaseExistSelector = By.Id("input-hasPhysicalLicense"); private By licenseDetailsDigitalLeaseExistViewLabel = By.XPath("//label[contains(text(),'Digital copy exists')]"); - private By licenseDetailsDigitalLeaseExistLabel = By.XPath("//label[contains(text(),'Digital lease/license exists')]"); + private By licenseDetailsDigitalLeaseExistLabel = By.XPath("//label[contains(text(),'Digital lease/licence exists')]"); private By licenseDetailsDigitalLeaseExistSelector = By.Id("input-hasDigitalLicense"); private By licenseDetailsLocationDocsLabel = By.XPath("//label[contains(text(),'Document location')]"); private By licenseDetailsLocationDocsTooltip = By.XPath("//label[contains(text(),'Document location')]/span/span[@data-testid='tooltip-icon-section-field-tooltip']"); @@ -478,7 +478,7 @@ public void UpdateLeaseFileDetails(Lease lease) public void EditLeaseFileDetailsBttn() { - WaitUntilClickable(licenseDetailsEditIcon); + Wait(); webDriver.FindElement(licenseDetailsEditIcon).Click(); } diff --git a/testing/PIMS.Tests.Automation/PageObjects/LeaseImprovements.cs b/testing/PIMS.Tests.Automation/PageObjects/LeaseImprovements.cs index a4e24c4898..094a354560 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/LeaseImprovements.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/LeaseImprovements.cs @@ -19,7 +19,7 @@ public class LeaseImprovements : PageObjectBase private By licenseImprovCommercialDescriptionContent = By.XPath("//div[contains(text(),'Commercial Improvements')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Description')]/parent::div/following-sibling::div"); private By licenseImprovCommercialDescriptionTextarea = By.Id("input-improvements.0.description"); - private By licenseImprovResidentialSubtitle = By.XPath("//div[contains(text(),'Other Improvements')]/parent::div/parent::h2"); + private By licenseImprovResidentialSubtitle = By.XPath("//div[contains(text(),'Residential Improvements')]/parent::div/parent::h2"); private By licenseImprovResidentialUnitNbrLabel = By.XPath("//div[contains(text(),'Residential')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Unit #')]"); private By licenceImprovResidentialUnitNbrInput = By.Id("input-improvements.1.address"); private By licenseImprovResidentialUnitContent = By.XPath("//div[contains(text(),'Residential')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Unit #')]/parent::div/following-sibling::div"); @@ -30,16 +30,16 @@ public class LeaseImprovements : PageObjectBase private By licenseImprovResidentialDescriptionTextarea = By.Id("input-improvements.1.description"); private By licenseImprovResidentialDescriptionContent = By.XPath("//div[contains(text(),'Residential Improvements')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Description')]/parent::div/following-sibling::div"); - private By licenseImprovOtherSubtitle = By.XPath("//div[contains(text(),'Other Improvements')]/parent::div/parent::h2"); - private By licenseImprovOtherlUnitNbrLabel = By.XPath("//div[contains(text(),'Other Improvements')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Unit #')]"); + private By licenseImprovOtherSubtitle = By.XPath("//span[contains(text(),'Other Improvements')]/parent::div/parent::div/parent::div/parent::h2"); + private By licenseImprovOtherlUnitNbrLabel = By.XPath("//span[contains(text(),'Other Improvements')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Unit #')]"); private By licenceImprovOtherUnitNbrInput = By.Id("input-improvements.2.address"); - private By licenseImprovOtherUnitNbrContent = By.XPath("//div[contains(text(),'Other Improvements')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Unit #')]/parent::div/following-sibling::div"); - private By licenseImprovOtherSizeLabel = By.XPath("//div[contains(text(),'Other Improvements')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Building size')]"); + private By licenseImprovOtherUnitNbrContent = By.XPath("//span[contains(text(),'Other Improvements')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Unit #')]/parent::div/following-sibling::div"); + private By licenseImprovOtherSizeLabel = By.XPath("//span[contains(text(),'Other Improvements')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Building size')]"); private By licenceImprovOtherSizeInput = By.Id("input-improvements.2.structureSize"); - private By licenseImprovOtherSizeContent = By.XPath("//div[contains(text(),'Other Improvements')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Building size')]/parent::div/following-sibling::div"); - private By licenseImprovOtherDescriptionLabel = By.XPath("//div[contains(text(),'Other Improvements')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Description')]"); + private By licenseImprovOtherSizeContent = By.XPath("//span[contains(text(),'Other Improvements')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Building size')]/parent::div/following-sibling::div"); + private By licenseImprovOtherDescriptionLabel = By.XPath("//span[contains(text(),'Other Improvements')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Description')]"); private By licenceImprovOtherDescriptionTextarea = By.Id("input-improvements.2.description"); - private By licenseImprovOtherDescriptionContent = By.XPath("//div[contains(text(),'Other Improvements')]/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Description')]/parent::div/following-sibling::div"); + private By licenseImprovOtherDescriptionContent = By.XPath("//span[contains(text(),'Other Improvements')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div/div/label[contains(text(),'Description')]/parent::div/following-sibling::div"); private By licenseImproSaveButton = By.XPath("//button/div[contains(text(),'Save')]/ancestor::button"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/LeaseTenants.cs b/testing/PIMS.Tests.Automation/PageObjects/LeaseTenants.cs index 9e79eb60aa..292623d6d9 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/LeaseTenants.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/LeaseTenants.cs @@ -24,7 +24,7 @@ public class LeaseTenants: PageObjectBase //Selected tenants private By tenantSelectedTenantsRows = By.CssSelector("div[data-testid='selected-items'] div[class='tr-wrapper']"); - private By tenantPrimaryContact1stCell = By.CssSelector("div[data-testid='selected-items'] div[class='tr-wrapper']:nth-child(1) div[class='td']:nth-child(5) p"); + private By tenantPrimaryContact1stCell = By.CssSelector("div[data-testid='selected-items'] div[class='tr-wrapper']:nth-child(1) div[class='td']:nth-child(4) p"); private By tenantPrimaryContact1stSelect = By.Id("input-tenants.0.primaryContactId"); private By tenantType1stSelect = By.Id("input-tenants.0.tenantType"); @@ -75,10 +75,10 @@ public void EditTenant() //Search and add a new tenant public void AddIndividualTenant(Tenant tenant) { - WaitUntilClickable(tenantAddTenantsBttn); + Wait(); webDriver.FindElement(tenantAddTenantsBttn).Click(); - Wait(3000); + Wait(); sharedSelectContact.SelectContact(tenant.Summary, "Individual"); //Choose tenant type diff --git a/testing/PIMS.Tests.Automation/PageObjects/ManageUsers.cs b/testing/PIMS.Tests.Automation/PageObjects/ManageUsers.cs index 157b17eb57..e962c67f5f 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/ManageUsers.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/ManageUsers.cs @@ -5,7 +5,7 @@ namespace PIMS.Tests.Automation.PageObjects public class ManageUsers : PageObjectBase { //Admin Tool Menu Elements - private By mainMenuAdminToolLink = By.XPath("//label[contains(text(),'Admin Tools')]/parent::a"); + private By mainMenuAdminToolLink = By.CssSelector("div[data-testid='nav-tooltip-admintools'] a"); private By adminSubmenuManageUserLink = By.XPath("//a[contains(text(),'Manage Users')]"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/PageObjectBase.cs b/testing/PIMS.Tests.Automation/PageObjects/PageObjectBase.cs index 0016d2de86..164b5a3761 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/PageObjectBase.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/PageObjectBase.cs @@ -1,7 +1,6 @@ using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using SeleniumExtras.WaitHelpers; -using System.Globalization; namespace PIMS.Tests.Automation.PageObjects { @@ -21,7 +20,7 @@ protected PageObjectBase(IWebDriver webDriver) wait = new WebDriverWait(webDriver, TimeSpan.FromSeconds(120)); } - protected virtual void Wait(int milliseconds = 3000) => Thread.Sleep(milliseconds); + protected virtual void Wait(int milliseconds = 2000) => Thread.Sleep(milliseconds); protected void WaitUntilSpinnerDisappear() { @@ -59,13 +58,13 @@ protected void ButtonElement(string buttonName) { wait.Until(ExpectedConditions.ElementExists(saveButton)); wait.Until(ExpectedConditions.ElementToBeClickable(saveButton)); - webDriver.FindElement(saveButton).Click(); + FocusAndClick(saveButton); } else { wait.Until(ExpectedConditions.ElementExists(cancelButton)); wait.Until(ExpectedConditions.ElementToBeClickable(cancelButton)); - webDriver.FindElement(cancelButton).Click(); + FocusAndClick(cancelButton); } } @@ -240,15 +239,23 @@ protected string TransformCurrencyFormat(string amount) protected string TransformNumberFormat(string amount) { - NumberFormatInfo nfi = new CultureInfo("en-US", false).NumberFormat; - - if (amount == "") return ""; else { decimal value = decimal.Parse(amount); - return value.ToString("#,##0.####"); + return value.ToString("#,##0.0000"); + } + } + + protected string TranformSqMtsFormat(string area) + { + if (area == "") + return ""; + else + { + decimal value = decimal.Parse(area); + return value.ToString("#,##0.####") + " m\r\n2"; } } diff --git a/testing/PIMS.Tests.Automation/PageObjects/PropertyInformation.cs b/testing/PIMS.Tests.Automation/PageObjects/PropertyInformation.cs index a12bb5554c..4d62ae2fa7 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/PropertyInformation.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/PropertyInformation.cs @@ -1,8 +1,5 @@ using OpenQA.Selenium; -using OpenQA.Selenium.Support.Events; using PIMS.Tests.Automation.Classes; -using System.Diagnostics; -using System.Threading.Channels; namespace PIMS.Tests.Automation.PageObjects { @@ -25,7 +22,7 @@ public class PropertyInformation : PageObjectBase private By propertyViewInfoBttn = By.XPath("//button/div[contains(text(),'View Property info')]"); private By propertyNewResearchFileBttn = By.XPath("//div[contains(text(),'Research File')]/parent::button"); private By propertyNewAcquisitionFileBttn = By.XPath("//div[contains(text(),'Acquisition File')]/parent::button"); - private By propertyNewLeaseFileBttn = By.XPath("//div[contains(text(),'Lease/License')]/parent::button"); + private By propertyNewLeaseFileBttn = By.XPath("//div[contains(text(),'Lease/Licence')]/parent::button"); private By propertyNewDispositionFileBttn = By.XPath("//div[contains(text(),'Disposition File')]/parent::button"); private By propertyNewSubdivisionFileBttn = By.XPath("//div[contains(text(),'Create Subdivision')]/parent::button"); private By propertyNewConsolidationFileBttn = By.XPath("//div[contains(text(),'Create Consolidation')]/parent::button"); @@ -585,7 +582,7 @@ public void VerifyTitleTab() public void VerifyValueTab() { - Wait(2000); + Wait(); AssertTrueIsDisplayed(propertyValueInfo); @@ -628,7 +625,7 @@ public void VerifyPropertyInformationHeader(bool hasHistoricalFile) AssertTrueContentNotEquals(propertyInformationHeaderAddressContent, ""); AssertTrueIsDisplayed(propertyInformationHeaderPlanLabel); - AssertTrueContentNotEquals(propertyInformationHeaderPlanContent, ""); + //AssertTrueContentNotEquals(propertyInformationHeaderPlanContent, ""); AssertTrueIsDisplayed(propertyInformationHeaderHistoricFileLabel); if(hasHistoricalFile) @@ -973,7 +970,7 @@ public void VerifyNonInventoryPropertyTabs() public int PropertyTabs() { - Wait(2000); + Wait(); return webDriver.FindElements(propertyInformationTabsTotal).Count(); } diff --git a/testing/PIMS.Tests.Automation/PageObjects/PropertyManagementTab.cs b/testing/PIMS.Tests.Automation/PageObjects/PropertyManagementTab.cs index ebc8a85428..f0e72b6664 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/PropertyManagementTab.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/PropertyManagementTab.cs @@ -155,7 +155,7 @@ public void UpdateLastContactButton() public void ViewLastActivityButton() { - Wait(2000); + Wait(); var lastInsertedActivityIndex = webDriver.FindElements(managementActivitiesBodyCount).Count; webDriver.FindElement(By.XPath("//div[@data-testid='PropertyManagementActivitiesTable']/div[@class='tbody']/div[@class='tr-wrapper']["+ lastInsertedActivityIndex +"]/div/div[@role='cell'][5]/div/div[1]/button")).Click(); @@ -419,7 +419,7 @@ public void VerifyInitManagementTabView() AssertTrueIsDisplayed(managementSummaryTitle); AssertTrueIsDisplayed(managementPropertyPurposeLabel); AssertTrueIsDisplayed(managementLeaseLabel); - AssertTrueContentEquals(managementLeaseContent, "Multiple"); + AssertTrueContentEquals(managementLeaseContent, "No"); AssertTrueIsDisplayed(managementUtilitiesPayableLabel); AssertTrueContentEquals(managementUtilitiesPayableContent, "Unknown"); AssertTrueIsDisplayed(managementTaxesPayableLabel); @@ -532,7 +532,7 @@ public void VerifyInsertedSummaryForm(PropertyManagement managementProperty) public void VerifyLastInsertedPropertyContactTable(PropertyContact contact) { - Wait(2000); + Wait(); var lastInsertedContactIndex = webDriver.FindElements(managementContactsBodyCount).Count; diff --git a/testing/PIMS.Tests.Automation/PageObjects/PropertyPIMSFiles.cs b/testing/PIMS.Tests.Automation/PageObjects/PropertyPIMSFiles.cs index f2147dcb5e..9f68d3b290 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/PropertyPIMSFiles.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/PropertyPIMSFiles.cs @@ -19,10 +19,10 @@ public class PropertyPIMSFiles : PageObjectBase private By propertyAcquisitionTable = By.XPath("//div[contains(text(),'Acquisition Files')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div[@data-testid='associationFiles']"); private By propertyAcquisitionExpandTableBttn = By.XPath("//div[contains(text(),'Acquisition Files')]/parent::div/parent::div/following-sibling::div/*[1]"); - private By propertyLeasesSubtitle = By.XPath("//div[contains(text(),'Leases/Licenses')]"); - private By propertyLeaseCountLabel = By.XPath("//div[contains(text(),'Leases/Licenses')]/following-sibling::div[@class='my-1 col-auto']/div"); - private By propertyLeaseTable = By.XPath("//div[contains(text(),'Leases/Licenses')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div[@data-testid='associationFiles']"); - private By propertyLeaseExpandTableBttn = By.XPath("//div[contains(text(),'Leases/Licenses')]/parent::div/parent::div/following-sibling::div/*[1]"); + private By propertyLeasesSubtitle = By.XPath("//div[contains(text(),'Leases/Licences')]"); + private By propertyLeaseCountLabel = By.XPath("//div[contains(text(),'Leases/Licences')]/following-sibling::div[@class='my-1 col-auto']/div"); + private By propertyLeaseTable = By.XPath("//div[contains(text(),'Leases/Licences')]/parent::div/parent::div/parent::div/parent::h2/following-sibling::div/div[@data-testid='associationFiles']"); + private By propertyLeaseExpandTableBttn = By.XPath("//div[contains(text(),'Leases/Licences')]/parent::div/parent::div/following-sibling::div/*[1]"); private By propertyDispositionFileSubtitle = By.XPath("//div[contains(text(),'Disposition Files')]"); private By propertyDispositionCountLabel = By.XPath("//div[contains(text(),'Disposition Files')]/following-sibling::div[@class='my-1 col-auto']/div"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/ResearchFiles.cs b/testing/PIMS.Tests.Automation/PageObjects/ResearchFiles.cs index c3bf280d3f..07fa01a45f 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/ResearchFiles.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/ResearchFiles.cs @@ -32,7 +32,7 @@ public class ResearchFiles : PageObjectBase private By researchFileNameInput = By.Id("input-name"); private By researchRoadNameInput = By.Id("input-roadName"); private By researchRoadAliasInput = By.Id("input-roadAlias"); - private By researchPurposeMultiselect = By.Id("purpose-selector"); + private By researchPurposeMultiselect = By.Id("purpose-selector_input"); private By researchRequestPurposeOptions = By.CssSelector("ul[class='optionContainer']"); private By researchRequestDateInput = By.Id("datepicker-requestDate"); private By researchRequestSourceSelect = By.Id("input-requestSourceTypeCode"); @@ -257,6 +257,8 @@ public void AddAdditionalResearchFileInfo(ResearchFile researchFile) foreach (string purpose in researchFile.ResearchPurpose) { webDriver.FindElement(researchPurposeMultiselect).Click(); + + Wait(); ChooseMultiSelectSpecificOption(researchRequestPurposeOptions, purpose); } } diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchContacts.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchContacts.cs index 80112894d6..66b5646f63 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchContacts.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchContacts.cs @@ -15,8 +15,8 @@ public class SearchContacts : PageObjectBase private By searchContactResultsBttn = By.Id("search-button"); private By searchContactResetBttn = By.Id("reset-button"); private By searchContactActiveChckBox = By.Id("input-activeContactsOnly"); - private By searchContactActiveSpan = By.XPath("//span[contains(text(),'Show active contacts only')]"); - private By searchContactAddNewBttn = By.XPath("//span[contains(text(),'Add new contact')]/parent::div/parent::button"); + private By searchContactActiveSpan = By.XPath("//span[contains(text(),'contacts only')]"); + private By searchContactAddNewBttn = By.XPath("//body/div[@id='root']/div[2]/div[2]/div[1]/div[1]/div[1]/div[2]/div[1]/button[1]/div[1]"); private By searchContactTableSummaryColumn = By.XPath("//div[contains(text(),'Summary')]"); private By searchContactOrderBySummaryBttn = By.CssSelector("div[data-testid='sort-column-summary']"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchLease.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchLease.cs index 2c29d54e06..4a4f4dc32d 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchLease.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchLease.cs @@ -8,9 +8,9 @@ namespace PIMS.Tests.Automation.PageObjects public class SearchLease : PageObjectBase { //Main Menu Elements - private By menuManagementButton = By.CssSelector("div[data-testid='nav-tooltip-leases&licenses'] a"); - private By searchLicenseButton = By.XPath("//a[contains(text(),'Manage Lease/License Files')]"); - private By searchLicenseTitle = By.XPath("//h3[contains(text(),'Leases & Licenses')]"); + private By menuManagementButton = By.CssSelector("div[data-testid='nav-tooltip-leases&licences'] a"); + private By searchLicenseButton = By.XPath("//a[contains(text(),'Manage Lease/Licence Files')]"); + private By searchLicenseTitle = By.XPath("//h3[contains(text(),'Leases & Licences')]"); //Search Filter Elements private By searchBySelect = By.Id("input-searchBy"); @@ -60,7 +60,7 @@ public class SearchLease : PageObjectBase private By searchLicense1stResultHistoricalFileContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[6]"); private By searchLicense1stResultStatusContent = By.XPath("//div[@data-testid='leasesTable']/div[@class='tbody']/div[@class='tr-wrapper'][1]/div/div[7]"); - private By searchLicenseFileHeaderCode = By.XPath("//label[contains(text(),'Lease/License #')]/parent::strong/parent::div/following-sibling::div/span[1]"); + private By searchLicenseFileHeaderCode = By.XPath("//label[contains(text(),'Lease/Licence #')]/parent::strong/parent::div/following-sibling::div/span[1]"); //Search Leases Pagination private By searchLeasesPaginationMenu = By.CssSelector("div[class='Menu-root']"); @@ -294,7 +294,7 @@ public void VerifySearchLeasesView() //Search Leases Filters AssertTrueIsDisplayed(searchBySelect); - AssertTrueIsDisplayed(searchLicensePIDInput); + AssertTrueIsDisplayed(searchLicenseLFileInput); AssertTrueIsDisplayed(searchLicenseStatusInput); AssertTrueIsDisplayed(searchLicenseProgramInput); AssertTrueIsDisplayed(searchLicenceTenantInput); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SearchProperties.cs b/testing/PIMS.Tests.Automation/PageObjects/SearchProperties.cs index cfad1dbb7f..c308467535 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SearchProperties.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SearchProperties.cs @@ -33,14 +33,14 @@ public class SearchProperties : PageObjectBase private By searchPropertyListLotSizeSortBttn = By.XPath("//div[@data-testid='propertiesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Lot Size')]/div"); private By searchPropertyListHeaderOwnership = By.XPath("//div[@data-testid='propertiesTable']/div[@class='thead thead-light']/div/div/div[contains(text(),'Ownership')]"); private By searchPropertyListOwnershipSortBttn = By.CssSelector("div[data-testid='sort-column-Ownership']"); - private By searchPropertyListContent = By.XPath("//div[@data-testid='propertiesTable']/form/div/div"); - private By searchPropertyListContent1stProp = By.XPath("//div[@data-testid='propertiesTable']/form/div/div[1]"); - private By searchPropertyListContent1stPID = By.XPath("//div[@data-testid='propertiesTable']/form/div/div[1]/div/div[1]"); - private By searchPropertyListContent1stLocation = By.XPath("//div[@data-testid='propertiesTable']/form/div/div[1]/div/div[4]"); - private By searchPropertyListContent1stLotSize = By.XPath("//div[@data-testid='propertiesTable']/form/div/div[1]/div/div[5]"); - private By searchPropertyListContent1stOwnership = By.XPath("//div[@data-testid='propertiesTable']/form/div/div[1]/div/div[6]"); + private By searchPropertyListContent = By.CssSelector("div[data-testid='propertiesTable'] div[class='tbody'] div[class='tr-wrapper']"); + private By searchPropertyListContent1stProp = By.CssSelector("div[data-testid='propertiesTable'] div[class='tbody'] div[class='tr-wrapper']:first-child"); + private By searchPropertyListContent1stPID = By.CssSelector("div[data-testid='propertiesTable'] div[class='tbody'] div[class='tr-wrapper']:first-child div[role='cell']:nth-child(1)"); + private By searchPropertyListContent1stLocation = By.CssSelector("div[data-testid='propertiesTable'] div[class='tbody'] div[class='tr-wrapper']:first-child div[role='cell']:nth-child(5)"); + private By searchPropertyListContent1stLotSize = By.CssSelector("div[data-testid='propertiesTable'] div[class='tbody'] div[class='tr-wrapper']:first-child div[role='cell']:nth-child(6)"); + private By searchPropertyListContent1stOwnership = By.CssSelector("div[data-testid='propertiesTable'] div[class='tbody'] div[class='tr-wrapper']:first-child div[role='cell']:nth-child(7)"); private By searchPropertyListContent1stViewTabBttn = By.CssSelector("div[data-testid='propertiesTable'] div[class='tbody'] div[class='tr-wrapper']:first-child button[data-testid='view-prop-tab']"); - private By searchPropertyListContent1stViewWindowBttn = By.XPath("//div[@data-testid='propertiesTable']/form/div/div[1]/div/div[7]/div/button[@data-testid='view-prop-ext']"); + private By searchPropertyListContent1stViewWindowBttn = By.CssSelector("div[data-testid='propertiesTable'] div[class='tbody'] div[class='tr-wrapper']:first-child button[data-testid='view-prop-ext']"); private By searchPropertyListPaginationMenu = By.CssSelector("div[class='Menu-root']"); private By searchPropertyListPaginationMenuBttn = By.CssSelector("div[class='Menu-button']"); private By searchPropertyListPagination = By.CssSelector("ul[class='pagination']"); diff --git a/testing/PIMS.Tests.Automation/PageObjects/SharedFileProperties.cs b/testing/PIMS.Tests.Automation/PageObjects/SharedFileProperties.cs index 800b6c0982..bd385a93bc 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SharedFileProperties.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SharedFileProperties.cs @@ -342,7 +342,7 @@ public void DeleteLastPropertyFromLease() if (webDriver.FindElements(propertiesFileConfirmationModal).Count > 0) { Assert.True(sharedModals.ModalHeader() == "Removing Property from form"); - Assert.True(sharedModals.ModalContent() == "Are you sure you want to remove this property from this lease/license?"); + Assert.True(sharedModals.ModalContent() == "Are you sure you want to remove this property from this lease/licence?"); sharedModals.ModalClickOKBttn(); } @@ -367,13 +367,15 @@ public void SaveFileProperties() Wait(); while (webDriver.FindElements(propertiesFileConfirmationModal).Count() > 0) { - Assert.Equal("User Override Required", sharedModals.SecondaryModalHeader()); + if (sharedModals.SecondaryModalContent().Contains("You have added one or more properties to the disposition file that are not in the MoTI Inventory")) { + Assert.Equal("User Override Required", sharedModals.SecondaryModalHeader()); Assert.Contains("You have added one or more properties to the disposition file that are not in the MoTI Inventory. Do you want to proceed?", sharedModals.SecondaryModalContent()); } else { + Assert.Equal("User Override Required", sharedModals.SecondaryModalHeader()); Assert.Contains("The selected property already exists in the system's inventory. However, the record is missing spatial details.", sharedModals.SecondaryModalContent()); Assert.Contains("To add the property, the spatial details for this property will need to be updated. The system will attempt to update the property record with spatial information from the current selection.", sharedModals.SecondaryModalContent()); } diff --git a/testing/PIMS.Tests.Automation/PageObjects/SubdivisionConsolidationProperties.cs b/testing/PIMS.Tests.Automation/PageObjects/SubdivisionConsolidationProperties.cs index f582e41076..19c5b87a03 100644 --- a/testing/PIMS.Tests.Automation/PageObjects/SubdivisionConsolidationProperties.cs +++ b/testing/PIMS.Tests.Automation/PageObjects/SubdivisionConsolidationProperties.cs @@ -135,7 +135,7 @@ public void NavigateToCreateNewConsolidation() public void SaveSubdivision() { - WaitUntilClickable(subdivisionPropertiesCreateButton); + Wait(); webDriver.FindElement(subdivisionPropertiesCreateButton).Click(); Wait(); @@ -151,7 +151,7 @@ public void SaveSubdivision() public void SaveConsolidation() { - WaitUntilClickable(consolidationPropertiesCreateButton); + Wait(); webDriver.FindElement(consolidationPropertiesCreateButton).Click(); Wait(); @@ -348,7 +348,7 @@ public void VerifySubdivisionHistory(PropertySubdivision subdivision) AssertTrueContentEquals(subdivisionParentIdentifier, "PID: " + subdivision.SubdivisionSource.PropertyHistoryIdentifier); AssertTrueContentEquals(subdivisionParentPlan, subdivision.SubdivisionSource.PropertyHistoryPlan); AssertTrueContentEquals(subdivisionParentStatus, subdivision.SubdivisionSource.PropertyHistoryStatus); - AssertTrueElementContains(subdivisionParentArea, TransformNumberFormat(subdivision.SubdivisionSource.PropertyHistoryArea)); + AssertTrueContentEquals(subdivisionParentArea, TranformSqMtsFormat(subdivision.SubdivisionSource.PropertyHistoryArea)); for (int i = 0; i < subdivision.SubdivisionDestination.Count; i++) { @@ -356,7 +356,7 @@ public void VerifySubdivisionHistory(PropertySubdivision subdivision) AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElementNbr +") div[role='cell']:nth-child(3) a"), "PID: " + subdivision.SubdivisionDestination[i].PropertyHistoryIdentifier); AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElementNbr +") div[role='cell']:nth-child(4)"), subdivision.SubdivisionDestination[i].PropertyHistoryPlan); AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElementNbr +") div[role='cell']:nth-child(5)"), subdivision.SubdivisionDestination[i].PropertyHistoryStatus); - AssertTrueElementContains(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElementNbr +") div[role='cell']:nth-child(6)"), TransformNumberFormat(subdivision.SubdivisionDestination[i].PropertyHistoryArea)); + AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElementNbr +") div[role='cell']:nth-child(6)"), TranformSqMtsFormat(subdivision.SubdivisionDestination[i].PropertyHistoryArea)); } } @@ -380,14 +380,14 @@ public void VerifyConsolidationHistory(PropertyConsolidation consolidation) AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ parentsElementNbr +") div[role='cell']:nth-child(3) a"), "PID: " + consolidation.ConsolidationSource[i].PropertyHistoryIdentifier); AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ parentsElementNbr +") div[role='cell']:nth-child(4)"), consolidation.ConsolidationSource[i].PropertyHistoryPlan); AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ parentsElementNbr +") div[role='cell']:nth-child(5)"), consolidation.ConsolidationSource[i].PropertyHistoryStatus); - AssertTrueElementContains(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ parentsElementNbr +") div[role='cell']:nth-child(6)"), TransformNumberFormat(consolidation.ConsolidationSource[i].PropertyHistoryArea)); + AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ parentsElementNbr +") div[role='cell']:nth-child(6)"), TranformSqMtsFormat(consolidation.ConsolidationSource[i].PropertyHistoryArea)); } var childElement = webDriver.FindElements(subconTableContent).Count; AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElement +") div[role='cell']:nth-child(3) a"), "PID: " + consolidation.ConsolidationDestination.PropertyHistoryIdentifier); AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElement +") div[role='cell']:nth-child(4)"), consolidation.ConsolidationDestination.PropertyHistoryPlan); AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElement +") div[role='cell']:nth-child(5)"), consolidation.ConsolidationDestination.PropertyHistoryStatus); - AssertTrueElementContains(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElement +") div[role='cell']:nth-child(6)"), TransformNumberFormat(consolidation.ConsolidationDestination.PropertyHistoryArea)); + AssertTrueContentEquals(By.CssSelector("div[data-testid='propertyOperationTable'] div[class='tbody'] div[class='tr-wrapper']:nth-child("+ childElement +") div[role='cell']:nth-child(6)"), TranformSqMtsFormat(consolidation.ConsolidationDestination.PropertyHistoryArea)); } } } diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/LeaseLicenseSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/LeaseLicenseSteps.cs index 3aa3a27f08..c095b80783 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/LeaseLicenseSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/LeaseLicenseSteps.cs @@ -746,7 +746,7 @@ public void SearchExistingLicense(int rowNumber) //Filter leases Files PopulateLeaseLicense(rowNumber); - searchLeases.FilterLeasesFiles(lease.SearchProperties.PID, "", "", "", "", "", lease.LeaseStatus, "", lease.LeaseExpiryDate, "", "", ""); + searchLeases.FilterLeasesFiles("025-325-841", "", "", "", "", "", lease.LeaseStatus, "", lease.LeaseExpiryDate, "", "", ""); Assert.True(searchLeases.SearchFoundResults()); searchLeases.FilterLeasesFiles("", "", "", "", "", "", "", "Progressive Motor Sports", "", "", "", ""); @@ -755,8 +755,8 @@ public void SearchExistingLicense(int rowNumber) searchLeases.FilterLeasesFiles("003-549-551", "", "", "", "", "", "Duplicate", "Jonathan Doe", "05/12/1987", "", "", ""); Assert.False(searchLeases.SearchFoundResults()); - searchLeases.FilterLeasesFiles("", "", "", "", "TestPN654", "", "", "", "", "", "", ""); - Assert.True(searchLeases.SearchFoundResults()); + //searchLeases.FilterLeasesFiles("", "", "", "", "TestPN654", "", "", "", "", "", "", ""); + //Assert.True(searchLeases.SearchFoundResults()); searchLeases.FilterLeasesFiles("", "", "", "", "", "", "Terminated", "", "03/22/2024", "", "", ""); searchLeases.OrderByLastLease(); diff --git a/testing/PIMS.Tests.Automation/StepDefinitions/PropertiesSteps.cs b/testing/PIMS.Tests.Automation/StepDefinitions/PropertiesSteps.cs index 76cdc66528..9b448091c3 100644 --- a/testing/PIMS.Tests.Automation/StepDefinitions/PropertiesSteps.cs +++ b/testing/PIMS.Tests.Automation/StepDefinitions/PropertiesSteps.cs @@ -101,7 +101,7 @@ public void ReviewPropertyInformation(int rowNumber) searchProperties.NavigatePropertyListView(); //Search for a property - //searchProperties.SearchPropertyByPINPID(property.PID); + searchProperties.SearchPropertyByPINPID(property.PID); //Select the first property from the list searchProperties.ChooseFirstPropertyFromList(); @@ -190,7 +190,7 @@ public void ReviewPropertyInformationList(int rowNumber) searchProperties.SearchPropertyByAddressList(searchProperty.Address); //Validate that the result gives only one pin - Assert.True(searchProperties.PropertiesListFoundCount() == 5); + Assert.True(searchProperties.PropertiesListFoundCount() == 2); //Search for a valid PIN in Inventory searchProperties.SearchPropertyReset(); diff --git a/testing/Testing DB Scripts/DELETE AUTOMATION TEST DATA.sql b/testing/Testing DB Scripts/DELETE AUTOMATION TEST DATA.sql index da10c288f8..24b24dd221 100644 --- a/testing/Testing DB Scripts/DELETE AUTOMATION TEST DATA.sql +++ b/testing/Testing DB Scripts/DELETE AUTOMATION TEST DATA.sql @@ -100,18 +100,18 @@ DELETE FROM PIMS_DISPOSITION_FILE_DOCUMENT WHERE DISPOSITION_FILE_ID IN (SELECT DELETE FROM PIMS_DISPOSITION_FILE WHERE APP_CREATE_USERID IN ('TRANPSP1', 'TRANPSP2'); -- 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)); -UPDATE PIMS_PROPERTY SET IS_OWNED = 1, IS_RETIRED = 0, CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE PID IN (9117270, 17995345); -DELETE FROM PIMS_PROPERTY_OPERATION WHERE PROPERTY_OPERATION_TYPE_CODE = 'SUBDIVIDE' AND SOURCE_PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (009117270, 17995345)); -DELETE FROM PIMS_PROPERTY_OPERATION WHERE PROPERTY_OPERATION_TYPE_CODE = 'SUBDIVIDE' AND DESTINATION_PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (5091829, 3904181, 18088007)); -DELETE FROM PIMS_PROPERTY WHERE PID IN (5091829, 3904181, 18088007); +--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)); +UPDATE PIMS_PROPERTY SET IS_OWNED = 1, IS_RETIRED = 0, CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE PID IN (016440790, 016334361); +DELETE FROM PIMS_PROPERTY_OPERATION WHERE PROPERTY_OPERATION_TYPE_CODE = 'SUBDIVIDE' AND SOURCE_PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (016440790, 016334361, 015181197)); +DELETE FROM PIMS_PROPERTY_OPERATION WHERE PROPERTY_OPERATION_TYPE_CODE = 'SUBDIVIDE' AND DESTINATION_PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (015192008, 015191877, 015190960, 016334361, 015492915)); +DELETE FROM PIMS_PROPERTY WHERE PID IN (015192008, 015191877, 015190960, 015492915); -- CONSOLIDATIONS -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 (014149478, 014151821, 014412942, 014412951, 028443969, 001282344)); -UPDATE PIMS_PROPERTY SET IS_OWNED = 1, IS_RETIRED = 0, CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE PID IN (014149478, 014151821, 014412942, 014412951, 028443969, 001282344, 008950504); -DELETE FROM PIMS_PROPERTY_OPERATION WHERE PROPERTY_OPERATION_TYPE_CODE = 'CONSOLIDATE' AND SOURCE_PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (014149478, 014151821, 014412942, 014412951, 028443969, 001282344)); -DELETE FROM PIMS_PROPERTY_OPERATION WHERE PROPERTY_OPERATION_TYPE_CODE = 'CONSOLIDATE' AND DESTINATION_PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (010525564, 014412942)); -DELETE FROM PIMS_PROPERTY WHERE PID IN (010525564); +--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 (014149478, 014151821, 014412942, 014412951, 028443969, 001282344)); +UPDATE PIMS_PROPERTY SET IS_OWNED = 1, IS_RETIRED = 0, CONCURRENCY_CONTROL_NUMBER = CONCURRENCY_CONTROL_NUMBER + 1 WHERE PID IN (016372387, 005602718, 015013430, 015192032, 015181197, 017766036); +DELETE FROM PIMS_PROPERTY_OPERATION WHERE PROPERTY_OPERATION_TYPE_CODE = 'CONSOLIDATE' AND SOURCE_PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (016372387, 005602718, 015013430, 015192032)); +DELETE FROM PIMS_PROPERTY_OPERATION WHERE PROPERTY_OPERATION_TYPE_CODE = 'CONSOLIDATE' AND DESTINATION_PROPERTY_ID IN (SELECT PROPERTY_ID FROM PIMS_PROPERTY WHERE PID IN (015801306, 015013430)); +DELETE FROM PIMS_PROPERTY WHERE PID IN (015492915, 015801306); -- PROPERTIES HISTORICAL FILE: ADD HISTORICAL FILES TO TESTING DATA INSERT INTO PIMS_HISTORICAL_FILE_NUMBER (HISTORICAL_FILE_NUMBER, HISTORICAL_FILE_NUMBER_TYPE_CODE, OTHER_HIST_FILE_NUMBER_TYPE_CODE, CONCURRENCY_CONTROL_NUMBER, PROPERTY_ID)