@shopware-ag/acceptance-test-suite 11.9.1 → 11.9.3

package/README.md

@@ -469,18 +469,30 @@ The most important part is [test isolation](https://playwright.dev/docs/best-pra
 ## Running Tests in the Test Suite
 If you want to work on the test suite and try to execute tests from within this repository, you have to run a corresponding docker image for a specific Shopware version.
 
-Shopware 6.6  
-```
-docker compose up -d shopware
-```
+We publish pre-built images at the [GitHub container registry](https://github.com/orgs/shopware/packages/container/package/acceptance-test-suite%2Ftest-image). The images are built on a daily basis, check to see which versions are available.
 
-Shopware 6.5  
+In order to select an image, export the corresponding tag as `SHOPWARE_VERSION` and start the containers:
+
+```bash
+SHOPWARE_VERSION=trunk docker compose up --wait shopware
 ```
-docker compose up -d shopware-65
+
+<details>
+<summary>ℹ️ What if the version I'd like to test is not available as a pre-built image?</summary>
+
+If you want to test with an image that's not available already, you can build it yourself by exporting a few more variables:
+
+```bash
+export PHP_VERSION="8.3" # PHP version of the base image
+export SHOPWARE_VERSION="v6.5.8.0" # Shopware version to check out. This may bei either a branch or a tag, depending on the value of SHOPWARE_BUILD_SOURCE
+export SHOPWARE_BUILD_SOURCE="tag" # Either "branch" or "tag"
+
+docker compose up --attach-dependencies shopware # This will build the image if it's not available
 ```
+</details>
 
-When the docker container is running you can execute the normal playwright commands.
+Afterwards you can execute the normal playwright commands:
 
+```bash
+npx playwright test --ui
 ```
-npx playwright test
-```

package/dist/index.d.mts

@@ -1941,13 +1941,14 @@ declare class FlowBuilderDetail implements PageObject {
 
 declare class DataSharing implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly dataConsentHeadline: Locator;
     readonly dataSharingSuccessMessageLabel: Locator;
     readonly dataSharingAgreeButton: Locator;
     readonly dataSharingDisableButton: Locator;
     readonly dataSharingTermsAgreementLabel: Locator;
-    constructor(page: Page);
-    url(): string;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
+    url(): "#/sw/settings/usage/data/index" | "#/sw/settings/usage/data/index/general";
 }
 
 declare class Dashboard implements PageObject {

package/dist/index.d.ts

@@ -1941,13 +1941,14 @@ declare class FlowBuilderDetail implements PageObject {
 
 declare class DataSharing implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly dataConsentHeadline: Locator;
     readonly dataSharingSuccessMessageLabel: Locator;
     readonly dataSharingAgreeButton: Locator;
     readonly dataSharingDisableButton: Locator;
     readonly dataSharingTermsAgreementLabel: Locator;
-    constructor(page: Page);
-    url(): string;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
+    url(): "#/sw/settings/usage/data/index" | "#/sw/settings/usage/data/index/general";
 }
 
 declare class Dashboard implements PageObject {

package/dist/index.mjs

@@ -556,7 +556,7 @@ const isSaaSInstance = async (adminApiContext) => {
 const isThemeCompiled = async (context, storefrontUrl) => {
   const response = await context.get(storefrontUrl);
   const body = (await response.body()).toString();
-  const matches = body.match(/.*"(https:\/\/.*all\.css[^"]*)".*/);
+  const matches = body.match(/.*"(https?:\/\/.*all\.css[^"]*)".*/);
   if (matches && matches?.length > 1) {
     const allCssUrl = matches[1];
     const allCssResponse = await context.get(allCssUrl);
@@ -602,7 +602,7 @@ const test$b = test$f.extend({
     });
     await expect(page.url()).toContain("login");
     await page.getByLabel(/Username|Email address/).fill(adminUser.username);
-    await page.getByLabel("Password").fill(adminUser.password);
+    await page.getByLabel("Password", { exact: true }).fill(adminUser.password);
     const config = await (await AdminApiContext.get("./_info/config")).json();
     const jsLoadingPromises = [];
     for (const i in config.bundles) {
@@ -639,16 +639,13 @@ const test$b = test$f.extend({
       baseURL: url
     });
     const page = await context.newPage();
-    const isSaasInstance = await isSaaSInstance(AdminApiContext);
     if (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
       test$f.slow();
       await AdminApiContext.post(
         `./_action/theme/${SalesChannelBaseConfig.defaultThemeId}/assign/${salesChannel.id}`
       );
-      if (isSaasInstance) {
-        while (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
-          await page.waitForTimeout(4e3);
-        }
+      while (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
+        await page.waitForTimeout(4e3);
       }
     }
     await page.goto("./", { waitUntil: "load" });
@@ -3223,7 +3220,7 @@ const test$8 = test$f.extend({
       expect(response.ok(), "/_info/config request failed").toBeTruthy();
       const config = await response.json();
       const features = {};
-      if (satisfies(config.version, ">=6.6.0.0")) {
+      if (satisfies(config.version, ">=6.6.1.0")) {
         const featuresResponse = await context.get("./_action/feature-flag");
         expect(featuresResponse.ok(), "/_action/feature-flag request failed").toBeTruthy();
         const data = await featuresResponse.json();
@@ -4973,7 +4970,7 @@ class FirstRunWizard {
     this.smtpServerHostInput = page.getByLabel("Host");
     this.smtpServerPortInput = page.getByLabel("Port");
     this.smtpServerUsernameInput = page.getByLabel("Username");
-    this.smtpServerPasswordInput = page.getByLabel("Password");
+    this.smtpServerPasswordInput = page.getByLabel("Password", { exact: true });
     this.smtpServerEncryptionInput = page.locator(".sw-single-select__selection-input");
     this.smtpServerSenderAddressInput = page.getByLabel("Sender address");
     this.smtpServerDeliveryAddressInput = page.getByLabel("Delivery address");
@@ -5113,20 +5110,28 @@ var __publicField$l = (obj, key, value) => {
   return value;
 };
 class DataSharing {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$l(this, "dataConsentHeadline");
     __publicField$l(this, "dataSharingSuccessMessageLabel");
     __publicField$l(this, "dataSharingAgreeButton");
     __publicField$l(this, "dataSharingDisableButton");
     __publicField$l(this, "dataSharingTermsAgreementLabel");
-    this.dataConsentHeadline = page.locator("h3.sw-usage-data-consent-banner__content-headline");
+    if (satisfies(instanceMeta.version, "<6.6.1")) {
+      this.dataConsentHeadline = page.locator("header.sw-usage-data-consent-banner__title");
+    } else {
+      this.dataConsentHeadline = page.locator("h3.sw-usage-data-consent-banner__content-headline");
+    }
     this.dataSharingAgreeButton = page.getByRole("button", { name: "Agree" });
     this.dataSharingDisableButton = page.getByRole("button", { name: "Disable data sharing" });
     this.dataSharingSuccessMessageLabel = page.getByText("You are sharing data with us", { exact: true });
     this.dataSharingTermsAgreementLabel = page.getByText('By clicking "Agree", you confirm that you are authorized to enter into this agreement on behalf of your company.');
   }
   url() {
+    if (satisfies(this.instanceMeta.version, "<6.6.1")) {
+      return "#/sw/settings/usage/data/index";
+    }
     return "#/sw/settings/usage/data/index/general";
   }
 }
@@ -6161,8 +6166,8 @@ const test$6 = test$f.extend({
   AdminFlowBuilderDetail: async ({ AdminPage }, use) => {
     await use(new FlowBuilderDetail(AdminPage));
   },
-  AdminDataSharing: async ({ AdminPage }, use) => {
-    await use(new DataSharing(AdminPage));
+  AdminDataSharing: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new DataSharing(AdminPage, InstanceMeta));
   },
   AdminDashboard: async ({ AdminPage }, use) => {
     await use(new Dashboard(AdminPage));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/acceptance-test-suite",
-  "version": "11.9.1",
+  "version": "11.9.3",
   "description": "Shopware Acceptance Test Suite",
   "author": "shopware AG",
   "license": "MIT",