Fix ats suite for different Shopware versions

.github/workflows/tests.yml

@@ -207,7 +207,7 @@ jobs:
 
       - name: Symlink plugin
         working-directory: shopware/custom/plugins/
-        run: ln -s ../../../meteor/examples/TestPlugin
+        run: ln -s ../../../meteor/examples/admin-sdk-plugin TestPlugin
 
       - name: Activate TestPlugin
         working-directory: shopware/
@@ -246,23 +246,23 @@ jobs:
         run: symfony server:start --allow-http --no-tls --port=8000 -d
 
       - name: Install playwright
-        working-directory: meteor/examples/TestPlugin/tests/acceptance/
+        working-directory: meteor/examples/admin-sdk-plugin/tests/acceptance/
         run: |
           pnpm install --frozen-lockfile --prefer-offline
           npx playwright install --with-deps
 
       - name: Run Playwrigth
-        working-directory: meteor/examples/TestPlugin/tests/acceptance/
+        working-directory: meteor/examples/admin-sdk-plugin/tests/acceptance/
         run: npx playwright test --retries=2 --reporter=github --trace=on-first-retry --project chromium
 
       - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ats-test-results-${{ matrix.project }}
-          path: meteor/examples/TestPlugin/tests/acceptance/test-results/
+          path: meteor/examples/admin-sdk-plugin/tests/acceptance/test-results/
 
       - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ats-report-${{ matrix.project }}
-          path: meteor/examples/TestPlugin/tests/acceptance/playwright-report/
+          path: meteor/examples/admin-sdk-plugin/tests/acceptance/playwright-report/

examples/admin-sdk-plugin/README.md

@@ -0,0 +1,23 @@
+# Meteor Admin SDK Example Plugin
+
+This package contains an example plugin. It uses the [Meteor Admin SDK](https://github.com/shopware/meteor/tree/main/packages/admin-sdk) to extend the administration.
+
+## Prerequisites
+We assume that you have a functioning Shopware 6 setup on your local machine.
+
+## Plugin setup
+
+1. Symlink the plugin to your Shopware 6 installation: `cd <shopwareRoot>/custom/plugins && ln -s <meteorRoot>/examples/admin-sdk-plugin TestPlugin`
+2. It's important that the plugin Folder is named `TestPlugin` inside `custom/plugins`
+3. Activate the plugin : `cd <shopwareRoot> && php bin/console plugin:refresh && php bin/console plugin:install -a -c TestPlugin`
+4. Built the administration Javascript: `cd <shopwareRoot> && composer run build:js:admin`
+
+Now you should see the plugin installed when opening the Shopware Admin and looking in "Extensions" -> "My Extensions".
+
+## Acceptance tests
+
+1. Create a `.env` file in `<meteorRoot>/examples/admin-sdk-plugin/tests/acceptance`
+2. Specify your Shopware instance app url: `APP_URL=https://dev.local/`
+3. Run the tests: `cd <meteorRoot> && pnpm --filter @shopware-ag/meteor-admin-sdk-example-plugin run test:ats`
+
+

examples/TestPlugin/tests/acceptance/fixtures/Helper.ts → examples/admin-sdk-plugin/tests/acceptance/fixtures/Helper.ts

@@ -21,3 +21,17 @@ export async function getSDKiFrame(
 
   return frame;
 }
+
+/**
+ * Mocks the check updates call to return null.
+ * 
+ * This method is called before each test case to prevent the "Updates available" 
+ * notification from interfering with tests on older Shopware versions.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function mockUpdateApi(page: Page): Promise<any> {
+  return page.route('*/**/_action/update/check', async (route) => {
+    const json = null;
+    await route.fulfill({ json });
+  });
+}

examples/TestPlugin/tests/acceptance/playwright.config.ts → examples/admin-sdk-plugin/tests/acceptance/playwright.config.ts

@@ -74,13 +74,6 @@ const config: PlaywrightTestConfig = {
         ...devices['Desktop Chrome'],
       },
     },
-
-    {
-      name: 'firefox',
-      use: {
-        ...devices['Desktop Firefox'],
-      },
-    },
   ],
 
   /* Folder for test artifacts such as screenshots, videos, traces, etc. */

examples/TestPlugin/tests/acceptance/tests/action-button.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/action-button.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin, TestDataService, AdminProductDetail }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   const product = await TestDataService.createBasicProduct();
   ShopAdmin.goesTo(AdminProductDetail.url(product.id));
 

examples/TestPlugin/tests/acceptance/tests/component-section.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/component-section.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin, TestDataService, AdminProductDetail }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   const product = await TestDataService.createBasicProduct();
   ShopAdmin.goesTo(AdminProductDetail.url(product.id));
 

examples/TestPlugin/tests/acceptance/tests/context.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/context.spec.ts

@@ -1,5 +1,5 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 // Defaults
 const DEFAULT_LANGUAGE_ID = '2fbb5fe2e29a4d70aa5854ce7ce3e20b';
@@ -10,6 +10,8 @@ const FALLBACK_LOCALE = 'en-GB';
 let productId = '';
 
 test.beforeEach(async ({ ShopAdmin, TestDataService, AdminDashboard }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   // Create product and assign id
   const product = await TestDataService.createBasicProduct();
   productId = product.id;

examples/TestPlugin/tests/acceptance/tests/dataset.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/dataset.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   // Go to settings
   await ShopAdmin.goesTo('/admin/#sw/settings/index/shop');
 

examples/TestPlugin/tests/acceptance/tests/location.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/location.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin, TestDataService, AdminProductDetail }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   // Create product and open detail page
   const product = await TestDataService.createBasicProduct();
   await ShopAdmin.goesTo(AdminProductDetail.url(product.id));

examples/TestPlugin/tests/acceptance/tests/main-module.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/main-module.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   await ShopAdmin.goesTo('/admin/#/sw/extension/my-extensions/listing/');
 
   const mainHidden = await getSDKiFrame(ShopAdmin.page, 'sw-main-hidden');

examples/TestPlugin/tests/acceptance/tests/menu-item.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/menu-item.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin, AdminDashboard }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   await ShopAdmin.goesTo(AdminDashboard.url());
 
   const mainHidden = await getSDKiFrame(ShopAdmin.page, 'sw-main-hidden');

examples/TestPlugin/tests/acceptance/tests/modals.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/modals.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin, TestDataService, AdminProductDetail }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   const product = await TestDataService.createBasicProduct();
   await ShopAdmin.goesTo(AdminProductDetail.url(product.id));
 

examples/TestPlugin/tests/acceptance/tests/notification.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/notification.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin, AdminDashboard }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   await ShopAdmin.goesTo(AdminDashboard.url());
 
   // The main hidden iFrame should exist

examples/TestPlugin/tests/acceptance/tests/settings-item.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/settings-item.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   await ShopAdmin.goesTo('/admin/#sw/settings/index/shop');
 
   const mainHidden = await getSDKiFrame(ShopAdmin.page, 'sw-main-hidden');

examples/TestPlugin/tests/acceptance/tests/tabs.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/tabs.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin, TestDataService, AdminProductDetail }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   const product = await TestDataService.createBasicProduct();
   await ShopAdmin.goesTo(AdminProductDetail.url(product.id));
 

examples/TestPlugin/tests/acceptance/tests/window.spec.ts → examples/admin-sdk-plugin/tests/acceptance/tests/window.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from '../fixtures/AcceptanceTest';
-import { getSDKiFrame } from '../fixtures/Helper';
+import { getSDKiFrame, mockUpdateApi } from '../fixtures/Helper';
 
 test.beforeEach(async ({ ShopAdmin, AdminDashboard }) => {
+  await mockUpdateApi(ShopAdmin.page);
+
   await ShopAdmin.goesTo(AdminDashboard.url());
 
   // The main hidden iFrame should exist

packages/component-library/src/components/table-and-list/mt-data-table/sub-components/mt-data-table-settings/mt-data-table-settings.vue

@@ -243,7 +243,7 @@ export default defineComponent({
         return {
           id: column.property,
           label: column.label,
-          parentGroup: (column.visible ?? true) ? "visible" : "hidden",
+          parentGroup: column.visible ?? true ? "visible" : "hidden",
           position: column.position,
           isVisible: column.visible ?? true,
           isHidable: isPrimaryColumn(column) ? false : true,