From c8f6331c00e6335c515757261b6363228206963c Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Thu, 15 Feb 2024 17:40:19 +0200 Subject: [PATCH 1/6] added app to WebSection --- .../main/java/solutions/bellatrix/web/pages/WebSection.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java index 370eda65..06b32ed4 100644 --- a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java +++ b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java @@ -13,6 +13,7 @@ package solutions.bellatrix.web.pages; +import solutions.bellatrix.web.services.App; import solutions.bellatrix.web.services.BrowserService; import solutions.bellatrix.web.services.ComponentCreateService; @@ -27,6 +28,10 @@ public ComponentCreateService create() { return new ComponentCreateService(); } + public App app() { + return new App(); + } + public MapT map() { try { var elementsClass = (Class)((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0]; From db46175896213dcd3bd862a7b9c78d076885075b Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Thu, 15 Feb 2024 17:42:24 +0200 Subject: [PATCH 2/6] depricate browser() and create() in favour if app() --- .../src/main/java/solutions/bellatrix/web/pages/WebSection.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java index 06b32ed4..f2fabd19 100644 --- a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java +++ b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java @@ -20,10 +20,12 @@ import java.lang.reflect.ParameterizedType; public abstract class WebSection> { + @Deprecated public BrowserService browser() { return new BrowserService(); } + @Deprecated public ComponentCreateService create() { return new ComponentCreateService(); } From e4a0345ecf8116041489d765f240b495384a0132 Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Mon, 13 Jan 2025 08:53:37 +0200 Subject: [PATCH 3/6] fixes for PR comments --- .../solutions/bellatrix/web/infrastructure/DriverService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bellatrix.web/src/main/java/solutions/bellatrix/web/infrastructure/DriverService.java b/bellatrix.web/src/main/java/solutions/bellatrix/web/infrastructure/DriverService.java index b821309e..347dcb2f 100644 --- a/bellatrix.web/src/main/java/solutions/bellatrix/web/infrastructure/DriverService.java +++ b/bellatrix.web/src/main/java/solutions/bellatrix/web/infrastructure/DriverService.java @@ -160,7 +160,6 @@ private static WebDriver initializeDriverCloudGridMode(GridSettings gridSettings var url = getUrl(gridSettings.getUrl()); driver = new RemoteWebDriver(new URI(url).toURL(), caps); } catch (Exception e) { - ; DebugInformation.printStackTrace(e); } @@ -240,7 +239,6 @@ private static WebDriver initializeDriverRegularMode() { switch (BROWSER_CONFIGURATION.get().getBrowser()) { case CHROME -> { - //WebDriverManager.chromedriver().setup(); var chromeOptions = new ChromeOptions(); addDriverOptions(chromeOptions); chromeOptions.addArguments("--log-level=3", "--remote-allow-origins=*"); From 5b203292d548716cf4f9dc6c1adceac23cfbafa9 Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Mon, 13 Jan 2025 09:00:41 +0200 Subject: [PATCH 4/6] deprecated browser and create in WebPage in favour of app --- .../main/java/solutions/bellatrix/web/pages/WebPage.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java index 58604e17..d418d4c2 100644 --- a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java +++ b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java @@ -22,13 +22,16 @@ import java.lang.reflect.ParameterizedType; public abstract class WebPage> { - public ComponentCreateService create() { - return new ComponentCreateService(); - } + @Deprecated public BrowserService browser() { return new BrowserService(); } + @Deprecated + public ComponentCreateService create() { + return new ComponentCreateService(); + } + public App app() { return new App(); } From e7608779395e9a6bee65f91f9406a3f949e65453 Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Mon, 13 Jan 2025 09:04:38 +0200 Subject: [PATCH 5/6] removed @Deprecated annotation and updated browser and create methods --- .../main/java/solutions/bellatrix/web/pages/WebPage.java | 6 ++---- .../main/java/solutions/bellatrix/web/pages/WebSection.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java index d418d4c2..71d1ec01 100644 --- a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java +++ b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java @@ -22,14 +22,12 @@ import java.lang.reflect.ParameterizedType; public abstract class WebPage> { - @Deprecated public BrowserService browser() { - return new BrowserService(); + return app().browser(); } - @Deprecated public ComponentCreateService create() { - return new ComponentCreateService(); + return app().create(); } public App app() { diff --git a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java index f2fabd19..4601d2b3 100644 --- a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java +++ b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java @@ -20,14 +20,12 @@ import java.lang.reflect.ParameterizedType; public abstract class WebSection> { - @Deprecated public BrowserService browser() { - return new BrowserService(); + return app().browser(); } - @Deprecated public ComponentCreateService create() { - return new ComponentCreateService(); + return app().create(); } public App app() { From 7689af7a234a517b4d802ed67f8cd709ee79225a Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Mon, 13 Jan 2025 09:09:50 +0200 Subject: [PATCH 6/6] fixed build errors and added javaScript to WebSection --- .../main/java/solutions/bellatrix/web/pages/WebPage.java | 6 +----- .../main/java/solutions/bellatrix/web/pages/WebSection.java | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java index 27bed3be..5b1a12bc 100644 --- a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java +++ b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebPage.java @@ -32,11 +32,7 @@ public ComponentCreateService create() { } public JavaScriptService javaScript() { - return new JavaScriptService(); - } - - public ComponentCreateService create() { - return new ComponentCreateService(); + return app().script(); } public App app() { diff --git a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java index 4601d2b3..0cdd9b2d 100644 --- a/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java +++ b/bellatrix.web/src/main/java/solutions/bellatrix/web/pages/WebSection.java @@ -16,6 +16,7 @@ import solutions.bellatrix.web.services.App; import solutions.bellatrix.web.services.BrowserService; import solutions.bellatrix.web.services.ComponentCreateService; +import solutions.bellatrix.web.services.JavaScriptService; import java.lang.reflect.ParameterizedType; @@ -28,6 +29,10 @@ public ComponentCreateService create() { return app().create(); } + public JavaScriptService javaScript() { + return app().script(); + } + public App app() { return new App(); }