@shopware-ag/acceptance-test-suite 2.3.2 → 2.3.6

package/dist/index.d.mts

@@ -27,8 +27,8 @@ declare class AdminApiContext {
     constructor(context: APIRequestContext, options: AdminApiContextOptions);
     static create(options?: AdminApiContextOptions): Promise<AdminApiContext>;
     private static createApiRequestContext;
-    private static authenticateWithClientCredentials;
-    private static authenticateWithUserPassword;
+    static authenticateWithClientCredentials(context: APIRequestContext, options: AdminApiContextOptions): Promise<string>;
+    static authenticateWithUserPassword(context: APIRequestContext, options: AdminApiContextOptions): Promise<string>;
     isAuthenticated(): boolean;
     get<PAYLOAD>(url: string, options?: RequestOptions$1<PAYLOAD>): Promise<APIResponse>;
     post<PAYLOAD>(url: string, options?: RequestOptions$1<PAYLOAD>): Promise<APIResponse>;
@@ -157,7 +157,7 @@ type Tag = components['schemas']['Tag'] & {
 type Rule = components['schemas']['Rule'] & {
     id: string;
 };
-type Currency = components['schemas']['Currency'] & {
+type Currency$1 = components['schemas']['Currency'] & {
     id: string;
 };
 type Order = components['schemas']['Order'] & {
@@ -386,7 +386,7 @@ declare class TestDataService {
      *
      * @param isoCode - The ISO code of the currency, for example "EUR".
      */
-    getCurrency(isoCode: string): Promise<Currency>;
+    getCurrency(isoCode: string): Promise<Currency$1>;
     /**
      * Retrieves a rule based on its name.
      *
@@ -480,7 +480,7 @@ declare class TestDataService {
         active: boolean;
     } & Partial<Category$1>;
     getBasicCustomerStruct(salesChannelId: string, customerGroupId: string, languageId: string, countryId: string, defaultPaymentMethodId: string, salutationId: string, overrides?: Partial<Customer>): Partial<Customer>;
-    getBasicOrderStruct(lineItems: SimpleLineItem[], languageId: string, currency: Currency, paymentMethod: PaymentMethod, shippingMethod: ShippingMethod, orderState: StateMachineState, deliveryState: StateMachineState, transactionState: StateMachineState, customer: Customer, customerAddress: CustomerAddress, salesChannelId?: string, overrides?: Partial<Order>): Partial<Order>;
+    getBasicOrderStruct(lineItems: SimpleLineItem[], languageId: string, currency: Currency$1, paymentMethod: PaymentMethod, shippingMethod: ShippingMethod, orderState: StateMachineState, deliveryState: StateMachineState, transactionState: StateMachineState, customer: Customer, customerAddress: CustomerAddress, salesChannelId?: string, overrides?: Partial<Order>): Partial<Order>;
     getBasicProductLineItemStruct(lineItem: SimpleLineItem): {
         productId: string;
         referencedId: string;
@@ -528,7 +528,7 @@ interface TestDataFixtureTypes {
 
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
-    SaaSInstanceSetup: (page: Page) => Promise<void>;
+    SaaSInstanceSetup: () => Promise<void>;
 }
 
 interface StoreBaseConfig {
@@ -995,12 +995,18 @@ interface DataFixtureTypes {
 interface FixtureTypes extends ApiContextTypes, PageContextTypes, ActorFixtureTypes, TestDataFixtureTypes, HelperFixtureTypes, DefaultSalesChannelTypes, StorefrontPageTypes, AdministrationPageTypes, DataFixtureTypes {
 }
 
-declare const getLanguageData: (languageCode: string, adminApiContext: AdminApiContext) => Promise<{
+type Language = components['schemas']['Currency'] & {
     id: string;
-    localeId: string;
-}>;
+    translationCode: components['schemas']['Locale'] & {
+        id: string;
+    };
+};
+declare const getLanguageData: (languageCode: string, adminApiContext: AdminApiContext) => Promise<Language>;
 declare const getSnippetSetId: (languageCode: string, adminApiContext: AdminApiContext) => Promise<string>;
-declare const getCurrency: (isoCode: string, adminApiContext: AdminApiContext) => Promise<any>;
+type Currency = components['schemas']['Currency'] & {
+    id: string;
+};
+declare const getCurrency: (isoCode: string, adminApiContext: AdminApiContext) => Promise<Currency>;
 declare const getTaxId: (adminApiContext: AdminApiContext) => Promise<string>;
 declare const getPaymentMethodId: (adminApiContext: AdminApiContext, handlerId?: string) => Promise<string>;
 declare const getDefaultShippingMethodId: (adminApiContext: AdminApiContext) => Promise<string>;
@@ -1059,4 +1065,4 @@ declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArg
     ValidateAccessibility: (pageName: string, assertViolations?: boolean | undefined, createReport?: boolean | undefined, ruleTags?: string[] | undefined, outputDir?: string | undefined) => () => Promise<void>;
 }, _playwright_test.PlaywrightWorkerArgs & _playwright_test.PlaywrightWorkerOptions & FixtureTypes>;
 
-export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };
+export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency$1 as Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };

package/dist/index.d.ts

@@ -27,8 +27,8 @@ declare class AdminApiContext {
     constructor(context: APIRequestContext, options: AdminApiContextOptions);
     static create(options?: AdminApiContextOptions): Promise<AdminApiContext>;
     private static createApiRequestContext;
-    private static authenticateWithClientCredentials;
-    private static authenticateWithUserPassword;
+    static authenticateWithClientCredentials(context: APIRequestContext, options: AdminApiContextOptions): Promise<string>;
+    static authenticateWithUserPassword(context: APIRequestContext, options: AdminApiContextOptions): Promise<string>;
     isAuthenticated(): boolean;
     get<PAYLOAD>(url: string, options?: RequestOptions$1<PAYLOAD>): Promise<APIResponse>;
     post<PAYLOAD>(url: string, options?: RequestOptions$1<PAYLOAD>): Promise<APIResponse>;
@@ -157,7 +157,7 @@ type Tag = components['schemas']['Tag'] & {
 type Rule = components['schemas']['Rule'] & {
     id: string;
 };
-type Currency = components['schemas']['Currency'] & {
+type Currency$1 = components['schemas']['Currency'] & {
     id: string;
 };
 type Order = components['schemas']['Order'] & {
@@ -386,7 +386,7 @@ declare class TestDataService {
      *
      * @param isoCode - The ISO code of the currency, for example "EUR".
      */
-    getCurrency(isoCode: string): Promise<Currency>;
+    getCurrency(isoCode: string): Promise<Currency$1>;
     /**
      * Retrieves a rule based on its name.
      *
@@ -480,7 +480,7 @@ declare class TestDataService {
         active: boolean;
     } & Partial<Category$1>;
     getBasicCustomerStruct(salesChannelId: string, customerGroupId: string, languageId: string, countryId: string, defaultPaymentMethodId: string, salutationId: string, overrides?: Partial<Customer>): Partial<Customer>;
-    getBasicOrderStruct(lineItems: SimpleLineItem[], languageId: string, currency: Currency, paymentMethod: PaymentMethod, shippingMethod: ShippingMethod, orderState: StateMachineState, deliveryState: StateMachineState, transactionState: StateMachineState, customer: Customer, customerAddress: CustomerAddress, salesChannelId?: string, overrides?: Partial<Order>): Partial<Order>;
+    getBasicOrderStruct(lineItems: SimpleLineItem[], languageId: string, currency: Currency$1, paymentMethod: PaymentMethod, shippingMethod: ShippingMethod, orderState: StateMachineState, deliveryState: StateMachineState, transactionState: StateMachineState, customer: Customer, customerAddress: CustomerAddress, salesChannelId?: string, overrides?: Partial<Order>): Partial<Order>;
     getBasicProductLineItemStruct(lineItem: SimpleLineItem): {
         productId: string;
         referencedId: string;
@@ -528,7 +528,7 @@ interface TestDataFixtureTypes {
 
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
-    SaaSInstanceSetup: (page: Page) => Promise<void>;
+    SaaSInstanceSetup: () => Promise<void>;
 }
 
 interface StoreBaseConfig {
@@ -995,12 +995,18 @@ interface DataFixtureTypes {
 interface FixtureTypes extends ApiContextTypes, PageContextTypes, ActorFixtureTypes, TestDataFixtureTypes, HelperFixtureTypes, DefaultSalesChannelTypes, StorefrontPageTypes, AdministrationPageTypes, DataFixtureTypes {
 }
 
-declare const getLanguageData: (languageCode: string, adminApiContext: AdminApiContext) => Promise<{
+type Language = components['schemas']['Currency'] & {
     id: string;
-    localeId: string;
-}>;
+    translationCode: components['schemas']['Locale'] & {
+        id: string;
+    };
+};
+declare const getLanguageData: (languageCode: string, adminApiContext: AdminApiContext) => Promise<Language>;
 declare const getSnippetSetId: (languageCode: string, adminApiContext: AdminApiContext) => Promise<string>;
-declare const getCurrency: (isoCode: string, adminApiContext: AdminApiContext) => Promise<any>;
+type Currency = components['schemas']['Currency'] & {
+    id: string;
+};
+declare const getCurrency: (isoCode: string, adminApiContext: AdminApiContext) => Promise<Currency>;
 declare const getTaxId: (adminApiContext: AdminApiContext) => Promise<string>;
 declare const getPaymentMethodId: (adminApiContext: AdminApiContext, handlerId?: string) => Promise<string>;
 declare const getDefaultShippingMethodId: (adminApiContext: AdminApiContext) => Promise<string>;
@@ -1059,4 +1065,4 @@ declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArg
     ValidateAccessibility: (pageName: string, assertViolations?: boolean | undefined, createReport?: boolean | undefined, ruleTags?: string[] | undefined, outputDir?: string | undefined) => () => Promise<void>;
 }, _playwright_test.PlaywrightWorkerArgs & _playwright_test.PlaywrightWorkerOptions & FixtureTypes>;
 
-export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };
+export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency$1 as Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };

package/dist/index.mjs

@@ -20,10 +20,10 @@ const getLanguageData = async (languageCode, adminApiContext) => {
     }
   });
   const result = await resp.json();
-  return {
-    id: result.data[0].id,
-    localeId: result.data[0].translationCode.id
-  };
+  if (result.data.length === 0) {
+    throw new Error(`Language ${languageCode} not found`);
+  }
+  return result.data[0];
 };
 const getSnippetSetId = async (languageCode, adminApiContext) => {
   const resp = await adminApiContext.post("search/snippet-set", {
@@ -51,6 +51,9 @@ const getCurrency = async (isoCode, adminApiContext) => {
     }
   });
   const result = await resp.json();
+  if (result.data.length === 0) {
+    throw new Error(`Currency ${isoCode} not found`);
+  }
   return result.data[0];
 };
 const getTaxId = async (adminApiContext) => {
@@ -217,7 +220,7 @@ const test$b = test$d.extend({
       const lang = await requests.language;
       const currency = await requests.currencyEUR;
       await use({
-        enGBLocaleId: lang.localeId,
+        enGBLocaleId: lang.translationCode.id,
         enGBLanguageId: lang.id,
         storefrontTypeId: "8a243080f92e4c719546314b577cf82b",
         eurCurrencyId: currency.id,
@@ -1439,6 +1442,20 @@ class TestDataService {
             At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. 
             Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. 
             At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.`.trim();
+    const prices = [
+      {
+        currencyId: this.defaultSalesChannel.currencyId,
+        gross: 10,
+        linked: false,
+        net: 8.4
+      },
+      {
+        currencyId,
+        gross: 10,
+        linked: false,
+        net: 8.4
+      }
+    ];
     let basicProduct = {
       id: productUuid,
       name: productName,
@@ -1447,18 +1464,8 @@ class TestDataService {
       taxId,
       active: true,
       stock: 10,
-      price: [{
-        currencyId,
-        gross: 10,
-        linked: false,
-        net: 8.4
-      }],
-      purchasePrices: [{
-        currencyId,
-        gross: 8,
-        linked: false,
-        net: 6.7
-      }]
+      price: prices,
+      purchasePrices: prices
     };
     if (this.defaultCategoryId) {
       basicProduct = Object.assign({}, basicProduct, {
@@ -1478,41 +1485,35 @@ class TestDataService {
     return Object.assign({}, basicProduct, overrides);
   }
   getProductPriceRangeStruct(currencyId, ruleId) {
-    return {
-      price: [{
+    const p = (gross, net) => [
+      {
+        currencyId: this.defaultSalesChannel.currencyId,
+        gross,
+        net,
+        linked: false
+      },
+      {
         currencyId,
-        gross: 100,
-        net: 84.03,
+        gross,
+        net,
         linked: false
-      }],
+      }
+    ];
+    return {
+      price: p(100, 84.03),
       prices: [{
         ruleId,
-        price: [{
-          currencyId,
-          gross: 100,
-          net: 84.03,
-          linked: false
-        }],
+        price: p(100, 84.03),
         quantityStart: 1,
         quantityEnd: 10
       }, {
         ruleId,
-        price: [{
-          currencyId,
-          gross: 90,
-          net: 75.63,
-          linked: false
-        }],
+        price: p(90, 75.63),
         quantityStart: 11,
         quantityEnd: 20
       }, {
         ruleId,
-        price: [{
-          currencyId,
-          gross: 80,
-          net: 67.23,
-          linked: false
-        }],
+        price: p(80, 67.23),
         quantityStart: 21,
         quantityEnd: 50
       }]
@@ -1841,23 +1842,22 @@ const test$6 = test$d.extend({
     { scope: "worker" }
   ],
   SaaSInstanceSetup: [
-    async ({ AdminApiContext }, use) => {
-      const SetupInstance = async function SetupInstance2(page) {
-        await test$6.skip(!await isSaaSInstance(AdminApiContext), "Skipping SaaS setup, could not detect SaaS instance");
-        const instanceStatusResponse = await AdminApiContext.get("./instance/status");
+    async ({ AdminApiContext: context }, use) => {
+      const SetupInstance = async function SetupInstance2() {
+        await test$6.skip(!await isSaaSInstance(context), "Skipping SaaS setup, could not detect SaaS instance");
+        expect(context.options.admin_username, "setup requires admin user credentials").toEqual(expect.any(String));
+        expect(context.options.admin_password, "setup requires admin user credentials").toEqual(expect.any(String));
+        const instanceStatusResponse = await context.get("./instance/status");
         const instanceStatus = await instanceStatusResponse.json();
         await expect(instanceStatus.tags, 'expect instance to have "ci" tag').toContain("ci");
-        await test$6.skip((await AdminApiContext.get(`${process.env.APP_URL}constructionmode`, { maxRedirects: 0 })).status() > 204, "Instance already setup");
-        await page.goto(`${process.env.ADMIN_URL}set-up-shop`);
-        await page.getByRole("button", { name: "Next" }).click();
-        await expect(page.getByRole("heading", { name: "Everything finished!" })).toBeVisible();
-        await page.getByRole("button", { name: "Open your shop" }).click();
-        await page.goto(`${process.env.ADMIN_URL}`);
-        await page.getByLabel(/Username|Email address/).fill(AdminApiContext.options.admin_username ?? "admin");
-        await page.getByLabel("Password").fill(AdminApiContext.options.admin_password ?? "shopware");
-        await page.getByRole("button", { name: "Log in" }).click();
-        await page.getByRole("button", { name: "Launch your business" }).click();
-        await expect(page.getByRole("button", { name: "Launch your business" })).toBeHidden();
+        const currency = await getCurrency("USD", context);
+        const language = await getLanguageData("en-US", context);
+        await context.post(
+          "./_actions/set-default-entities",
+          { data: { currencyId: currency.id, languageId: language.id } }
+        );
+        const token = await AdminApiContext.authenticateWithUserPassword(context.context, context.options);
+        await context.post("./sbp/request-live-status", { headers: { Authorization: `Bearer ${token}` } });
       };
       await use(SetupInstance);
     },
@@ -2743,6 +2743,20 @@ const ProductData = test$d.extend({
   ProductData: async ({ IdProvider, SalesChannelBaseConfig, AdminApiContext, DefaultSalesChannel }, use) => {
     const { id: productId, uuid: productUuid } = IdProvider.getIdPair();
     const productName = `Product_test_${productId}`;
+    const price = [
+      {
+        currencyId: DefaultSalesChannel.salesChannel.currencyId,
+        gross: 10,
+        linked: false,
+        net: 8.4
+      },
+      {
+        currencyId: SalesChannelBaseConfig.defaultCurrencyId,
+        gross: 10,
+        linked: false,
+        net: 8.4
+      }
+    ];
     const productResponse = await AdminApiContext.post("./product?_response", {
       data: {
         active: true,
@@ -2751,34 +2765,8 @@ const ProductData = test$d.extend({
         id: productUuid,
         name: productName,
         productNumber: "Product-" + productId,
-        price: [
-          {
-            currencyId: SalesChannelBaseConfig.eurCurrencyId,
-            gross: 10,
-            linked: false,
-            net: 8.4
-          },
-          {
-            currencyId: SalesChannelBaseConfig.defaultCurrencyId,
-            gross: 10,
-            linked: false,
-            net: 8.4
-          }
-        ],
-        purchasePrices: [
-          {
-            currencyId: SalesChannelBaseConfig.eurCurrencyId,
-            gross: 8,
-            linked: false,
-            net: 6.7
-          },
-          {
-            currencyId: SalesChannelBaseConfig.defaultCurrencyId,
-            gross: 8,
-            linked: false,
-            net: 6.7
-          }
-        ],
+        price,
+        purchasePrices: price,
         visibilities: [
           {
             salesChannelId: DefaultSalesChannel.salesChannel.id,

package/package.json

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