Merge pull request #13 from veraPDF/selenium_version

Update selenium version

.github/workflows/veraPDF_WebApp_CI_with_Maven.yml

@@ -13,8 +13,8 @@ on:
       - cron: "05 09 * * 1"
   push:
     branches: [ "master" ]
-  # pull_request:
-  #   branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
 
 jobs:
   build:

README.md

@@ -18,11 +18,11 @@ In order to run tests you'll need:
 2. Run tests using Maven: `mvn clean install`
 
 ### Additional Examples how to start project:
-1. `mvn clean install`  General profile active by default with baseUrl = https://verapdf.duallab.com/, see property file
-2. `mvn test -P GeneralTests -DbaseUrl=https://verapdf.duallab.com/`
-3. `mvn test -P HotTests -DbaseUrl=https://verapdf.duallab.com/`    Profile Hot tests
-4. `mvn test -P DemoTests -DbaseUrl=https://verapdf.duallab.com/`   Profile Demo tests
-5. `mvn test -Dtest=JobTest -DbaseUrl=https://verapdf.duallab.com/`
+1. `mvn clean install`  General profile active by default with baseUrl = https://dev.pdf4wcag.duallab.com/, see property file
+2. `mvn test -P GeneralTests -DbaseUrl=https://dev.pdf4wcag.duallab.com/`
+3. `mvn test -P HotTests -DbaseUrl=https://dev.pdf4wcag.duallab.com/`    Profile Hot tests
+4. `mvn test -P DemoTests -DbaseUrl=https://dev.pdf4wcag.duallab.com/`   Profile Demo tests
+5. `mvn test -Dtest=JobTest -DbaseUrl=https://dev.pdf4wcag.duallab.com/`
 6. `mvn clean install -Dtest=JobTest#addNewJob`
 7. `mvn clean install -Dtest=JobTest,HotTest`
 

pom.xml

@@ -47,14 +47,14 @@
         <dependency>
             <groupId>io.github.bonigarcia</groupId>
             <artifactId>webdrivermanager</artifactId>
-            <version>5.5.2</version>
+            <version>5.7.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>4.8.0</version>
+            <version>4.18.1</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.testng/testng -->

src/main/java/com/duallab/verapdf/fw/pageobject/AppPage.java

@@ -80,10 +80,11 @@ public int validate() {
         wait_progress__percentage.until(ExpectedConditions.invisibilityOfElementLocated(By.xpath("//*[@class='progress__percentage']")));
         log.info("Done.");
 
-        log.info("Waiting summary__compliance  ... ");
-        waitForAndFindWebElement(By.xpath("//*[@class='summary__compliance']"), PropertiesValue.getWaitForDriver());
+        log.info("Waiting legend  ... ");
+        waitForAndFindWebElement(By.xpath("//*[@class='legend']"), PropertiesValue.getWaitForDriver());
         //waitForAndFindWebElement(By.xpath("//*[contains(@href, 'result-details')]"), PropertiesValue.getWaitForDriver());
-        int compliant = Integer.parseInt(chop(waitForAndFindWebElement(By.xpath("//*[@id='app']//*[@class='summary__compliance']//*"), PropertiesValue.getWaitForDriver()).getText()));
+        String text = chop(waitForAndFindWebElement(By.xpath("//*[@id='app']//*[@class='legend']//*"), PropertiesValue.getWaitForDriver()).getText());
+        int compliant = Integer.parseInt(text.split(" ")[0]);
         log.info("Done.");
         return compliant;
     }

src/main/java/com/duallab/verapdf/fw/pageobject/MainPage.java

@@ -12,7 +12,7 @@
 public class MainPage extends BasicPage {
 
     private static Logger log = Logger.getLogger(MainPage.class.getName());
-    private final String demoButton = "//main/div/*[@class='btn']";
+    private final String demoButton = "//header/div/*[@class='btn']";
 
     public MainPage(WebDriver driver) throws IOException {
         super(driver);

src/test/java/com/duallab/verapdf/tests/demoTest/DemoTest.java

@@ -28,7 +28,7 @@ public void demoCheckProfile() throws Exception {
         log.info("Checking ...");
         assertThat(mainPage.getTitle()).isEqualTo("veraPDF viewer");
         then(mainPage.getDemoButton().getText()).isEqualTo("Go to demo");
-        then(mainPage.getDemoButton().getAttribute("href")).isEqualTo("https://verapdf.duallab.com/demo");
+        then(mainPage.getDemoButton().getAttribute("href")).isEqualTo("https://dev.pdf4wcag.duallab.com/demo");
         then(mainPage.getDemoButton().getCssValue("color")).isEqualTo("rgba(255, 255, 255, 1)");
     }
 

src/test/java/com/duallab/verapdf/tests/general/EndToEndValidationTest.java

@@ -30,17 +30,17 @@ public class EndToEndValidationTest extends BaseTest {
     public void checkEndToEndValidation() throws Exception {
         MainPage mainPage = new MainPage(app.getDriver()).openMainPage();
         log.info("Checking ...");
-        assertThat(mainPage.getTitle()).isEqualTo("veraPDF viewer");
+        assertThat(mainPage.getTitle()).isEqualTo("PDF Accessibility checker | PDF/UA and WCAG");
 
-        then(mainPage.getDemoButton().getText()).isEqualTo("Start");
-        then(mainPage.getDemoButton().getAttribute("href")).isEqualTo("https://verapdf.duallab.com/validate");
+        then(mainPage.getDemoButton().getText()).isEqualTo("Try now");
+        then(mainPage.getDemoButton().getAttribute("href")).isEqualTo("https://dev.pdf4wcag.duallab.com/validate");
 
         AppPage appPage = mainPage.openAppPage();
-        assertThat(appPage.getTitle()).isEqualTo("veraPDF for WCAG");
+        assertThat(appPage.getTitle()).isEqualTo("PDF Accessibility checker | PDF/UA and WCAG");
 
         appPage.dropPDFFile(FILE_NAME);
-        int compliant = appPage.navigateTo_ConfigureJob().selectProfile(PROFILE_NAME).validate();
-        assertThat(compliant).isLessThan(100); // expected compliant isLessThan 100%
+        int passedChecks = appPage.navigateTo_ConfigureJob().selectProfile(PROFILE_NAME).validate();
+        assertThat(passedChecks).isGreaterThanOrEqualTo(0); // expected passed checks isLessThan 100%
 
         InspectErrorsPage errorsPage = appPage.navigateTo_InspectErrorsPage();
         assertThat(errorsPage.getPDFFileName()).isEqualTo(FILE_NAME);

src/test/java/com/duallab/verapdf/tests/general/MainPageGUITest.java

@@ -22,12 +22,12 @@ public class MainPageGUITest extends BaseTest {
     public void checkMainPage() throws Exception {
         MainPage mainPage = new MainPage(app.getDriver()).openMainPage();
         log.info("Checking ...");
-
+
+        System.out.println(mainPage.getDemoButton().getAttribute("id"));
         myAssertThat(mainPage.getDemoButton())
-                .hasAttributeValue("href", "https://verapdf.duallab.com/validate")
+                .hasAttributeValue("href", "https://dev.pdf4wcag.duallab.com/validate")
                 .hasAttributeValue("class", "btn")
-                .hasCSSValue("color", "rgba(255, 255, 255, 1)")
-                .hasCSSValue("background", "rgb(212, 83, 96) none repeat scroll 0% 0% / auto padding-box border-box");
+                .hasAttributeValue("id", "try-now-button");
     }
 
     @BeforeMethod

src/test/java/com/duallab/verapdf/tests/hotTest/HotTest.java

@@ -28,7 +28,7 @@ public void hotCheckProfile() throws IOException, InterruptedException {
         log.info("Checking ...");
         assertThat(mainPage.getTitle()).isEqualTo("veraPDF viewer");
         then(mainPage.getDemoButton().getText()).isEqualTo("Go to demo");
-        then(mainPage.getDemoButton().getAttribute("href")).isEqualTo("https://verapdf.duallab.com/demo");
+        then(mainPage.getDemoButton().getAttribute("href")).isEqualTo("https://dev.pdf4wcag.duallab.com");
         then(mainPage.getDemoButton().getCssValue("color")).isEqualTo("rgba(255, 255, 255, 1)");
     }
 

src/test/resources/app.properties

@@ -3,7 +3,7 @@ driverWaitSeconds=60
 driverWaitSecondsForHeavyLoadPlaces=300
 driverWaitSecondsForNegativeCheck=2
 driverWaitSecondsForStates=600
-baseUrl=https://verapdf.duallab.com/
+baseUrl=https://dev.pdf4wcag.duallab.com/
 screenshotLocation=./target/screenshots/
 extractedImagesLocation=./target/extracted-images/
 maxRetryCount=1