Resolve All firefox failures (openmrs#431)

* Resolve All firefox failures * try again with expected conditions * Sanity check * Revert sanity check Co-authored-by: dkayiwa <[email protected]>
sibendire · Jul 20, 2022 · 9edd690 · 9edd690
1 parent 725b180
commit 9edd690
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/qaframework-bdd-tests/src/main/java/org/openmrs/contrib/qaframework/page/VisitNotePage.java b/qaframework-bdd-tests/src/main/java/org/openmrs/contrib/qaframework/page/VisitNotePage.java
@@ -20,7 +20,7 @@ public class VisitNotePage extends Page {
 	private static final By CODE = By.className("code");
 	private static final By UI_ID_1 = By.id("ui-id-1");
 	private static final By UI_MENU_ITEM = By.className("ui-menu-item");
-	private static final By PRIMARY_DIAGNOSIS_ELEMENT = By.cssSelector(".diagnosis.primary .matched-name");
+	private static final By PRIMARY_DIAGNOSIS_ELEMENT = By.xpath("//ul[1]/li/span/div/strong");
 	private static final By SECONDARY_DIAGNOSIS_ELEMENT = By.xpath("//ul[2]/li/span/div/strong");
 	private static final By SAVE_VISIT_NOTE = By.cssSelector(".submitButton.confirm");
 	private static final By NOTE = By.id("w10");

diff --git a/...rk-bdd-tests/src/test/java/org/openmrs/contrib/qaframework/automation/VisitNoteSteps.java b/...rk-bdd-tests/src/test/java/org/openmrs/contrib/qaframework/automation/VisitNoteSteps.java
@@ -9,9 +9,9 @@
  */
 package org.openmrs.contrib.qaframework.automation;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
@@ -119,7 +119,7 @@ public void enterDiagnosis() {
 
     @Then("the system saves the diagnosis into the visit note table")
     public void systemAddsDiagnosis() {
-        assertEquals("Pneumonia", visitNotePage.primaryDiagnosis());
+        assertEquals(DIAGNOSIS_SECONDARY_UPDATED, visitNotePage.primaryDiagnosis());
         assertEquals("Bleeding", visitNotePage.secondaryDiagnosis());
     }
 
@@ -131,7 +131,8 @@ public void deleteVisitNote() {
     }
 
     @Then("the system deletes the visit note")
-    public void systemdeletesVisitNotePage() {
+    public void systemDeletesVisitNotePage() {
         assertTrue(textExists("deleted"));
     }
+
 }
diff --git a/...ests/src/test/java/org/openmrs/contrib/qaframework/automation/VitalsAndTriagingSteps.java b/...ests/src/test/java/org/openmrs/contrib/qaframework/automation/VitalsAndTriagingSteps.java
@@ -173,6 +173,5 @@ public void editPatientVitals() {
 	@And("a user clicks on the save changes button")
 	public void saveUpdatedVitals() {
 		editVitalsPage.saveChanges();
-		editVitalsPage.waitForPage();
 	}
 }