small refactoring

.github/workflows/e2e.yml

@@ -32,7 +32,7 @@ jobs:
           : # build backends with profile `docker`, only for testing
           bash ./gradlew jibDockerBuild -x :niffler-e-2-e-tests:test || exit 1
           : # pull browser (see browsers.json)        
-          docker pull selenoid/vnc_chrome:125.0
+          docker pull selenoid/vnc_chrome:127.0
           : # run e2e tests
           docker compose -f docker-compose.test.yml up -d
           docker ps -a

docker-compose-e2e.sh

@@ -32,6 +32,6 @@ fi
 
 bash ./gradlew jibDockerBuild -x :niffler-e-2-e-tests:test
 
-docker pull selenoid/vnc_chrome:125.0
+docker pull selenoid/vnc_chrome:127.0
 docker compose -f docker-compose.test.yml up -d
 docker ps -a

docker-compose.test.yml

@@ -128,7 +128,7 @@ services:
 
   selenoid:
     container_name: selenoid
-    image: aerokube/selenoid:1.11.2
+    image: aerokube/selenoid:1.11.3
     platform: linux/${ARCH}
     volumes:
       - ./selenoid:/etc/selenoid
@@ -174,7 +174,7 @@ services:
 
   allure:
     container_name: allure
-    image: frankescobar/allure-docker-service:2.21.0
+    image: frankescobar/allure-docker-service:2.27.0
     depends_on:
       - niffler-e-2-e
     environment:

niffler-e-2-e-tests/src/test/java/guru/qa/niffler/config/DockerConfig.java

@@ -18,7 +18,8 @@ private DockerConfig() {
     Configuration.remote = "http://selenoid:4444/wd/hub";
     Configuration.timeout = 10000;
     Configuration.browser = "chrome";
-    Configuration.browserVersion = "125.0";
+    Configuration.browserVersion = "127.0";
+    Configuration.pageLoadStrategy = "eager";
     Configuration.browserCapabilities = new ChromeOptions().addArguments("--no-sandbox");
   }
 

niffler-e-2-e-tests/src/test/java/guru/qa/niffler/config/LocalConfig.java

@@ -14,6 +14,7 @@ private LocalConfig() {
   static {
     Configuration.browserSize = "1980x1024";
     Configuration.browser = "chrome";
+    Configuration.pageLoadStrategy = "eager";
     Configuration.browserCapabilities = new ChromeOptions().addArguments("--no-sandbox");
   }
 

niffler-e-2-e-tests/src/test/java/guru/qa/niffler/jupiter/extension/BrowserExtension.java

@@ -5,20 +5,38 @@
 import io.qameta.allure.Allure;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.LifecycleMethodExecutionExceptionHandler;
 import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
 
 import java.io.ByteArrayInputStream;
 
-public class BrowserExtension implements TestExecutionExceptionHandler, AfterEachCallback {
+public class BrowserExtension implements
+    TestExecutionExceptionHandler,
+    LifecycleMethodExecutionExceptionHandler,
+    AfterEachCallback {
 
   @Override
   public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
     if (WebDriverRunner.hasWebDriverStarted()) {
-      Allure.addAttachment("Screenshot on fail",
-          new ByteArrayInputStream(((TakesScreenshot) WebDriverRunner.getWebDriver())
-              .getScreenshotAs(OutputType.BYTES)));
+      doScreen();
+    }
+    throw throwable;
+  }
+
+  @Override
+  public void handleBeforeEachMethodExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
+    if (WebDriverRunner.hasWebDriverStarted()) {
+      doScreen();
+    }
+    throw throwable;
+  }
+
+  @Override
+  public void handleAfterEachMethodExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
+    if (WebDriverRunner.hasWebDriverStarted()) {
+      doScreen();
     }
     throw throwable;
   }
@@ -29,4 +47,10 @@ public void afterEach(ExtensionContext context) {
       Selenide.closeWebDriver();
     }
   }
+
+  private void doScreen() {
+    Allure.addAttachment("Screenshot on fail",
+        new ByteArrayInputStream(((TakesScreenshot) WebDriverRunner.getWebDriver())
+            .getScreenshotAs(OutputType.BYTES)));
+  }
 }

niffler-e-2-e-tests/src/test/java/guru/qa/niffler/page/MainPage.java

@@ -29,8 +29,8 @@ public SpendingTable getSpendingTable() {
   @Override
   public MainPage waitForPageLoaded() {
     header.getSelf().should(visible).shouldHave(text("Niffler"));
-    spendingTable.getSelf().should(visible).shouldHave(text("History of Spendings"));
     statComponent.getSelf().should(visible).shouldHave(text("Statistics"));
+    spendingTable.getSelf().should(visible).shouldHave(text("History of Spendings"));
     return this;
   }
 }

selenoid/browsers.json

@@ -1,10 +1,14 @@
 {
   "chrome": {
-    "default": "125.0",
+    "default": "127.0",
     "versions": {
       "125.0": {
         "image": "selenoid/vnc_chrome:125.0",
         "port": "4444"
+      },
+      "127.0": {
+        "image": "selenoid/vnc_chrome:127.0",
+        "port": "4444"
       }
     }
   }