Automation test - Stabilization of some automated features

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

@@ -8,14 +8,14 @@ public class AcquisitionFile
         public string? AcquisitionProjProduct { get; set; } = String.Empty;
         public string? AcquisitionProjFunding { get; set; } = String.Empty;
         public string? AcquisitionFundingOther { get; set; } = String.Empty;
-
+        public string? AssignedDate { get; set; } = String.Empty;
         public string? DeliveryDate { get; set; } = String.Empty;
         public string? AcquisitionCompletedDate { get; set; } = String.Empty;
         public string AcquisitionFileName { get; set; } = null!;
         public string? HistoricalFileNumber { get; set; } = String.Empty;
         public string? PhysicalFileStatus { get; set; } = String.Empty;
         public string AcquisitionType { get; set; } = null!;
-        public string MOTIRegion { get; set; } = null!;
+        public string AcquisitionMOTIRegion { get; set; } = null!;
         public int AcquisitionTeamStartRow { get; set; } = 0;
         public int AcquisitionTeamCount { get; set; } = 0;
         public List<AcquisitionTeamMember>? AcquisitionTeam { get; set; } = new List<AcquisitionTeamMember>();

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

@@ -1,8 +1,11 @@
 
 namespace PIMS.Tests.Automation.Classes
 {
-    public class Contact
+    public class OrganizationContact
     {
+        public string OrganizationName { get; set; } = null!;
+        public string? Alias { get; set; } = String.Empty;
+        public string? IncorporationNumber { get; set; } = String.Empty;
         public string ContactStatus { get; set; } = null!;
         public string? Email1 { get; set; } = String.Empty;
         public string? EmailType1 { get; set; } = String.Empty;
@@ -45,21 +48,58 @@ public class Contact
         public string? BillingOtherCountry { get; set; } = String.Empty;
         public string? BillingPostalCode { get; set; } = String.Empty;
         public string? Comments { get; set; } = String.Empty;
-    }
-    public class OrganizationContact: Contact
-    {
-        public string OrganizationName { get; set; } = null!;
-        public string? Alias { get; set; } = String.Empty;
-        public string? IncorporationNumber { get; set; } = String.Empty;
+
     }
 
-    public class IndividualContact : Contact
+    public class IndividualContact
     {
         public string FirstName { get; set; } = null!;
         public string? MiddleName { get; set; } = String.Empty;
         public string LastName { get; set; } = null!;
         public string FullName { get; set; } = null!;
         public string? PreferableName { get; set; } = String.Empty;
         public string? Organization { get; set; } = String.Empty;
+        public string ContactStatus { get; set; } = null!;
+        public string? Email1 { get; set; } = String.Empty;
+        public string? EmailType1 { get; set; } = String.Empty;
+        public string? EmailTypeDisplay1 { get; set; } = String.Empty;
+        public string? Email2 { get; set; } = String.Empty;
+        public string? EmailType2 { get; set; } = String.Empty;
+        public string? EmailTypeDisplay2 { get; set; } = String.Empty;
+        public string? Phone1 { get; set; } = String.Empty;
+        public string? PhoneType1 { get; set; } = String.Empty;
+        public string? PhoneTypeDisplay1 { get; set; } = String.Empty;
+        public string? Phone2 { get; set; } = String.Empty;
+        public string? PhoneType2 { get; set; } = String.Empty;
+        public string? PhoneTypeDisplay2 { get; set; } = String.Empty;
+        public string? MailAddressLine1 { get; set; } = String.Empty;
+        public string? MailAddressLine2 { get; set; } = String.Empty;
+        public string? MailAddressLine3 { get; set; } = String.Empty;
+        public string? MailCity { get; set; } = String.Empty;
+        public string? MailProvince { get; set; } = String.Empty;
+        public string? MailProvDisplay { get; set; } = String.Empty;
+        public string? MailCityProvinceView { get; set; } = String.Empty;
+        public string? MailCountry { get; set; } = String.Empty;
+        public string? MailOtherCountry { get; set; } = String.Empty;
+        public string? MailPostalCode { get; set; } = String.Empty;
+        public string? PropertyAddressLine1 { get; set; } = String.Empty;
+        public string? PropertyAddressLine2 { get; set; } = String.Empty;
+        public string? PropertyAddressLine3 { get; set; } = String.Empty;
+        public string? PropertyCity { get; set; } = String.Empty;
+        public string? PropertyProvince { get; set; } = String.Empty;
+        public string? PropertyCityProvinceView { get; set; } = String.Empty;
+        public string? PropertyCountry { get; set; } = String.Empty;
+        public string? PropertyOtherCountry { get; set; } = String.Empty;
+        public string? PropertyPostalCode { get; set; } = String.Empty;
+        public string? BillingAddressLine1 { get; set; } = String.Empty;
+        public string? BillingAddressLine2 { get; set; } = String.Empty;
+        public string? BillingAddressLine3 { get; set; } = String.Empty;
+        public string? BillingCity { get; set; } = String.Empty;
+        public string? BillingProvince { get; set; } = String.Empty;
+        public string? BillingCityProvinceView { get; set; } = String.Empty;
+        public string? BillingCountry { get; set; } = String.Empty;
+        public string? BillingOtherCountry { get; set; } = String.Empty;
+        public string? BillingPostalCode { get; set; } = String.Empty;
+        public string? Comments { get; set; } = String.Empty;
     }
 }

testing/PIMS.Tests.Automation/Drivers/BrowserDriver.cs

@@ -9,12 +9,13 @@ public class BrowserDriver : IDisposable
     {
         private readonly Lazy<IWebDriver> currentWebDriverLazy;
         private readonly Lazy<IConfiguration> configurationLazy;
-        //private bool _isDisposed;
         private readonly bool closeBrowserOnDispose;
         private readonly bool runAutomationHeadless;
 
         public BrowserDriver()
         {
+
+            System.Diagnostics.Debug.WriteLine(Environment.GetEnvironmentVariable("BASE_URL"));
             currentWebDriverLazy = new Lazy<IWebDriver>(CreateEdgeWebDriver);
             configurationLazy = new Lazy<IConfiguration>(ReadConfiguration);
             closeBrowserOnDispose = Configuration.GetValue("CloseBrowserAfterEachTest", true);
@@ -39,6 +40,7 @@ private IWebDriver CreateChromeWebDriver()
 
             var chromeDriver = new ChromeDriver(ChromeDriverService.CreateDefaultService(), options);
             chromeDriver.Url = Configuration.GetValue<string>("baseUrl");
+            //chromeDriver.Url = Environment.GetEnvironmentVariable("BASE_URL");
 
             return chromeDriver;
         }
@@ -57,6 +59,8 @@ private IWebDriver CreateEdgeWebDriver()
 
             var edgeDriver = new EdgeDriver(EdgeDriverService.CreateDefaultService(), options);
             edgeDriver.Url = Configuration.GetValue<string>("baseUrl");
+            //var baseUrl = Environment.GetEnvironmentVariable("BASE_URL");
+            //edgeDriver.Url = baseUrl;
 
             return edgeDriver;
         }
@@ -68,17 +72,10 @@ private IConfiguration ReadConfiguration() =>
 
         public void Dispose()
         {
-            //if (_isDisposed)
-            //{
-            //    return;
-            //}
-
             if (currentWebDriverLazy.IsValueCreated && closeBrowserOnDispose)
             {
                 Current.Quit();
             }
-
-            //_isDisposed = true;
         }
     }
 }

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

@@ -12,9 +12,9 @@ Scenario: Create a new complete Acquisition File with pins
 
 Scenario: Edit existing Acquisition File and Properties
 	Given I edit an existing Acquisition File from row number 2
-	When I edit a Digital Document for a "Acquisition File" from row number 7
-	And I update a Property details from row number 4
+	When I update a Property details from row number 4
 	And I navigate back to the Acquisition File Summary
+	And I edit a Digital Document for a "Acquisition File" from row number 7
 	Then An existing Acquisition file has been edited successfully
 
 Scenario: Create an Acquisition File from Pin

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

@@ -10,6 +10,7 @@ Scenario Outline: Create new Organization Complete Contact
 	Examples: 
 	| ContactType	| RowNumber |
 	| Organization  | 1         |
+	| Organization  | 3         |
 
 Scenario Outline: Create new Individual Complete Contact
 	Given I create a new Individual Contact from row number <RowNumber>
@@ -19,25 +20,26 @@ Scenario Outline: Create new Individual Complete Contact
 	| ContactType	| RowNumber |
 	| Individual	| 1         |
 	| Individual	| 2         |
+	| Individual	| 4         |
 
 Scenario: Cancel creating a new contact
 	Given I cancel creating a new contact from row number 2
 	Then Search Contacts screen is correctly rendered
 
 Scenario: Update an Existing Organization Contact
-	Given I update an existing Organization Contact from row number 3
+	Given I update an existing Organization Contact from row number 4
 	Then An Organization contact is successfully updated
 
 Scenario: Update an Existing Individual Contact
-	Given I update an existing Individual Contact from row number 4
+	Given I update an existing Individual Contact from row number 5
 	Then An Individual contact is successfully updated
 
 Scenario Outline: Search for a non-existing Contact
 	Given I search for an non-existing contact from type "<ContactType>" row number <RowNumber>
 	Then No contacts results are found
 	Examples:
 	| ContactType	| RowNumber |
-	| Individual	| 5         |
+	| Individual	| 6         |
 	| Organization	| 4         |
 
 

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

@@ -4,14 +4,15 @@ Feature: Projects
 Scenario Outline: Create new Projects
 	Given I create a new Project from row number <RowNumber>
 	When I verify The Project View Form
+	And I create Digital Documents for a "Project" row number <DocRowNumber>
 	And I search for an existing project
 	Then Expected Content is displayed on Projects Table
 	Examples:
-	| RowNumber |
-	| 1         |
-	| 2			|
-	| 3         |
-	| 4         |
+	| RowNumber | DocRowNumber |
+	| 1         | 8            |
+	| 2         | 9            |
+	| 3         | 10           |
+	| 4         | 11           |
 
 Scenario: Update Project
 	Given I update an existing project from row number 5