Merge pull request #323 from CBIIT/muzipovay2

CHARMS - Verifying that audit trail history is visible to users + updates to test cases

src/test/java/ServiceNow/CHARMS/Features/RasopathyStudy/RAS Consent Scenarios.feature

@@ -44,7 +44,7 @@ Feature: RAS Consent Scenarios
     And logs in via Okta with username "<Email>" and password "<Password>"
     And clicks on "Eligibility Questionnaire" to begin survey
     When the participant submits a screener from excel sheet "<ScreenerScenario>"
-    Then Study Team member logs in to Native View and completes consent call "<ScreenerScenario>", "<ConsentType>", "<ResponseType>", "<ParentGuardianStatus>", "<NumberOfGuardianSignaturesRequired>", "<NumberOfParentGuardianSignaturesReceived>"
+    Then Study Team member logs in to Native View and completes consent call "<ScreenerScenario>", "<ConsentType>", "<ResponseType>", "<ParentGuardianStatus>"
     And Study Team member logs out of Native View
     And a participant is on the RASopathies Longitudinal Cohort Study login page "myRASLoginPage"
     And logs in via Okta with username "<Email>" and password "<Password>"
@@ -57,8 +57,8 @@ Feature: RAS Consent Scenarios
     And "Download Study Consent" text shows on participant portal and when clicked downloads "Consent Record"
     And "Download Study Assent" text shows on participant portal and when clicked downloads "Assent Record"
     Examples:
-      | Email                           | Password   | ScreenerScenario         | ConsentStatus | ConsentType                          | ResponseType     | ParentGuardianStatus | NumberOfGuardianSignaturesRequired | NumberOfParentGuardianSignaturesReceived | AccountResetScriptURL                                                                                    |
-      | consent_participant@yopmail.com | Charms123$ | screenerScenarioAge11-13 | Complete      | Aged 11 - 13, signed assent required | CHARMS e-consent | Parents, Married     | 1                                  | 0                                        | https://service-test.nci.nih.gov/nav_to.do?uri=sys_script_fix.do?sys_id=b8daf9fa872096107e87a8a60cbb3597 |
+      | Email                           | Password   | ScreenerScenario         | ConsentStatus | ConsentType                          | ResponseType     | ParentGuardianStatus               | AccountResetScriptURL                                                                                    |
+      | consent_participant@yopmail.com | Charms123$ | screenerScenarioAge11-13 | Complete      | Aged 11 - 13, signed assent required | CHARMS e-consent | Parents, Separated - Joint Custody | https://service-test.nci.nih.gov/nav_to.do?uri=sys_script_fix.do?sys_id=b8daf9fa872096107e87a8a60cbb3597 |
 
   @muzipovay2 @RAS_STUDY @CP2-3730 @CP2-3746 @CP2-3747 @selenium @RAS_Regression
   Scenario: Verifying that when a minor aged 11-13 has completed Assent, the field Assent signed is true in their Native View Consent Record
@@ -67,7 +67,7 @@ Feature: RAS Consent Scenarios
     And logs in via Okta with username "[email protected]" and password "Charms123$"
     And clicks on "Eligibility Questionnaire" to begin survey
     When the participant submits a screener from excel sheet "screenerScenarioAge11-13"
-    Then Study Team member logs in to Native View and completes consent call "screenerScenarioAge11-13", "Aged 11 - 13, signed assent required", "CHARMS e-consent", "Parents, Married", "1", "0"
+    Then Study Team member logs in to Native View and completes consent call "screenerScenarioAge11-13", "Aged 11 - 13, signed assent required", "CHARMS e-consent", "Parents, Married"
     And Study Team member logs out of Native View
     And a participant is on the RASopathies Longitudinal Cohort Study login page "myRASLoginPage"
     And logs in via Okta with username "[email protected]" and password "Charms123$"
@@ -99,7 +99,7 @@ Feature: RAS Consent Scenarios
     And logs in via Okta with username "[email protected]" and password "Charms123$"
     And clicks on "Eligibility Questionnaire" to begin survey
     When the participant submits a screener from excel sheet "screenerScenarioAge14-17"
-    Then Study Team member logs in to Native View and completes consent call "screenerScenarioAge14-17", "Aged 14 - 17, signed consent required", "CHARMS e-consent", "Parents, Married", "1", "0"
+    Then Study Team member logs in to Native View and completes consent call "screenerScenarioAge14-17", "Aged 14 - 17, signed consent required", "CHARMS e-consent", "Parent, Separated or Widowed - Single Custody"
     And Study Team member logs out of Native View
     And a participant is on the RASopathies Longitudinal Cohort Study login page "myRASLoginPage"
     And logs in via Okta with username "[email protected]" and password "Charms123$"

src/test/java/ServiceNow/CHARMS/Features/RasopathyStudy/RAS Native View Verification Scenarios.feature

@@ -37,4 +37,11 @@ Feature: RAS Native View Verification Scenarios
       | Existing FSID | Study     | Relationship to Proband | First Name   | Last Name            | Participation Status Row 1 | Hold/Non-Participation Date Row 1 | Participation Status Row 2 | Hold/Non-Participation Date Row 2 |
       |               | RASopathy | Proband                 | SubjectFlags | HoldTest             | Hold                       | Today                             | Participating              |                                   |
       |               | RASopathy | Proband                 | SubjectFlags | NotParticipatingTest | Participating              |                                   | Not Participating          | 1st of Next Month                 |
-      |               | RASopathy | Proband                 | SubjectFlags | NotParticipatingTest | Hold                       | 1st of Next Month                 | Not Participating          | Today                             |
+      |               | RASopathy | Proband                 | SubjectFlags | NotParticipatingTest | Hold                       | 1st of Next Month                 | Not Participating          | Today                             |
+
+  @muzipovay2 @RAS_STUDY @CP2-3960 @selenium @RAS_Regression
+  Scenario: Verifying that audit trail history is visible to users.
+    Given Study Team member logs in to Native View and navigates to All Participant Details
+    And Study Team member clicks Add New Participant and completes the form with:  FSID "", Study "RASopathy", Relationship to Proband "Proband", First Name "AuditTrail", Last Name "Test"
+    And Study Team member navigates to Participant Studies
+    Then Study Team member creates new Subject Flags and verifies that the audit trail history displays

src/test/java/ServiceNow/CHARMS/Pages/NativeViewCHARMSAddNewParticipantPage.java

@@ -43,12 +43,36 @@ public class NativeViewCHARMSAddNewParticipantPage {
     @FindBy(xpath = "//button[@id='x_naci_family_coho_family_history_details.studies_unlock']")
     public WebElement unlockStudiesButton;
 
+    /**
+     * Lock Studies button
+     */
+    @FindBy(xpath = "//button[@id='x_naci_family_coho_family_history_details.studies_lock']")
+    public WebElement lockStudiesButton;
+
     /**
      * Studies textbox
      */
     @FindBy(xpath = "//input[@id='sys_display.x_naci_family_coho_family_history_details.studies']")
     public WebElement studiesTextBox;
 
+    /**
+     * Unlock Study Subcategory Button
+     */
+    @FindBy(xpath = "//button[@id='x_naci_family_coho_family_history_details.study_subcategory_unlock']")
+    public WebElement unlockStudySubcategoryButton;
+
+    /**
+     * Lock Study SubCategory button
+     */
+    @FindBy(xpath = "//button[@id='x_naci_family_coho_family_history_details.study_subcategory_lock']")
+    public WebElement lockStudySubcategoryButton;
+
+    /**
+     * Study Subcategory Textbox
+     */
+    @FindBy(xpath = "//input[@id='sys_display.x_naci_family_coho_family_history_details.study_subcategory']")
+    public WebElement studySubcategoryTextbox;
+
     /**
      * Look up using list button
      */

src/test/java/ServiceNow/CHARMS/Pages/NativeViewCHARMSParticipantConsentPage.java

@@ -142,7 +142,7 @@ public class NativeViewCHARMSParticipantConsentPage {
     /**
      * Native View Parent/Guardian 1 Name Text Field
      */
-    @FindBy(xpath = "//div[@class='form-group is-required']//input[@type='text']")
+    @FindBy(css = "input[id='x_naci_family_coho_fcsms_consent.guardian_1_name']")
     public WebElement rasStudyConsentParentGuardian1NameTextField;
 
     /**
@@ -154,9 +154,39 @@ public class NativeViewCHARMSParticipantConsentPage {
     /**
      * Native View Parent/Guardian 2 Name Text Field
      */
-    @FindBy(xpath = "//body/div[@data-position-below-header='true']/form[@method='POST']/span[@data-header-only='false']/span[@data-header-only='false']/div[@aria-label='Consent form section']/div[1]/div[2]/div[1]/div[2]/input[1]")
+    @FindBy(css = "input[id='x_naci_family_coho_fcsms_consent.guardian_2_name']")
     public WebElement rasStudyConsentParentGuardian2NameTextField;
 
+    /**
+     * Native View Number of LARs Drop down
+     */
+    @FindBy(xpath = "//select[@name='x_naci_family_coho_fcsms_consent.number_of_lars']")
+    public WebElement numberOfLARsDropDown;
+
+    /**
+     * Native View LAR 1 Signed Drop down
+     */
+    @FindBy(css = "select[id='x_naci_family_coho_fcsms_consent.lar_1_signed']")
+    public WebElement lar1SignedDropDown;
+
+    /**
+     * Native View LAR 1 Name Text field
+     */
+    @FindBy(css = "input[name='x_naci_family_coho_fcsms_consent.lar_1_name']")
+    public WebElement lar1NameTextField;
+
+    /**
+     * Native View LAR 2 Signed Drop down
+     */
+    @FindBy(css = "select[name='x_naci_family_coho_fcsms_consent.lar_2_signed']")
+    public WebElement lar2SignedDropDown;
+
+    /**
+     * Native View LAR 2 Name Text field
+     */
+    @FindBy(css = "input[name='x_naci_family_coho_fcsms_consent.lar_2_name']")
+    public WebElement lar2NameTextField;
+
     /**
      * Native View Ras Study Assent signed checkbox
      */

src/test/java/ServiceNow/CHARMS/Pages/NativeViewCHARMSSubjectFlagsPage.java

@@ -61,6 +61,12 @@ public class NativeViewCHARMSSubjectFlagsPage {
     @FindBy(xpath = "//select[@id='x_naci_family_coho_subject_flag.age_group']")
     public WebElement ageGroupDropdown;
 
+    /**
+     * Eligible for Clinic Dropdown
+     */
+    @FindBy(xpath = "//select[@id='x_naci_family_coho_subject_flag.eligible_for_clinic']")
+    public WebElement eligibleForClinicDropdown;
+
     /**
      * Preview Record for Field: Study. Button
      */

src/test/java/ServiceNow/CHARMS/ScenariosData/RAS_NV_Consent_Record_TestDataManager.java

@@ -23,10 +23,14 @@ public class RAS_NV_Consent_Record_TestDataManager extends PageInitializer {
     public String LEGAL_DOCUMENTATION_RECEIVED;
     public String NOT_DEVELOPMENTALLY_ABLE_TO_GIVE_ASSENT;
     public String PARENT_GUARDIAN_1_SIGNED;
+    public String PARENT_GUARDIAN_1_NAME;
     public String PARENT_GUARDIAN_2_SIGNED;
+    public String PARENT_GUARDIAN_2_NAME;
     public String NUMBER_OF_LARS;
     public String LAR_1_SIGNED;
+    public String LAR_1_NAME;
     public String LAR_2_SIGNED;
+    public String LAR_2_NAME;
     public String ASSIGNED_TO;
     public String CONSENT_STATUS;
     public String CONSENT_DATE;
@@ -88,10 +92,14 @@ public void dataInitializerRasConsentRecord(String sheetName) {
         LEGAL_DOCUMENTATION_RECEIVED = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Legal Documentation Received");
         NOT_DEVELOPMENTALLY_ABLE_TO_GIVE_ASSENT = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Not developmentally able to give assent");
         PARENT_GUARDIAN_1_SIGNED = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Parent/Guardian 1 Signed");
+        PARENT_GUARDIAN_1_NAME = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Parent/Guardian 1 Name");
         PARENT_GUARDIAN_2_SIGNED = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Parent/Guardian 2 Signed");
+        PARENT_GUARDIAN_2_NAME = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Parent/Guardian 2 Name");
         NUMBER_OF_LARS = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Number of LARs");
         LAR_1_SIGNED = TEST_DATA_FOR_NV_CONSENT_RECORD.get("LAR 1 Signed");
+        LAR_1_NAME = TEST_DATA_FOR_NV_CONSENT_RECORD.get("LAR 1 Name");
         LAR_2_SIGNED = TEST_DATA_FOR_NV_CONSENT_RECORD.get("LAR 2 Signed");
+        LAR_2_NAME = TEST_DATA_FOR_NV_CONSENT_RECORD.get("LAR 2 Name");
         ASSIGNED_TO = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Assigned to");
         CONSENT_STATUS = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Consent Status");
         CONSENT_DATE = TEST_DATA_FOR_NV_CONSENT_RECORD.get("Consent Date");