From 4bba4b2fd810fa6903dc9fd880bc91e442c808b3 Mon Sep 17 00:00:00 2001 From: "s.tikhomirov" Date: Thu, 16 Feb 2023 19:23:21 +0300 Subject: [PATCH 1/2] 0.25.0-ALPHA - removal of deprecated code --- build.gradle | 2 +- .../qa/neptune/jupiter/integration/BaseJunit5Test.java | 8 -------- .../qa/neptune/testng/integration/BaseTestNgTest.java | 8 -------- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 jupiter.integration/src/main/java/ru/tinkoff/qa/neptune/jupiter/integration/BaseJunit5Test.java delete mode 100644 testng.integration/src/main/java/ru/tinkoff/qa/neptune/testng/integration/BaseTestNgTest.java diff --git a/build.gradle b/build.gradle index 150d1ec4e0..881cbf1983 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } ext { - globalVersion = '0.25.0-MIGRATION-ALPHA' + globalVersion = '0.25.0-ALPHA' } repositories { diff --git a/jupiter.integration/src/main/java/ru/tinkoff/qa/neptune/jupiter/integration/BaseJunit5Test.java b/jupiter.integration/src/main/java/ru/tinkoff/qa/neptune/jupiter/integration/BaseJunit5Test.java deleted file mode 100644 index a223ac8acc..0000000000 --- a/jupiter.integration/src/main/java/ru/tinkoff/qa/neptune/jupiter/integration/BaseJunit5Test.java +++ /dev/null @@ -1,8 +0,0 @@ -package ru.tinkoff.qa.neptune.jupiter.integration; - -import org.junit.jupiter.api.extension.ExtendWith; - -@Deprecated(forRemoval = true) -@ExtendWith(NeptuneJUnit5Extension.class) -public abstract class BaseJunit5Test { -} diff --git a/testng.integration/src/main/java/ru/tinkoff/qa/neptune/testng/integration/BaseTestNgTest.java b/testng.integration/src/main/java/ru/tinkoff/qa/neptune/testng/integration/BaseTestNgTest.java deleted file mode 100644 index 101571a5c0..0000000000 --- a/testng.integration/src/main/java/ru/tinkoff/qa/neptune/testng/integration/BaseTestNgTest.java +++ /dev/null @@ -1,8 +0,0 @@ -package ru.tinkoff.qa.neptune.testng.integration; - -import org.testng.annotations.Listeners; - -@Deprecated(forRemoval = true) -@Listeners(DefaultTestRunningListener.class) -public abstract class BaseTestNgTest { -} From e1c7fffc68d6fb45f57259ada009e339fd78a1c0 Mon Sep 17 00:00:00 2001 From: "s.tikhomirov" Date: Mon, 20 Feb 2023 13:13:16 +0300 Subject: [PATCH 2/2] update to Selenium 4.8.1 --- build.gradle | 2 +- .../main/java/ru/tinkoff/qa/neptune/selenium/HttpProxy.java | 6 +++--- .../functions/browser/proxy/BrowserProxyCriteria.java | 2 +- .../selenium/functions/browser/proxy/HttpTraffic.java | 6 +++--- .../hamcrest/matchers/browser/proxy/HasContentMatcher.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 0e66b74e66..3799d3e963 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ subprojects { junit5Version = '5.8.2' junit5PlatformVersion = '1.8.2' hamcrestVersion = '2.2' - seleniumVersion = '4.8.0' + seleniumVersion = '4.8.1' allureVersion = '2.21.0' jacksonVersion = '2.13.3' mockitoVersion = '4.8.1' diff --git a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/HttpProxy.java b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/HttpProxy.java index 369a2b2cbd..17318b2e3a 100644 --- a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/HttpProxy.java +++ b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/HttpProxy.java @@ -2,9 +2,9 @@ import org.openqa.selenium.WebDriverException; import org.openqa.selenium.devtools.DevTools; -import org.openqa.selenium.devtools.v107.network.Network; -import org.openqa.selenium.devtools.v107.network.model.RequestWillBeSent; -import org.openqa.selenium.devtools.v107.network.model.ResponseReceived; +import org.openqa.selenium.devtools.v110.network.Network; +import org.openqa.selenium.devtools.v110.network.model.RequestWillBeSent; +import org.openqa.selenium.devtools.v110.network.model.ResponseReceived; import ru.tinkoff.qa.neptune.selenium.functions.browser.proxy.HttpTraffic; import java.util.List; diff --git a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/BrowserProxyCriteria.java b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/BrowserProxyCriteria.java index fbf01455b0..a6e342f82e 100644 --- a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/BrowserProxyCriteria.java +++ b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/BrowserProxyCriteria.java @@ -1,7 +1,7 @@ package ru.tinkoff.qa.neptune.selenium.functions.browser.proxy; import io.netty.handler.codec.http.HttpMethod; -import org.openqa.selenium.devtools.v107.network.Network; +import org.openqa.selenium.devtools.v110.network.Network; import ru.tinkoff.qa.neptune.core.api.steps.Criteria; import ru.tinkoff.qa.neptune.core.api.steps.annotations.Description; import ru.tinkoff.qa.neptune.core.api.steps.annotations.DescriptionFragment; diff --git a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/HttpTraffic.java b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/HttpTraffic.java index 42069cfa9d..aa2e2d4a39 100644 --- a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/HttpTraffic.java +++ b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/functions/browser/proxy/HttpTraffic.java @@ -1,8 +1,8 @@ package ru.tinkoff.qa.neptune.selenium.functions.browser.proxy; -import org.openqa.selenium.devtools.v107.network.Network; -import org.openqa.selenium.devtools.v107.network.model.RequestWillBeSent; -import org.openqa.selenium.devtools.v107.network.model.ResponseReceived; +import org.openqa.selenium.devtools.v110.network.Network; +import org.openqa.selenium.devtools.v110.network.model.RequestWillBeSent; +import org.openqa.selenium.devtools.v110.network.model.ResponseReceived; import static java.lang.String.valueOf; import static java.util.Optional.ofNullable; diff --git a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/hamcrest/matchers/browser/proxy/HasContentMatcher.java b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/hamcrest/matchers/browser/proxy/HasContentMatcher.java index 8ac224c123..ecb46e4709 100644 --- a/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/hamcrest/matchers/browser/proxy/HasContentMatcher.java +++ b/selenium/src/main/java/ru/tinkoff/qa/neptune/selenium/hamcrest/matchers/browser/proxy/HasContentMatcher.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.hamcrest.Matcher; -import org.openqa.selenium.devtools.v107.network.Network; +import org.openqa.selenium.devtools.v110.network.Network; import ru.tinkoff.qa.neptune.core.api.data.format.DataTransformer; import ru.tinkoff.qa.neptune.core.api.hamcrest.NeptuneFeatureMatcher; import ru.tinkoff.qa.neptune.core.api.hamcrest.NullValueMismatch;