PSP-7968, PSP-7967, PSP-8087

testing/PIMS.Tests.Automation/Classes/Property.cs

@@ -100,4 +100,24 @@ public class ManagementPropertyActivityInvoice
  public string PropertyActivityInvoicePSTAmount { get; set; } = null!;
  public string PropertyActivityInvoiceTotalAmount { get; set; } = null!;
  }
+
+ public class PropertyHistory
+ {
+ public string PropertyHistoryIdentifier { get; set; } = null!;
+ public string PropertyHistoryPlan { get; set; } = null!;
+ public string PropertyHistoryStatus { get; set; } = null!;
+ public string PropertyHistoryArea { get; set; } = null!;
+ }
+
+ public class PropertySubdivision
+ {
+ public PropertyHistory SubdivisionSource { get; set; } = new PropertyHistory();
+ public List<PropertyHistory> SubdivisionDestination { get; set; } = new List<PropertyHistory>();
+ }
+
+ public class PropertyConsolidation
+ {
+ public List<PropertyHistory> ConsolidationSource { get; set; } = new List<PropertyHistory>();
+ public PropertyHistory ConsolidationDestination { get; set; } = new PropertyHistory();
+ }
 }

testing/PIMS.Tests.Automation/Features/DispositionFiles.feature

@@ -9,12 +9,12 @@ Scenario: 01. Disposition File Details
  And I update the File details from an existing Disposition File from row number 3
  Then A new Disposition file is created successfully
 
-#Scenario: 02. Disposition File Properties
-# Given I create a new Disposition File from row number 5
-# When I add Properties to the Disposition File
-# And I update a Disposition File's Properties from row number 6
-# And I update a Property details from row number 5
-# Then A new Disposition file is created successfully
+Scenario: 02. Disposition File Properties
+ Given I create a new Disposition File from row number 5
+ When I add Properties to the Disposition File
+ And I update a Disposition File's Properties from row number 6
+ And I update a Property details from row number 5
+ Then A new Disposition file is created successfully
 
 Scenario: 03. Disposition Checklist Tab
  Given I create a new Disposition File from row number 7
@@ -40,7 +40,7 @@ Scenario: 06. Disposition File Notes
  Then A new Disposition file is created successfully
 
 Scenario: 07. Disposition File from PIN
- Given I create a new Disposition File from row number 12
+ Given I create a Disposition File from a pin on map from row number 12
  Then A new Disposition file is created successfully
 
 Scenario: 08. Disposition Files List View

testing/PIMS.Tests.Automation/Features/Properties.feature

@@ -27,8 +27,9 @@ Scenario: 04. Property Management Activity Digital Documents
  And I delete all activities from the Property Management Tab
  Then Property Management Tab has been updated successfully
 
-Scenario: 05. Property Map Filters and Details validation
- Given I search for a Property in the Inventory by different filters from row number 9
+Scenario: 05. Properties Map and List Filters
+ Given I search for a Property in the Map by different filters from row number 9
+ When I search for a Property in the Properties List by different filters from row number 29
  Then Properties filters works successfully
 
 Scenario: 06. Non-Inventory Property Information

testing/PIMS.Tests.Automation/Features/SubdivisionConsolidation.feature

@@ -0,0 +1,13 @@
+Feature: SubdivisionConsolidation
+
+A short summary of the feature
+
+@SubdivisionConsolidation
+Scenario Outline: 01. Create Subdivisions
+ When I create a Subdivision from row number <RowNumber>
+ Then Subdivision is created successfully
+
+Examples: 
+ | RowNumber |
+ | 1 |
+ | 4 |

testing/PIMS.Tests.Automation/PIMS.Tests.Automation.csproj

@@ -23,7 +23,7 @@
  <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
  <PackageReference Include="Selenium.Support" Version="4.18.1" />
- <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.5700" />
+ <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.11100" />
  <PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
  <PackageReference Include="FluentAssertions" Version="6.12.0" />
  <PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />

testing/PIMS.Tests.Automation/PageObjects/AcquisitionDetails.cs

@@ -1,6 +1,4 @@
 using OpenQA.Selenium;
-using SeleniumExtras.WaitHelpers;
-using OpenQA.Selenium.Support.UI;
 using System.Text.RegularExpressions;
 using PIMS.Tests.Automation.Classes;
 
@@ -137,12 +135,6 @@ public void NavigateToCreateNewAcquisitionFile()
  FocusAndClick(createAcquisitionFileButton);
  }
 
- public void NavigateToFileSummary()
- {
- WaitUntilClickable(acquisitionFileSummaryBttn);
- webDriver.FindElement(acquisitionFileSummaryBttn).Click();
- }
-
  public void NavigateToFileDetailsTab()
  {
  WaitUntilClickable(acquisitionFileDetailsTab);
@@ -767,9 +759,15 @@ private void AddOwners(AcquisitionOwner owner, int ownerIndex)
  if(owner.OwnerMailAddress.AddressLine1 != "")
  webDriver.FindElement(By.Id("input-owners["+ ownerIndex +"].address.streetAddress1")).SendKeys(owner.OwnerMailAddress.AddressLine1);
  if (owner.OwnerMailAddress.AddressLine2 != "")
+ {
+ webDriver.FindElement(By.XPath("//input[@id='input-owners["+ ownerIndex +"].address.streetAddress1']/parent::div/parent::div/parent::div/parent::div/parent::div /following-sibling::div/div/div/div/button")).Click();
  webDriver.FindElement(By.Id("input-owners["+ ownerIndex +"].address.streetAddress2")).SendKeys(owner.OwnerMailAddress.AddressLine2);
+ }
  if (owner.OwnerMailAddress.AddressLine3 != "")
+ {
+ webDriver.FindElement(By.XPath("//input[@id='input-owners["+ ownerIndex +"].address.streetAddress2']/parent::div/parent::div/parent::div/parent::div/parent::div /following-sibling::div/div/div/div/button")).Click();
  webDriver.FindElement(By.Id("input-owners["+ ownerIndex +"].address.streetAddress3")).SendKeys(owner.OwnerMailAddress.AddressLine3);
+ }
  if (owner.OwnerMailAddress.Country != "")
  ChooseSpecificSelectOption(By.Id("input-owners["+ ownerIndex +"].address.countryId"), owner.OwnerMailAddress.Country);
  if (owner.OwnerMailAddress.City != "")