Use quarkus-playwright

quarkiverse · Sep 12, 2023 · 48e3315 · 48e3315
1 parent 1160e46
commit 48e3315
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 84 deletions.
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
@@ -352,9 +352,9 @@ The library also brings a very elegant way to do e2e testing using https://githu
 import com.microsoft.playwright.BrowserContext;
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Response;
-import io.quarkiverse.quinoa.testing.QuarkusPlaywrightManager;
+import io.quarkiverse.playwright.WithPlaywright;
 import io.quarkiverse.quinoa.testing.QuinoaTestProfiles;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkiverse.playwright.InjectPlaywright;
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
@@ -367,7 +367,7 @@ import java.net.URL;
 @TestProfile(QuinoaTestProfiles.Enable.class)
 @QuarkusTestResource(QuarkusPlaywrightManager.class)
 public class MyWebUITest {
-    @QuarkusPlaywrightManager.InjectPlaywright
+    @InjectPlaywright
     BrowserContext context;
 
     @TestHTTPResource("/")

diff --git a/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaRootPathTest.java b/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaRootPathTest.java
@@ -9,18 +9,18 @@
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Response;
 
-import io.quarkiverse.quinoa.testing.QuarkusPlaywrightManager;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkiverse.playwright.WithPlaywright;
+import io.quarkiverse.playwright.InjectPlaywright;
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
 
 @QuarkusTest
 @TestProfile(TestProfiles.RootPathTests.class)
-@QuarkusTestResource(QuarkusPlaywrightManager.class)
+@WithPlaywright
 public class QuinoaRootPathTest {
 
-    @QuarkusPlaywrightManager.InjectPlaywright
+    @InjectPlaywright
     BrowserContext context;
 
     @TestHTTPResource("/")

diff --git a/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaUIAngularTest.java b/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaUIAngularTest.java
@@ -13,8 +13,8 @@
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Response;
 
-import io.quarkiverse.quinoa.testing.QuarkusPlaywrightManager;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkiverse.playwright.WithPlaywright;
+import io.quarkiverse.playwright.InjectPlaywright;
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
@@ -24,7 +24,7 @@
 @QuarkusTestResource(QuarkusPlaywrightManager.class)
 public class QuinoaUIAngularTest {
 
-    @QuarkusPlaywrightManager.InjectPlaywright
+    @InjectPlaywright
     BrowserContext context;
 
     @TestHTTPResource("/")

diff --git a/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaUILitTest.java b/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaUILitTest.java
@@ -10,8 +10,8 @@
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Response;
 
-import io.quarkiverse.quinoa.testing.QuarkusPlaywrightManager;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkiverse.playwright.WithPlaywright;
+import io.quarkiverse.playwright.InjectPlaywright;
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
@@ -21,7 +21,7 @@
 @QuarkusTestResource(QuarkusPlaywrightManager.class)
 public class QuinoaUILitTest {
 
-    @QuarkusPlaywrightManager.InjectPlaywright
+    @InjectPlaywright
     BrowserContext context;
 
     @TestHTTPResource("/")

diff --git a/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaUIReactTest.java b/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaUIReactTest.java
@@ -13,19 +13,19 @@
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Response;
 
-import io.quarkiverse.quinoa.testing.QuarkusPlaywrightManager;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkiverse.playwright.WithPlaywright;
+import io.quarkiverse.playwright.InjectPlaywright;
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
 import io.restassured.http.ContentType;
 
 @QuarkusTest
 @TestProfile(TestProfiles.ReactTests.class)
-@QuarkusTestResource(QuarkusPlaywrightManager.class)
+@WithPlaywright
 public class QuinoaUIReactTest {
 
-    @QuarkusPlaywrightManager.InjectPlaywright
+    @InjectPlaywright
     BrowserContext context;
 
     @TestHTTPResource("/index.html")

diff --git a/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaUIVueTest.java b/integration-tests/src/test/java/io/quarkiverse/quinoa/it/QuinoaUIVueTest.java
@@ -9,18 +9,18 @@
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Response;
 
-import io.quarkiverse.quinoa.testing.QuarkusPlaywrightManager;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkiverse.playwright.WithPlaywright;
+import io.quarkiverse.playwright.InjectPlaywright;
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
 
 @QuarkusTest
 @TestProfile(TestProfiles.VueTests.class)
-@QuarkusTestResource(QuarkusPlaywrightManager.class)
+@WithPlaywright
 public class QuinoaUIVueTest {
 
-    @QuarkusPlaywrightManager.InjectPlaywright
+    @InjectPlaywright
     BrowserContext context;
 
     @TestHTTPResource("/")

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.version>3.3.0</quarkus.version>
-    <playright.version>1.37.0</playright.version>
+    <quarkus-playright.version>0.0.1</quarkus-playright.version>
     <assertj.version>3.24.2</assertj.version>
     <frontend-plugin.version>1.14.0</frontend-plugin.version>
   </properties>

diff --git a/testing/pom.xml b/testing/pom.xml
@@ -10,14 +10,9 @@
   <name>Quarkus - Quinoa - Testing</name>
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.playwright</groupId>
-      <artifactId>playwright</artifactId>
-      <version>${playright.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.playwright</groupId>
-      <artifactId>driver-bundle</artifactId>
-      <version>${playright.version}</version>
+      <groupId>io.quarkiverse.playwright</groupId>
+      <artifactId>quarkus-playwright</artifactId>
+      <version>${quarkus-playright.version}</version>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/testing/src/main/java/io/quarkiverse/quinoa/testing/QuarkusPlaywrightManager.java b/testing/src/main/java/io/quarkiverse/quinoa/testing/QuarkusPlaywrightManager.java