chore: test fixes

dvsa · Sep 4, 2024 · 0db0246 · 0db0246
1 parent 738aa64
commit 0db0246
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/src/test/java/org/dvsa/testing/framework/Journeys/licence/InternalUIJourney.java b/src/test/java/org/dvsa/testing/framework/Journeys/licence/InternalUIJourney.java
@@ -151,8 +151,7 @@ public void deleteDocument() {
     public void checkLicenceStatus(String arg0) {
         waitForElementToBeClickable("menu-admin-dashboard/admin-your-account/details", SelectorType.ID);
         waitForTextToBePresent("Licence status");
-        String actualText = getText("//strong[contains(@class,'govuk-tag')]", SelectorType.XPATH);
-        assertTrue(actualText.equalsIgnoreCase("Surrendered"));
+        assertEquals(arg0, getElementValueByText("//strong[contains(@class,'govuk-tag')]", SelectorType.XPATH));
     }
 
     public void closeCase() {

diff --git a/src/test/java/org/dvsa/testing/framework/pageObjects/BasePage.java b/src/test/java/org/dvsa/testing/framework/pageObjects/BasePage.java
@@ -54,6 +54,16 @@ protected static String getText(@NotNull String selector) {
         return getText(selector, SelectorType.CSS);
     }
 
+    protected static String getLink(@NotNull String selector, @NotNull SelectorType selectorType) {
+        return findElement(selector, selectorType).getAttribute("href");
+    }
+
+    protected static String getLink(@NotNull String selector) {
+        return getLink(selector, SelectorType.CSS);
+    }
+
+
+
 
     public static String getTextFromNestedElement(WebElement webElement, String selector) {
         return webElement.findElement(By.xpath(selector)).getText();

diff --git a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java
@@ -79,7 +79,7 @@ public void iGenerateALetter() {
     @Then("The pop up should contain letter details")
     public void thePopUpShouldContainLetterDetails() {
         waitForTextToBePresent("Amend letter");
-        String docStoreLink = getText("letter-link",SelectorType.ID);
+        String docStoreLink = getLink("//*[@id='letter-link']",SelectorType.XPATH);
         assertNotNull(docStoreLink);
         String webDAVUrl = URL.build(ApplicationType.INTERNAL, world.configuration.env, "documents-dav").toString();
         assertTrue(docStoreLink.contains(String.format("ms-word:ofe|u|%s",webDAVUrl)));

diff --git a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/ManagePrinters.java b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/ManagePrinters.java
@@ -19,7 +19,7 @@ public ManagePrinters(World world) {
     }
 
     @When("I am on the Printers page")
-    public void iAmOnThePrintersPage() throws HttpException {
+    public synchronized void iAmOnThePrintersPage() throws HttpException {
         world.internalNavigation.logInAsAdmin();
         world.internalNavigation.adminNavigation(AdminOption.PRINTING);
     }

diff --git a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/TaskAllocationRules.java b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/TaskAllocationRules.java
@@ -23,7 +23,7 @@ public TaskAllocationRules(World world) {
     }
 
     @Given("I am on the task allocation rules page")
-    public void iAmOnTheTaskAllocationRulesPage() throws HttpException {
+    public synchronized void iAmOnTheTaskAllocationRulesPage() throws HttpException {
         world.internalNavigation.logInAsAdmin();
         world.internalNavigation.adminNavigation(AdminOption.TASK_ALLOCATION_RULES);
     }

diff --git a/...rg/dvsa/testing/framework/features/Internal/Surrender/Sign-In/int-surrender-logic.feature b/...rg/dvsa/testing/framework/features/Internal/Surrender/Sign-In/int-surrender-logic.feature
@@ -13,7 +13,7 @@ Feature: Logic for Surrender menu item
   Scenario: Surrender Licence
     And my application to surrender is under consideration
     When the caseworker approves the surrender
-    Then the licence status should be "surrendered"
+    Then the licence status should be "Surrendered"
     And the surrender menu should be hidden in internal
     And the licence should not displayed in selfserve
 
@@ -61,14 +61,14 @@ Feature: Logic for Surrender menu item
     And the licence status is "<licence_status>"
     And my application to surrender is under consideration
     When the caseworker approves the surrender
-    And the licence status should be "surrendered"
+    And the licence status should be "Surrendered"
     And the case worker undoes the surrender
     Then the licence status should be "<licence>"
 
     Examples:
       | licence_status | licence   |
-      | suspend        | suspended |
-      | curtail        | curtailed |
+      | suspend        | Suspended |
+      | curtail        | Curtailed |
 
 
   Scenario Outline: Surrender suspended, curtailed licence