added few steps to the @TMslinK=SORDEV-9792

SORMAS-Foundation · Sep 19, 2022 · cb788e7 · cb788e7
1 parent cfa1a6e
commit cb788e7
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 46 deletions.
diff --git a/...sts/src/test/java/org/sormas/e2etests/steps/web/application/cases/CreateNewCaseSteps.java b/...sts/src/test/java/org/sormas/e2etests/steps/web/application/cases/CreateNewCaseSteps.java
@@ -1102,10 +1102,11 @@ public CreateNewCaseSteps(
           fillPrimaryEmailAddress(caze.getPrimaryEmailAddress());
           fillDateOfReport(caze.getDateOfReport(), Locale.GERMAN);
           fillPlaceDescription(caze.getPlaceDescription());
-          webDriverHelpers.clickOnWebElementBySelector(SAVE_BUTTON);
-          webDriverHelpers.waitForPageLoadingSpinnerToDisappear(30);
-          webDriverHelpers.waitUntilElementIsVisibleAndClickable(EditCasePage.REPORT_DATE_INPUT);
-          webDriverHelpers.clickOnWebElementBySelector(CASE_SAVED_POPUP);
+          //          webDriverHelpers.clickOnWebElementBySelector(SAVE_BUTTON);
+          //          webDriverHelpers.waitForPageLoadingSpinnerToDisappear(30);
+          //
+          // webDriverHelpers.waitUntilElementIsVisibleAndClickable(EditCasePage.REPORT_DATE_INPUT);
+          //          webDriverHelpers.clickOnWebElementBySelector(CASE_SAVED_POPUP);
         });
 
     When(

diff --git a/...2e-tests/src/test/java/org/sormas/e2etests/steps/web/application/cases/EditCaseSteps.java b/...2e-tests/src/test/java/org/sormas/e2etests/steps/web/application/cases/EditCaseSteps.java
@@ -2537,17 +2537,17 @@ public EditCaseSteps(
               webDriverHelpers.clickOnWebElementBySelector(ACTION_CANCEL);
               break;
           }
-          TimeUnit.SECONDS.sleep(1); // wait for reaction
+          TimeUnit.SECONDS.sleep(3); // wait for reaction
         });
 
     And(
         "^I check that vaccination is removed from vaccination card on Edit Case page$",
         () -> {
           webDriverHelpers.waitForPageLoadingSpinnerToDisappear(10);
-          Boolean elementVisible = true;
+          boolean elementVisible = true;
 
           try {
-            webDriverHelpers.isElementVisibleWithTimeout(VACCINATION_CARD_VACCINATION_ID, 2);
+            webDriverHelpers.isElementEnabled(EDIT_VACCINATION_BUTTON);
           } catch (Throwable ignored) {
             elementVisible = false;
           }

diff --git a/sormas-e2e-tests/src/test/resources/features/sanity/web/Case.feature b/sormas-e2e-tests/src/test/resources/features/sanity/web/Case.feature
@@ -1537,6 +1537,7 @@ Feature: Case end to end tests
       And I click on the Cases button from navbar
       And I click on the NEW CASE button
       And I create a new case with specific data for DE version with date 2 days ago
+      And I click SAVE button on Create New Case form
       Then I collect uuid of the case
       Then I click on the Archive case button
       Then I check the end of processing date in the archive popup and select Archive cases checkbox

diff --git a/sormas-e2e-tests/src/test/resources/features/sanity/web/Vaccination.feature b/sormas-e2e-tests/src/test/resources/features/sanity/web/Vaccination.feature
@@ -618,6 +618,7 @@ Feature: Vaccination tests
     When I click on the Cases button from navbar
     And I click on the NEW CASE button
     And I create a new case with specific data for DE version with date 16 days ago
+    And I click SAVE button on Create New Case form
     And I click NEW VACCINATION button for DE
     And I change the report vaccination date for minus 17 day from today
     And I fill new vaccination data in new Vaccination form for DE
@@ -689,49 +690,46 @@ Feature: Vaccination tests
     And I check that displayed vaccination name is equal to "COVID-19 Impfstoff Moderna (mRNA-Impfstoff)" on Edit contact page
     And I check that displayed vaccination name is "greyed out" on Edit contact page
 
-  @tmsLink=SORDEV-12605 @env_de
-  Scenario: Test that the vaccination status changes from VACCINATED to blank after the vaccination is removed
-    Given I log in as a Admin User
-#    When I click on the Cases button from navbar
-#    And I click on the NEW CASE button
-#    And I create a new case with specific data for DE version with date 14 days ago
-#    And I check if date of report is set for 14 day ago from today on Edit Case page for DE version
-#    And I click NEW VACCINATION button for DE
-#    And I change the report vaccination date for minus 17 day from today
-#    And I fill new vaccination data in new Vaccination form for DE
-#    And I remove the vaccination date in displayed vaccination form
-#    And I click SAVE button in new Vaccination form
-#    And I check that displayed vaccination name is equal to "COVID-19 Impfstoff Moderna (mRNA-Impfstoff)" on Edit case page
-#    And I check that displayed vaccination name is "enabled" on Edit case page
-#    And I check if Vaccination Status is set to "Geimpft" on Edit Case page
-#    And I click on the Edit Vaccination icon on vaccination card on Edit Case page
-#    And I click Delete button in Vaccination form
-#    And I choose the reason of deletion in popup for Vaccination for DE version
-#    And I choose "JA" in Vaccination Status update popup for DE version
-#    And I check if Vaccination Status is set to "" on Edit Case page
-#    And I click NEW VACCINATION button for DE
-#    And I change the report vaccination date for minus 17 day from today
-#    And I fill new vaccination data in new Vaccination form for DE
-#    And I remove the vaccination date in displayed vaccination form
-#    And I click SAVE button in new Vaccination form
-#    And I check that displayed vaccination name is equal to "COVID-19 Impfstoff Moderna (mRNA-Impfstoff)" on Edit case page
-#    And I check that displayed vaccination name is "enabled" on Edit case page
-#    And I check if Vaccination Status is set to "Geimpft" on Edit Case page
-#    #Step5
-#    And I click on the Edit Vaccination icon on vaccination card on Edit Case page
-#    And I click Delete button in Vaccination form
-#    And I choose the reason of deletion in popup for Vaccination for DE version
-#    And I choose "NEIN" in Vaccination Status update popup for DE version
-#    And I check if Vaccination Status is set to "Geimpft" on Edit Case page
-#    And I check that vaccination is removed from vaccination card on Edit Case page
-    #Step6
-
   @tmsLink=SORDEV-12605 @env_de
   Scenario Outline: Test that the vaccination status changes from VACCINATED to blank after the vaccination is removed
     Given I log in as a Admin User
     When I click on the Cases button from navbar
     And I click on the NEW CASE button
     And I create a new case with specific data for DE version with date 14 days ago
+    And I click SAVE button on Create New Case form
+    And I check if date of report is set for 14 day ago from today on Edit Case page for DE version
+    And I click NEW VACCINATION button for DE
+    And I change the report vaccination date for minus 17 day from today
+    And I fill new vaccination data in new Vaccination form for DE
+    And I remove the vaccination date in displayed vaccination form
+    And I click SAVE button in new Vaccination form
+    And I check that displayed vaccination name is equal to "COVID-19 Impfstoff Moderna (mRNA-Impfstoff)" on Edit case page
+    And I check that displayed vaccination name is "enabled" on Edit case page
+    And I check if Vaccination Status is set to "Geimpft" on Edit Case page
+    And I click on the Edit Vaccination icon on vaccination card on Edit Case page
+    And I click Delete button in Vaccination form
+    And I choose the reason of deletion in popup for Vaccination for DE version
+    And I choose "JA" in Vaccination Status update popup for DE version
+    And I check if Vaccination Status is set to "" on Edit Case page
+    And I click NEW VACCINATION button for DE
+    And I change the report vaccination date for minus 17 day from today
+    And I fill new vaccination data in new Vaccination form for DE
+    And I remove the vaccination date in displayed vaccination form
+    And I click SAVE button in new Vaccination form
+    And I check that displayed vaccination name is equal to "COVID-19 Impfstoff Moderna (mRNA-Impfstoff)" on Edit case page
+    And I check that displayed vaccination name is "enabled" on Edit case page
+    And I check if Vaccination Status is set to "Geimpft" on Edit Case page
+    #Step5
+    And I click on the Edit Vaccination icon on vaccination card on Edit Case page
+    And I click Delete button in Vaccination form
+    And I choose the reason of deletion in popup for Vaccination for DE version
+    And I choose "NEIN" in Vaccination Status update popup for DE version
+    And I check if Vaccination Status is set to "Geimpft" on Edit Case page
+    And I check that vaccination is removed from vaccination card on Edit Case page
+    And I click on the Cases button from navbar
+    And I click on the NEW CASE button
+    And I create a new case with specific data for DE version with date 14 days ago
+    And I click SAVE button on Create New Case form
     And I check if date of report is set for 14 day ago from today on Edit Case page for DE version
     #Step7
     And I click NEW VACCINATION button for DE
@@ -777,5 +775,5 @@ Feature: Vaccination tests
 
     Examples:
       | option | result |
-      | JA | "Geimpft"  |
-      | NEIN | "" |
+      | JA | ""  |
+      | NEIN | "Geimpft" |