Merge remote-tracking branch 'upstream/main' into MWPW-166929

adobecom · Feb 12, 2025 · 8c10054 · 8c10054
2 parents ede07ec + a9a5c7f
commit 8c10054
Show file tree

Hide file tree

Showing 37 changed files with 2,241 additions and 529 deletions.
diff --git a/nala/libs/imslogin.js b/nala/libs/imslogin.js
@@ -13,7 +13,7 @@ async function fillOutSignInForm(props, page) {
   await expect(async () => {
     await page.locator('#EmailPage-EmailField').fill(process.env.IMS_EMAIL);
     await page.locator('[data-id=EmailPage-ContinueButton]').click();
-    await expect(page.locator('text=Reset your password')).toBeVisible({ timeout: 45000 }); // Timeout accounting for how long IMS Login page takes to switch form
+    await expect(await page.locator('text=Reset your password')).toBeVisible({ timeout: 45000 }); // Timeout accounting for how long IMS Login page takes to switch form
   }).toPass({
     intervals: [1_000],
     timeout: 10_000,

diff --git a/nala/studio/ccd/slice/slice.page.js b/nala/studio/ccd/slice/slice.page.js
@@ -0,0 +1,21 @@
+export default class CCDSlicePage {
+    constructor(page) {
+        this.page = page;
+
+        this.cardIcon = page.locator('merch-icon');
+        this.cardBadge = page.locator('.ccd-slice-badge');
+        this.cardImage = page.locator('div[slot="image"] img');
+        this.cardDescription = page.locator('div[slot="body-s"]');
+        this.cardLegalLink = page.locator('div[slot="body-s"] p > a');
+        this.cardCTA = page.locator('div[slot="footer"] > button');
+        this.cardCTALink = page.locator(
+            'div[slot="footer"] a[is="checkout-link"]',
+        );
+        this.cardPrice = page
+            .locator('span[data-template="price"] > .price')
+            .first();
+        this.cardPriceStrikethrough = page.locator(
+            'span[data-template="price"] > .price-strikethrough',
+        );
+    }
+}
diff --git a/nala/studio/ccd/slice/slice.spec.js b/nala/studio/ccd/slice/slice.spec.js
@@ -0,0 +1,134 @@
+export default {
+    FeatureName: 'M@S Studio CCD Slice',
+    features: [
+        {
+            tcid: '0',
+            name: '@studio-slice-editor',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '1',
+            name: '@studio-slice-edit-size',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '2',
+            name: '@studio-slice-edit-badge',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+                badge: 'DO NOT EDIT',
+                newBadge: 'Change badge',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '3',
+            name: '@studio-slice-edit-description',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+                description: 'Automation Test Card',
+                newDescription: 'New Test Description',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '4',
+            name: '@studio-slice-edit-mnemonic',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+                iconURL:
+                    'https://www.adobe.com/content/dam/shared/images/product-icons/svg/photoshop.svg',
+                newIconURL:
+                    'https://www.adobe.com/content/dam/shared/images/product-icons/svg/illustrator.svg',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '5',
+            name: '@studio-slice-edit-image',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+                backgroundURL:
+                    'https://milo.adobe.com/assets/img/commerce/media_10bef5ec21c22fd7fe201cb02735082df13bf4960.jpeg',
+                newBackgroundURL:
+                    'https://milo.adobe.com/assets/img/commerce/media_158c1c22b1322dd28d7912d30fb27f29aa79f79b1.png',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '6',
+            name: '@studio-slice-clone-edit-save-delete',
+            path: '/studio.html',
+            data: {
+                cardid: '478f4f3f-0db4-461b-bf89-a7059fb9655c',
+                description: 'Field Edit & Save',
+                newDescription: 'Cloned Field Edit',
+                newBadge: 'New Badge',
+                newIconURL:
+                    'https://www.adobe.com/content/dam/shared/images/product-icons/svg/illustrator.svg',
+                price: 'US$17.24/mo',
+                strikethroughPrice: 'US$34.49/mo',
+                ctaText: 'Buy now',
+                newCtaText: 'Buy now 2',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '7',
+            name: '@studio-slice-edit-price',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+                price: 'US$17.24/mo',
+                strikethroughPrice: 'US$34.49/mo',
+                newPrice: 'US$17.24/moper license',
+                newStrikethroughPrice: 'US$34.49/moper license',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '8',
+            name: '@studio-slice-edit-cta-ost',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+                ctaText: 'Buy now',
+                newCtaText: 'Save now',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+        {
+            tcid: '9',
+            name: '@studio-slice-edit-cta-link',
+            path: '/studio.html',
+            data: {
+                cardid: '8cf16da3-a95d-4186-8a74-e0a2386631a6',
+                ctaText: 'Buy now',
+                newCtaText: 'Buy now 2',
+            },
+            browserParams: '#query=',
+            tags: '@mas-studio @ccd @ccd-slice',
+        },
+    ],
+};