Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .cursorignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
studio/ost/
web-components/dist/
64 changes: 64 additions & 0 deletions nala/docs/ccd-mini/mini.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const features = [
fragment: '03a36f0f-3e5d-4881-ae6b-273c517c9d38',
title: 'CCD Apps: Photography',
regularPrice: 'US$59.99/mo',
unitText: '',
promoPrice: undefined,
promotionCode: undefined,
planTypeText: 'Annual, billed monthly',
Expand Down Expand Up @@ -42,6 +43,7 @@ export const features = [
fragment: 'df357350-95b2-47f2-844f-df2e491eecef',
title: 'CCD Apps: Premiere Pro plan',
regularPrice: 'US$34.49/mo',
unitText: '',
promoPrice: 'US$17.24/mo',
promotionCode: 'UMRM2MUSPr501YOC',
recurrenceText: '/mo',
Expand Down Expand Up @@ -73,6 +75,7 @@ export const features = [
fragment: '03a36f0f-3e5d-4881-ae6b-273c517c9d38',
title: 'CCD Apps: Photography',
regularPrice: '71,99 €/mois',
unitText: '',
promoPrice: undefined,
promotionCode: undefined,
planTypeText: 'Annuel, facturé mensuellement',
Expand Down Expand Up @@ -105,6 +108,7 @@ export const features = [
fragment: '77e049ee-c611-437b-bbeb-c54cf72605b1',
title: 'CCD Apps: Photoshop Promo',
regularPrice: '157,14 €/an',
unitText: '',
promoPrice: undefined,
promotionCode: 'PCEMAP50CCDC2',
planTypeText: "Annuel, facturé à l'avance",
Expand All @@ -130,4 +134,64 @@ export const features = [
},
tags: '@mas-docs @ccd-mini @commerce @smoke @regression @milo',
},
{
tcid: '5',
name: '@MAS-CCD-mini-card-team',
path: DOCS_GALLERY_PATH.CCD_MINI.US,
data: {
fragment: '52b30904-c8b1-44d2-ada4-cbbdf87b7603',
title: 'CCD Apps Teams',
regularPrice: 'US$99.99/mo',
unitText: 'per license',
promotionCode: undefined,
planTypeText: 'Annual, billed monthly',
recurrenceText: '/mo',
seeTerms: {
text: 'See terms',
analyticsId: 'see-terms',
href: 'https://www.adobe.com/offers/promo-terms.html?locale=en_US&country=US&offer_id=7B3FB5E4F8662A207A960BAFB6B1C21C',
},
primaryCta: {
text: 'Free trial',
analyticsId: 'free-trial',
href: 'https://commerce.adobe.com/store/email?items%5B0%5D%5Bid%5D=7B3FB5E4F8662A207A960BAFB6B1C21C&cli=adobe_com&ctx=fp&co=US&lang=en',
},
secondaryCta: {
text: 'Buy now',
analyticsId: 'buy-now',
href: 'https://commerce.adobe.com/store/email?items%5B0%5D%5Bid%5D=7B3FB5E4F8662A207A960BAFB6B1C21C&cli=adobe_com&ctx=fp&co=US&lang=en',
},
},
tags: '@mas-docs @ccd-mini @commerce @smoke @regression @milo',
},
{
tcid: '6',
name: '@MAS-CCD-mini-card-fr-team',
path: DOCS_GALLERY_PATH.CCD_MINI.FR,
data: {
fragment: '52b30904-c8b1-44d2-ada4-cbbdf87b7603',
title: 'CCD Apps Teams',
regularPrice: '86,55 €/mois',
unitText: 'par licence',
promotionCode: undefined,
planTypeText: 'Annuel, facturé mensuellement',
recurrenceText: '/mois',
seeTerms: {
text: 'Conditions d’utilisation',
analyticsId: 'see-terms',
href: 'https://www.adobe.com/offers/promo-terms.html?locale=fr_FR&country=FR&offer_id=7B3FB5E4F8662A207A960BAFB6B1C21C',
},
primaryCta: {
text: 'Version d’essai gratuite',
analyticsId: 'free-trial',
href: 'https://commerce.adobe.com/store/email?items%5B0%5D%5Bid%5D=7B3FB5E4F8662A207A960BAFB6B1C21C&cli=adobe_com&ctx=fp&co=FR&lang=fr',
},
secondaryCta: {
text: 'Acheter maintenant',
analyticsId: 'buy-now',
href: 'https://commerce.adobe.com/store/email?items%5B0%5D%5Bid%5D=7B3FB5E4F8662A207A960BAFB6B1C21C&cli=adobe_com&ctx=fp&co=FR&lang=fr',
},
},
tags: '@mas-docs @ccd-mini @commerce @smoke @regression @milo',
},
];
3 changes: 3 additions & 0 deletions nala/docs/ccd-mini/mini.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ test.describe('CCD Mini Cards Feature', () => {
const regularPrice = await cardLocator.evaluate((card) => card.regularPrice);
expect(regularPrice).toBe(data.regularPrice);

const unitText = await cardLocator.evaluate((card) => card.unitText);
expect(unitText ?? '').toBe(data.unitText ?? '');

const promoPrice = await cardLocator.evaluate((card) => card.promoPrice);
expect(promoPrice).toBe(data.promoPrice);

Expand Down
9 changes: 9 additions & 0 deletions nala/utils/nala.run.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ function parseArgs(args) {
}
}

// Determine SKIP_AUTH
if (!process.env.SKIP_AUTH) {
if (parsedParams.test.includes('docs/')) {
process.env.SKIP_AUTH = 'true';
} else {
process.env.SKIP_AUTH = 'false';
}
}

return parsedParams;
}

Expand Down
114 changes: 57 additions & 57 deletions web-components/dist/mas.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web-components/dist/merch-card-collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -4593,7 +4593,7 @@ merch-card[variant="mini"] span.promo-duration-text,
merch-card[variant="mini"] span.renewal-text {
display: block;
}
`;var ga={title:{tag:"p",slot:"title"},prices:{tag:"p",slot:"prices"},description:{tag:"p",slot:"description"},planType:!0,ctas:{slot:"ctas",size:"S"}},Ze=class extends N{constructor(){super(...arguments);g(this,"legal")}async postCardUpdateHook(){await this.card.updateComplete,this.adjustLegal()}getGlobalCSS(){return fa}get headingSelector(){return'[slot="title"]'}priceOptionsProvider(r,i){i.literals={...i.literals,strikethroughAriaLabel:"",alternativePriceAriaLabel:""},i.space=!0,i.displayAnnual=this.card.settings?.displayAnnual??!1}adjustLegal(){if(this.legal!==void 0)return;let r=this.card.querySelector(`${K}[data-template="price"]`);if(!r)return;let i=r.cloneNode(!0);this.legal=i,r.dataset.displayTax="false",i.dataset.template="legal",i.dataset.displayPlanType=this.card?.settings?.displayPlanType??!0,i.setAttribute("slot","legal"),this.card.appendChild(i)}renderLayout(){return ss`
`;var ga={title:{tag:"p",slot:"title"},prices:{tag:"p",slot:"prices"},description:{tag:"p",slot:"description"},planType:!0,ctas:{slot:"ctas",size:"S"}},Ze=class extends N{constructor(){super(...arguments);g(this,"legal")}async postCardUpdateHook(){await this.card.updateComplete,this.adjustLegal()}getGlobalCSS(){return fa}get headingSelector(){return'[slot="title"]'}priceOptionsProvider(r,i){i.literals={...i.literals,strikethroughAriaLabel:"",alternativePriceAriaLabel:""},i.space=!0,i.displayAnnual=this.card.settings?.displayAnnual??!1}adjustLegal(){if(this.legal!==void 0)return;let r=this.card.querySelector(`${K}[data-template="price"]`);if(!r)return;let i=r.cloneNode(!0);this.legal=i,r.dataset.displayTax="false",r.dataset.displayPerUnit="false",i.dataset.template="legal",i.dataset.displayPlanType=this.card?.settings?.displayPlanType??!0,i.setAttribute("slot","legal"),this.card.appendChild(i)}renderLayout(){return ss`
${this.badge}
<div class="body">
<slot name="title"></slot>
Expand Down
Loading
Loading