From a497f527e297ff90cef22e40823ec86d44928e0b Mon Sep 17 00:00:00 2001 From: Svetlakov Anton Date: Mon, 14 Feb 2022 16:51:33 +0700 Subject: [PATCH 1/3] Fixed bug with selenoid capabilities --- .../pagefactory/capabilities/SelenoidCapabilitiesParser.java | 2 +- .../web/capabilities/WebSelenoidCapabilitiesParser.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/page-factory-core/src/main/java/ru/sbtqa/tag/pagefactory/capabilities/SelenoidCapabilitiesParser.java b/page-factory-core/src/main/java/ru/sbtqa/tag/pagefactory/capabilities/SelenoidCapabilitiesParser.java index fbc81e39..d021229b 100644 --- a/page-factory-core/src/main/java/ru/sbtqa/tag/pagefactory/capabilities/SelenoidCapabilitiesParser.java +++ b/page-factory-core/src/main/java/ru/sbtqa/tag/pagefactory/capabilities/SelenoidCapabilitiesParser.java @@ -17,7 +17,7 @@ public class SelenoidCapabilitiesParser implements CapabilitiesParser { private static final Configuration PROPERTIES = Configuration.create(); private static final String UNIQUE_NAME_FORMAT = new SimpleDateFormat("dd.MM.yyyy_hh:mm:ss").format(new Date()) + "_%s_" + UUID.randomUUID(); - private final DesiredCapabilities capabilities = new DesiredCapabilities(); + protected final DesiredCapabilities capabilities = new DesiredCapabilities(); @Override public DesiredCapabilities parse() { diff --git a/plugins/web-plugin/src/main/java/ru/sbtqa/tag/pagefactory/web/capabilities/WebSelenoidCapabilitiesParser.java b/plugins/web-plugin/src/main/java/ru/sbtqa/tag/pagefactory/web/capabilities/WebSelenoidCapabilitiesParser.java index 09e97f8a..eff01590 100644 --- a/plugins/web-plugin/src/main/java/ru/sbtqa/tag/pagefactory/web/capabilities/WebSelenoidCapabilitiesParser.java +++ b/plugins/web-plugin/src/main/java/ru/sbtqa/tag/pagefactory/web/capabilities/WebSelenoidCapabilitiesParser.java @@ -9,8 +9,6 @@ public class WebSelenoidCapabilitiesParser extends SelenoidCapabilitiesParser { - private final DesiredCapabilities capabilities = new DesiredCapabilities(); - @Override public DesiredCapabilities parse() { super.parse(); From 29208b9d24addfc3e7d6349f95f5b4a51063a003 Mon Sep 17 00:00:00 2001 From: Svetlakov Anton Date: Mon, 14 Feb 2022 17:02:04 +0700 Subject: [PATCH 2/3] Fixed opera name --- .../java/ru/sbtqa/tag/pagefactory/web/support/BrowserName.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/web-plugin/src/main/java/ru/sbtqa/tag/pagefactory/web/support/BrowserName.java b/plugins/web-plugin/src/main/java/ru/sbtqa/tag/pagefactory/web/support/BrowserName.java index 9d501c89..020b6d9c 100644 --- a/plugins/web-plugin/src/main/java/ru/sbtqa/tag/pagefactory/web/support/BrowserName.java +++ b/plugins/web-plugin/src/main/java/ru/sbtqa/tag/pagefactory/web/support/BrowserName.java @@ -7,7 +7,7 @@ public enum BrowserName { IEXPLORE("iexplore"), CHROME("chrome"), FIREFOX("firefox"), - OPERA("firefox"), + OPERA("opera"), SAFARI("safari"), EDGE("edge"); From 116981e803ac361e0e159d46f05f981d0ba2f25d Mon Sep 17 00:00:00 2001 From: Svetlakov Anton Date: Mon, 14 Feb 2022 17:48:06 +0700 Subject: [PATCH 3/3] Update chromedriver version --- .../src/test/resources/config/application.properties | 2 +- .../web-plugin/src/test/resources/config/application.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/html-plugin/src/test/resources/config/application.properties b/plugins/html-plugin/src/test/resources/config/application.properties index 217540a3..6f7efb28 100644 --- a/plugins/html-plugin/src/test/resources/config/application.properties +++ b/plugins/html-plugin/src/test/resources/config/application.properties @@ -2,7 +2,7 @@ page.package=ru.sbtqa.tag.pagefactory.pages screenshot.strategy=driver webdriver.browser.name=Chrome -webdriver.version = 94.0.4606.41 +webdriver.version = 98.0.4758.80 webdriver.starting.url=http://localhost:8181 # run chrome in headless mode diff --git a/plugins/web-plugin/src/test/resources/config/application.properties b/plugins/web-plugin/src/test/resources/config/application.properties index 3942d194..2d5d48ec 100644 --- a/plugins/web-plugin/src/test/resources/config/application.properties +++ b/plugins/web-plugin/src/test/resources/config/application.properties @@ -2,7 +2,7 @@ page.package = pagefactory.pages.webelements screenshot.strategy = driver webdriver.browser.name = Chrome -webdriver.version = 94.0.4606.41 +webdriver.version = 98.0.4758.80 webdriver.starting.url = http://localhost:8181 # run chrome in headless mode