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
5 changes: 5 additions & 0 deletions .changeset/legal-ants-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo and tighten wording in changeset entry

Correct “containes” → “contains” and simplify phrasing.

Apply this diff:

-Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.+Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.
Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
🧰 Tools
🪛 LanguageTool

[grammar] ~5-~5: There might be a mistake here.
Context: ... that containes the plan details drawer.

(QB_NEW_EN)

🤖 Prompt for AI Agents
In .changeset/legal-ants-flow.md around line 5, the changeset entry has a typo
and awkward phrasing: replace “containes” with “contains” and simplify the
sentence to read something like: "Add class `cl-planDetails-root` to the parent
div that contains the plan details drawer." Update the line accordingly to fix
the spelling and tighten the wording.

5 changes: 5 additions & 0 deletions .changeset/little-seals-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/testing': patch
---

Add `planDetails` to the page details object.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { SignedIn } from '@clerk/nextjs';
import { CheckoutButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SignedIn>
<CheckoutButton
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'
planPeriod='month'
>
Checkout Now
</CheckoutButton>
</SignedIn>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { PlanDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'>Plan details</PlanDetailsButton>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { SubscriptionDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SubscriptionDetailsButton>Subscription details</SubscriptionDetailsButton>
</main>
);
}
2 changes: 1 addition & 1 deletion integration/templates/next-app-router/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
61 changes: 61 additions & 0 deletions integration/tests/pricing-table.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,29 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible();
});

test('renders pricing details of a specific plan', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/billing/plan-details-btn');

await u.po.page.getByRole('button', { name: 'Plan details' }).click();

await u.po.planDetails.waitForMounted();
const { root } = u.po.planDetails;
await expect(root.getByRole('heading', { name: 'Plus' })).toBeVisible();
await expect(root.getByText('$9.99')).toBeVisible();
await expect(root.getByText('This is the Plus plan!')).toBeVisible();
await expect(root.getByText('Feature One')).toBeVisible();
await expect(root.getByText('First feature')).toBeVisible();
await expect(root.getByText('Feature Two')).toBeVisible();
await expect(root.getByText('Second feature')).toBeVisible();
await expect(root.getByText('Feature Three')).toBeVisible();
await expect(root.getByText('Third feature')).toBeVisible();
});

test('when signed out, clicking subscribe button navigates to sign in page', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/pricing-table');
Expand All@@ -39,6 +62,10 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
});

test('when signed in, clicking get started button opens checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
Expand All@@ -64,6 +91,21 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByText('Checkout')).toBeVisible();
});

test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/checkout-btn');

await u.po.page.getByRole('button', { name: 'Checkout Now' }).click();
await u.po.checkout.waitForMounted();
await u.po.page.getByText(/^Checkout$/).click();
await u.po.checkout.fillTestCard();
});

test('can subscribe to a plan', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand All@@ -86,6 +128,25 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
}
});

test('Displays subscription details drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/subscription-details-btn');

await u.po.page.getByRole('button', { name: 'Subscription details' }).click();

await u.po.subscriptionDetails.waitForMounted();
await expect(u.po.page.getByText('Plus')).toBeVisible();
await expect(u.po.page.getByText('Subscription details')).toBeVisible();
await expect(u.po.page.getByText('Current billing cycle')).toBeVisible();
await expect(u.po.page.getByText('Next payment on')).toBeVisible();
await expect(u.po.page.getByText('Next payment amount')).toBeVisible();
});

test('can upgrade to a new plan with saved card', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand Down
11 changes: 8 additions & 3 deletions packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
Col,
descriptors,
Flex,
Flow,
Heading,
localizationKeys,
Span,
Expand All@@ -30,9 +31,13 @@ import {

export const PlanDetails = (props: __internal_PlanDetailsProps) => {
return (
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
<Flow.Root flow='planDetails'>
<Flow.Part>
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
</Flow.Part>
</Flow.Root>
);
};

Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/contexts/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export type FlowMetadata = {
| 'apiKeys'
| 'oauthConsent'
| 'subscriptionDetails'
| 'subscriptionDetails'
| 'taskChooseOrganization';
part?:
| 'start'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { createExpectPageObject } from './expect';
import { createImpersonationPageObject } from './impersonation';
import { createKeylessPopoverPageObject } from './keylessPopover';
import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcher';
import { createPlanDetailsPageObject } from './planDetails';
import { createPricingTablePageObject } from './pricingTable';
import { createSessionTaskComponentPageObject } from './sessionTask';
import { createSignInComponentPageObject } from './signIn';
Expand DownExpand Up@@ -50,5 +51,6 @@ export const createPageObjects = ({
waitlist: createWaitlistComponentPageObject(testArgs),
apiKeys: createAPIKeysComponentPageObject(testArgs),
subscriptionDetails: createSubscriptionDetailsPageObject(testArgs),
planDetails: createPlanDetailsPageObject(testArgs),
};
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import type { EnhancedPage } from './app';
import { common } from './common';

export const createPlanDetailsPageObject = (testArgs: { page: EnhancedPage }) => {
const { page } = testArgs;
const self = {
...common(testArgs),
waitForMounted: (selector = '.cl-planDetails-root') => {
return page.waitForSelector(selector, { state: 'attached' });
},
root: page.locator('.cl-planDetails-root'),
};
return self;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
5 changes: 5 additions & 0 deletions .changeset/legal-ants-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo and tighten wording in changeset entry

Correct “containes” → “contains” and simplify phrasing.

Apply this diff:

-Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.+Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.
Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
🧰 Tools
🪛 LanguageTool

[grammar] ~5-~5: There might be a mistake here.
Context: ... that containes the plan details drawer.

(QB_NEW_EN)

🤖 Prompt for AI Agents
In .changeset/legal-ants-flow.md around line 5, the changeset entry has a typo
and awkward phrasing: replace “containes” with “contains” and simplify the
sentence to read something like: "Add class `cl-planDetails-root` to the parent
div that contains the plan details drawer." Update the line accordingly to fix
the spelling and tighten the wording.

5 changes: 5 additions & 0 deletions .changeset/little-seals-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/testing': patch
---

Add `planDetails` to the page details object.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { SignedIn } from '@clerk/nextjs';
import { CheckoutButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SignedIn>
<CheckoutButton
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'
planPeriod='month'
>
Checkout Now
</CheckoutButton>
</SignedIn>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { PlanDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'>Plan details</PlanDetailsButton>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { SubscriptionDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SubscriptionDetailsButton>Subscription details</SubscriptionDetailsButton>
</main>
);
}
2 changes: 1 addition & 1 deletion integration/templates/next-app-router/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
61 changes: 61 additions & 0 deletions integration/tests/pricing-table.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,29 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible();
});

test('renders pricing details of a specific plan', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/billing/plan-details-btn');

await u.po.page.getByRole('button', { name: 'Plan details' }).click();

await u.po.planDetails.waitForMounted();
const { root } = u.po.planDetails;
await expect(root.getByRole('heading', { name: 'Plus' })).toBeVisible();
await expect(root.getByText('$9.99')).toBeVisible();
await expect(root.getByText('This is the Plus plan!')).toBeVisible();
await expect(root.getByText('Feature One')).toBeVisible();
await expect(root.getByText('First feature')).toBeVisible();
await expect(root.getByText('Feature Two')).toBeVisible();
await expect(root.getByText('Second feature')).toBeVisible();
await expect(root.getByText('Feature Three')).toBeVisible();
await expect(root.getByText('Third feature')).toBeVisible();
});

test('when signed out, clicking subscribe button navigates to sign in page', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/pricing-table');
Expand All@@ -39,6 +62,10 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
});

test('when signed in, clicking get started button opens checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
Expand All@@ -64,6 +91,21 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByText('Checkout')).toBeVisible();
});

test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/checkout-btn');

await u.po.page.getByRole('button', { name: 'Checkout Now' }).click();
await u.po.checkout.waitForMounted();
await u.po.page.getByText(/^Checkout$/).click();
await u.po.checkout.fillTestCard();
});

test('can subscribe to a plan', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand All@@ -86,6 +128,25 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
}
});

test('Displays subscription details drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/subscription-details-btn');

await u.po.page.getByRole('button', { name: 'Subscription details' }).click();

await u.po.subscriptionDetails.waitForMounted();
await expect(u.po.page.getByText('Plus')).toBeVisible();
await expect(u.po.page.getByText('Subscription details')).toBeVisible();
await expect(u.po.page.getByText('Current billing cycle')).toBeVisible();
await expect(u.po.page.getByText('Next payment on')).toBeVisible();
await expect(u.po.page.getByText('Next payment amount')).toBeVisible();
});

test('can upgrade to a new plan with saved card', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand Down
11 changes: 8 additions & 3 deletions packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
Col,
descriptors,
Flex,
Flow,
Heading,
localizationKeys,
Span,
Expand All@@ -30,9 +31,13 @@ import {

export const PlanDetails = (props: __internal_PlanDetailsProps) => {
return (
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
<Flow.Root flow='planDetails'>
<Flow.Part>
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
</Flow.Part>
</Flow.Root>
);
};

Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/contexts/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export type FlowMetadata = {
| 'apiKeys'
| 'oauthConsent'
| 'subscriptionDetails'
| 'subscriptionDetails'
| 'taskChooseOrganization';
part?:
| 'start'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { createExpectPageObject } from './expect';
import { createImpersonationPageObject } from './impersonation';
import { createKeylessPopoverPageObject } from './keylessPopover';
import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcher';
import { createPlanDetailsPageObject } from './planDetails';
import { createPricingTablePageObject } from './pricingTable';
import { createSessionTaskComponentPageObject } from './sessionTask';
import { createSignInComponentPageObject } from './signIn';
Expand DownExpand Up@@ -50,5 +51,6 @@ export const createPageObjects = ({
waitlist: createWaitlistComponentPageObject(testArgs),
apiKeys: createAPIKeysComponentPageObject(testArgs),
subscriptionDetails: createSubscriptionDetailsPageObject(testArgs),
planDetails: createPlanDetailsPageObject(testArgs),
};
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import type { EnhancedPage } from './app';
import { common } from './common';

export const createPlanDetailsPageObject = (testArgs: { page: EnhancedPage }) => {
const { page } = testArgs;
const self = {
...common(testArgs),
waitForMounted: (selector = '.cl-planDetails-root') => {
return page.waitForSelector(selector, { state: 'attached' });
},
root: page.locator('.cl-planDetails-root'),
};
return self;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/legal-ants-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo and tighten wording in changeset entry

Correct “containes” → “contains” and simplify phrasing.

Apply this diff:

-Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.+Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.
Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
🧰 Tools
🪛 LanguageTool

[grammar] ~5-~5: There might be a mistake here.
Context: ... that containes the plan details drawer.

(QB_NEW_EN)

🤖 Prompt for AI Agents
In .changeset/legal-ants-flow.md around line 5, the changeset entry has a typo
and awkward phrasing: replace “containes” with “contains” and simplify the
sentence to read something like: "Add class `cl-planDetails-root` to the parent
div that contains the plan details drawer." Update the line accordingly to fix
the spelling and tighten the wording.

5 changes: 5 additions & 0 deletions .changeset/little-seals-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/testing': patch
---

Add `planDetails` to the page details object.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { SignedIn } from '@clerk/nextjs';
import { CheckoutButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SignedIn>
<CheckoutButton
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'
planPeriod='month'
>
Checkout Now
</CheckoutButton>
</SignedIn>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { PlanDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'>Plan details</PlanDetailsButton>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { SubscriptionDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SubscriptionDetailsButton>Subscription details</SubscriptionDetailsButton>
</main>
);
}
2 changes: 1 addition & 1 deletion integration/templates/next-app-router/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
61 changes: 61 additions & 0 deletions integration/tests/pricing-table.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,29 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible();
});

test('renders pricing details of a specific plan', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/billing/plan-details-btn');

await u.po.page.getByRole('button', { name: 'Plan details' }).click();

await u.po.planDetails.waitForMounted();
const { root } = u.po.planDetails;
await expect(root.getByRole('heading', { name: 'Plus' })).toBeVisible();
await expect(root.getByText('$9.99')).toBeVisible();
await expect(root.getByText('This is the Plus plan!')).toBeVisible();
await expect(root.getByText('Feature One')).toBeVisible();
await expect(root.getByText('First feature')).toBeVisible();
await expect(root.getByText('Feature Two')).toBeVisible();
await expect(root.getByText('Second feature')).toBeVisible();
await expect(root.getByText('Feature Three')).toBeVisible();
await expect(root.getByText('Third feature')).toBeVisible();
});

test('when signed out, clicking subscribe button navigates to sign in page', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/pricing-table');
Expand All@@ -39,6 +62,10 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
});

test('when signed in, clicking get started button opens checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
Expand All@@ -64,6 +91,21 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByText('Checkout')).toBeVisible();
});

test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/checkout-btn');

await u.po.page.getByRole('button', { name: 'Checkout Now' }).click();
await u.po.checkout.waitForMounted();
await u.po.page.getByText(/^Checkout$/).click();
await u.po.checkout.fillTestCard();
});

test('can subscribe to a plan', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand All@@ -86,6 +128,25 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
}
});

test('Displays subscription details drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/subscription-details-btn');

await u.po.page.getByRole('button', { name: 'Subscription details' }).click();

await u.po.subscriptionDetails.waitForMounted();
await expect(u.po.page.getByText('Plus')).toBeVisible();
await expect(u.po.page.getByText('Subscription details')).toBeVisible();
await expect(u.po.page.getByText('Current billing cycle')).toBeVisible();
await expect(u.po.page.getByText('Next payment on')).toBeVisible();
await expect(u.po.page.getByText('Next payment amount')).toBeVisible();
});

test('can upgrade to a new plan with saved card', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand Down
11 changes: 8 additions & 3 deletions packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
Col,
descriptors,
Flex,
Flow,
Heading,
localizationKeys,
Span,
Expand All@@ -30,9 +31,13 @@ import {

export const PlanDetails = (props: __internal_PlanDetailsProps) => {
return (
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
<Flow.Root flow='planDetails'>
<Flow.Part>
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
</Flow.Part>
</Flow.Root>
);
};

Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/contexts/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export type FlowMetadata = {
| 'apiKeys'
| 'oauthConsent'
| 'subscriptionDetails'
| 'subscriptionDetails'
| 'taskChooseOrganization';
part?:
| 'start'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { createExpectPageObject } from './expect';
import { createImpersonationPageObject } from './impersonation';
import { createKeylessPopoverPageObject } from './keylessPopover';
import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcher';
import { createPlanDetailsPageObject } from './planDetails';
import { createPricingTablePageObject } from './pricingTable';
import { createSessionTaskComponentPageObject } from './sessionTask';
import { createSignInComponentPageObject } from './signIn';
Expand DownExpand Up@@ -50,5 +51,6 @@ export const createPageObjects = ({
waitlist: createWaitlistComponentPageObject(testArgs),
apiKeys: createAPIKeysComponentPageObject(testArgs),
subscriptionDetails: createSubscriptionDetailsPageObject(testArgs),
planDetails: createPlanDetailsPageObject(testArgs),
};
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import type { EnhancedPage } from './app';
import { common } from './common';

export const createPlanDetailsPageObject = (testArgs: { page: EnhancedPage }) => {
const { page } = testArgs;
const self = {
...common(testArgs),
waitForMounted: (selector = '.cl-planDetails-root') => {
return page.waitForSelector(selector, { state: 'attached' });
},
root: page.locator('.cl-planDetails-root'),
};
return self;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/legal-ants-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo and tighten wording in changeset entry

Correct “containes” → “contains” and simplify phrasing.

Apply this diff:

-Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.+Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.
Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
🧰 Tools
🪛 LanguageTool

[grammar] ~5-~5: There might be a mistake here.
Context: ... that containes the plan details drawer.

(QB_NEW_EN)

🤖 Prompt for AI Agents
In .changeset/legal-ants-flow.md around line 5, the changeset entry has a typo
and awkward phrasing: replace “containes” with “contains” and simplify the
sentence to read something like: "Add class `cl-planDetails-root` to the parent
div that contains the plan details drawer." Update the line accordingly to fix
the spelling and tighten the wording.

5 changes: 5 additions & 0 deletions .changeset/little-seals-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/testing': patch
---

Add `planDetails` to the page details object.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { SignedIn } from '@clerk/nextjs';
import { CheckoutButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SignedIn>
<CheckoutButton
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'
planPeriod='month'
>
Checkout Now
</CheckoutButton>
</SignedIn>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { PlanDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'>Plan details</PlanDetailsButton>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { SubscriptionDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SubscriptionDetailsButton>Subscription details</SubscriptionDetailsButton>
</main>
);
}
2 changes: 1 addition & 1 deletion integration/templates/next-app-router/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
61 changes: 61 additions & 0 deletions integration/tests/pricing-table.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,29 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible();
});

test('renders pricing details of a specific plan', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/billing/plan-details-btn');

await u.po.page.getByRole('button', { name: 'Plan details' }).click();

await u.po.planDetails.waitForMounted();
const { root } = u.po.planDetails;
await expect(root.getByRole('heading', { name: 'Plus' })).toBeVisible();
await expect(root.getByText('$9.99')).toBeVisible();
await expect(root.getByText('This is the Plus plan!')).toBeVisible();
await expect(root.getByText('Feature One')).toBeVisible();
await expect(root.getByText('First feature')).toBeVisible();
await expect(root.getByText('Feature Two')).toBeVisible();
await expect(root.getByText('Second feature')).toBeVisible();
await expect(root.getByText('Feature Three')).toBeVisible();
await expect(root.getByText('Third feature')).toBeVisible();
});

test('when signed out, clicking subscribe button navigates to sign in page', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/pricing-table');
Expand All@@ -39,6 +62,10 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
});

test('when signed in, clicking get started button opens checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
Expand All@@ -64,6 +91,21 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByText('Checkout')).toBeVisible();
});

test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/checkout-btn');

await u.po.page.getByRole('button', { name: 'Checkout Now' }).click();
await u.po.checkout.waitForMounted();
await u.po.page.getByText(/^Checkout$/).click();
await u.po.checkout.fillTestCard();
});

test('can subscribe to a plan', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand All@@ -86,6 +128,25 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
}
});

test('Displays subscription details drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/subscription-details-btn');

await u.po.page.getByRole('button', { name: 'Subscription details' }).click();

await u.po.subscriptionDetails.waitForMounted();
await expect(u.po.page.getByText('Plus')).toBeVisible();
await expect(u.po.page.getByText('Subscription details')).toBeVisible();
await expect(u.po.page.getByText('Current billing cycle')).toBeVisible();
await expect(u.po.page.getByText('Next payment on')).toBeVisible();
await expect(u.po.page.getByText('Next payment amount')).toBeVisible();
});

test('can upgrade to a new plan with saved card', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand Down
11 changes: 8 additions & 3 deletions packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
Col,
descriptors,
Flex,
Flow,
Heading,
localizationKeys,
Span,
Expand All@@ -30,9 +31,13 @@ import {

export const PlanDetails = (props: __internal_PlanDetailsProps) => {
return (
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
<Flow.Root flow='planDetails'>
<Flow.Part>
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
</Flow.Part>
</Flow.Root>
);
};

Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/contexts/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export type FlowMetadata = {
| 'apiKeys'
| 'oauthConsent'
| 'subscriptionDetails'
| 'subscriptionDetails'
| 'taskChooseOrganization';
part?:
| 'start'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { createExpectPageObject } from './expect';
import { createImpersonationPageObject } from './impersonation';
import { createKeylessPopoverPageObject } from './keylessPopover';
import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcher';
import { createPlanDetailsPageObject } from './planDetails';
import { createPricingTablePageObject } from './pricingTable';
import { createSessionTaskComponentPageObject } from './sessionTask';
import { createSignInComponentPageObject } from './signIn';
Expand DownExpand Up@@ -50,5 +51,6 @@ export const createPageObjects = ({
waitlist: createWaitlistComponentPageObject(testArgs),
apiKeys: createAPIKeysComponentPageObject(testArgs),
subscriptionDetails: createSubscriptionDetailsPageObject(testArgs),
planDetails: createPlanDetailsPageObject(testArgs),
};
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import type { EnhancedPage } from './app';
import { common } from './common';

export const createPlanDetailsPageObject = (testArgs: { page: EnhancedPage }) => {
const { page } = testArgs;
const self = {
...common(testArgs),
waitForMounted: (selector = '.cl-planDetails-root') => {
return page.waitForSelector(selector, { state: 'attached' });
},
root: page.locator('.cl-planDetails-root'),
};
return self;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
5 changes: 5 additions & 0 deletions .changeset/legal-ants-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo and tighten wording in changeset entry

Correct “containes” → “contains” and simplify phrasing.

Apply this diff:

-Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.+Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.
Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
🧰 Tools
🪛 LanguageTool

[grammar] ~5-~5: There might be a mistake here.
Context: ... that containes the plan details drawer.

(QB_NEW_EN)

🤖 Prompt for AI Agents
In .changeset/legal-ants-flow.md around line 5, the changeset entry has a typo
and awkward phrasing: replace “containes” with “contains” and simplify the
sentence to read something like: "Add class `cl-planDetails-root` to the parent
div that contains the plan details drawer." Update the line accordingly to fix
the spelling and tighten the wording.

5 changes: 5 additions & 0 deletions .changeset/little-seals-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/testing': patch
---

Add `planDetails` to the page details object.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { SignedIn } from '@clerk/nextjs';
import { CheckoutButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SignedIn>
<CheckoutButton
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'
planPeriod='month'
>
Checkout Now
</CheckoutButton>
</SignedIn>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { PlanDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'>Plan details</PlanDetailsButton>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { SubscriptionDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SubscriptionDetailsButton>Subscription details</SubscriptionDetailsButton>
</main>
);
}
2 changes: 1 addition & 1 deletion integration/templates/next-app-router/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
61 changes: 61 additions & 0 deletions integration/tests/pricing-table.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,29 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible();
});

test('renders pricing details of a specific plan', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/billing/plan-details-btn');

await u.po.page.getByRole('button', { name: 'Plan details' }).click();

await u.po.planDetails.waitForMounted();
const { root } = u.po.planDetails;
await expect(root.getByRole('heading', { name: 'Plus' })).toBeVisible();
await expect(root.getByText('$9.99')).toBeVisible();
await expect(root.getByText('This is the Plus plan!')).toBeVisible();
await expect(root.getByText('Feature One')).toBeVisible();
await expect(root.getByText('First feature')).toBeVisible();
await expect(root.getByText('Feature Two')).toBeVisible();
await expect(root.getByText('Second feature')).toBeVisible();
await expect(root.getByText('Feature Three')).toBeVisible();
await expect(root.getByText('Third feature')).toBeVisible();
});

test('when signed out, clicking subscribe button navigates to sign in page', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/pricing-table');
Expand All@@ -39,6 +62,10 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
});

test('when signed in, clicking get started button opens checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
Expand All@@ -64,6 +91,21 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByText('Checkout')).toBeVisible();
});

test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/checkout-btn');

await u.po.page.getByRole('button', { name: 'Checkout Now' }).click();
await u.po.checkout.waitForMounted();
await u.po.page.getByText(/^Checkout$/).click();
await u.po.checkout.fillTestCard();
});

test('can subscribe to a plan', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand All@@ -86,6 +128,25 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
}
});

test('Displays subscription details drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/subscription-details-btn');

await u.po.page.getByRole('button', { name: 'Subscription details' }).click();

await u.po.subscriptionDetails.waitForMounted();
await expect(u.po.page.getByText('Plus')).toBeVisible();
await expect(u.po.page.getByText('Subscription details')).toBeVisible();
await expect(u.po.page.getByText('Current billing cycle')).toBeVisible();
await expect(u.po.page.getByText('Next payment on')).toBeVisible();
await expect(u.po.page.getByText('Next payment amount')).toBeVisible();
});

test('can upgrade to a new plan with saved card', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand Down
11 changes: 8 additions & 3 deletions packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
Col,
descriptors,
Flex,
Flow,
Heading,
localizationKeys,
Span,
Expand All@@ -30,9 +31,13 @@ import {

export const PlanDetails = (props: __internal_PlanDetailsProps) => {
return (
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
<Flow.Root flow='planDetails'>
<Flow.Part>
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
</Flow.Part>
</Flow.Root>
);
};

Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/contexts/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export type FlowMetadata = {
| 'apiKeys'
| 'oauthConsent'
| 'subscriptionDetails'
| 'subscriptionDetails'
| 'taskChooseOrganization';
part?:
| 'start'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { createExpectPageObject } from './expect';
import { createImpersonationPageObject } from './impersonation';
import { createKeylessPopoverPageObject } from './keylessPopover';
import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcher';
import { createPlanDetailsPageObject } from './planDetails';
import { createPricingTablePageObject } from './pricingTable';
import { createSessionTaskComponentPageObject } from './sessionTask';
import { createSignInComponentPageObject } from './signIn';
Expand DownExpand Up@@ -50,5 +51,6 @@ export const createPageObjects = ({
waitlist: createWaitlistComponentPageObject(testArgs),
apiKeys: createAPIKeysComponentPageObject(testArgs),
subscriptionDetails: createSubscriptionDetailsPageObject(testArgs),
planDetails: createPlanDetailsPageObject(testArgs),
};
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import type { EnhancedPage } from './app';
import { common } from './common';

export const createPlanDetailsPageObject = (testArgs: { page: EnhancedPage }) => {
const { page } = testArgs;
const self = {
...common(testArgs),
waitForMounted: (selector = '.cl-planDetails-root') => {
return page.waitForSelector(selector, { state: 'attached' });
},
root: page.locator('.cl-planDetails-root'),
};
return self;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/legal-ants-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo and tighten wording in changeset entry

Correct “containes” → “contains” and simplify phrasing.

Apply this diff:

-Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.+Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.
Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
🧰 Tools
🪛 LanguageTool

[grammar] ~5-~5: There might be a mistake here.
Context: ... that containes the plan details drawer.

(QB_NEW_EN)

🤖 Prompt for AI Agents
In .changeset/legal-ants-flow.md around line 5, the changeset entry has a typo
and awkward phrasing: replace “containes” with “contains” and simplify the
sentence to read something like: "Add class `cl-planDetails-root` to the parent
div that contains the plan details drawer." Update the line accordingly to fix
the spelling and tighten the wording.

5 changes: 5 additions & 0 deletions .changeset/little-seals-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/testing': patch
---

Add `planDetails` to the page details object.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { SignedIn } from '@clerk/nextjs';
import { CheckoutButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SignedIn>
<CheckoutButton
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'
planPeriod='month'
>
Checkout Now
</CheckoutButton>
</SignedIn>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { PlanDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'>Plan details</PlanDetailsButton>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { SubscriptionDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SubscriptionDetailsButton>Subscription details</SubscriptionDetailsButton>
</main>
);
}
2 changes: 1 addition & 1 deletion integration/templates/next-app-router/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
61 changes: 61 additions & 0 deletions integration/tests/pricing-table.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,29 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible();
});

test('renders pricing details of a specific plan', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/billing/plan-details-btn');

await u.po.page.getByRole('button', { name: 'Plan details' }).click();

await u.po.planDetails.waitForMounted();
const { root } = u.po.planDetails;
await expect(root.getByRole('heading', { name: 'Plus' })).toBeVisible();
await expect(root.getByText('$9.99')).toBeVisible();
await expect(root.getByText('This is the Plus plan!')).toBeVisible();
await expect(root.getByText('Feature One')).toBeVisible();
await expect(root.getByText('First feature')).toBeVisible();
await expect(root.getByText('Feature Two')).toBeVisible();
await expect(root.getByText('Second feature')).toBeVisible();
await expect(root.getByText('Feature Three')).toBeVisible();
await expect(root.getByText('Third feature')).toBeVisible();
});

test('when signed out, clicking subscribe button navigates to sign in page', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/pricing-table');
Expand All@@ -39,6 +62,10 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
});

test('when signed in, clicking get started button opens checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
Expand All@@ -64,6 +91,21 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByText('Checkout')).toBeVisible();
});

test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/checkout-btn');

await u.po.page.getByRole('button', { name: 'Checkout Now' }).click();
await u.po.checkout.waitForMounted();
await u.po.page.getByText(/^Checkout$/).click();
await u.po.checkout.fillTestCard();
});

test('can subscribe to a plan', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand All@@ -86,6 +128,25 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
}
});

test('Displays subscription details drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/subscription-details-btn');

await u.po.page.getByRole('button', { name: 'Subscription details' }).click();

await u.po.subscriptionDetails.waitForMounted();
await expect(u.po.page.getByText('Plus')).toBeVisible();
await expect(u.po.page.getByText('Subscription details')).toBeVisible();
await expect(u.po.page.getByText('Current billing cycle')).toBeVisible();
await expect(u.po.page.getByText('Next payment on')).toBeVisible();
await expect(u.po.page.getByText('Next payment amount')).toBeVisible();
});

test('can upgrade to a new plan with saved card', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand Down
11 changes: 8 additions & 3 deletions packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
Col,
descriptors,
Flex,
Flow,
Heading,
localizationKeys,
Span,
Expand All@@ -30,9 +31,13 @@ import {

export const PlanDetails = (props: __internal_PlanDetailsProps) => {
return (
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
<Flow.Root flow='planDetails'>
<Flow.Part>
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
</Flow.Part>
</Flow.Root>
);
};

Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/contexts/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export type FlowMetadata = {
| 'apiKeys'
| 'oauthConsent'
| 'subscriptionDetails'
| 'subscriptionDetails'
| 'taskChooseOrganization';
part?:
| 'start'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { createExpectPageObject } from './expect';
import { createImpersonationPageObject } from './impersonation';
import { createKeylessPopoverPageObject } from './keylessPopover';
import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcher';
import { createPlanDetailsPageObject } from './planDetails';
import { createPricingTablePageObject } from './pricingTable';
import { createSessionTaskComponentPageObject } from './sessionTask';
import { createSignInComponentPageObject } from './signIn';
Expand DownExpand Up@@ -50,5 +51,6 @@ export const createPageObjects = ({
waitlist: createWaitlistComponentPageObject(testArgs),
apiKeys: createAPIKeysComponentPageObject(testArgs),
subscriptionDetails: createSubscriptionDetailsPageObject(testArgs),
planDetails: createPlanDetailsPageObject(testArgs),
};
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import type { EnhancedPage } from './app';
import { common } from './common';

export const createPlanDetailsPageObject = (testArgs: { page: EnhancedPage }) => {
const { page } = testArgs;
const self = {
...common(testArgs),
waitForMounted: (selector = '.cl-planDetails-root') => {
return page.waitForSelector(selector, { state: 'attached' });
},
root: page.locator('.cl-planDetails-root'),
};
return self;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/legal-ants-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo and tighten wording in changeset entry

Correct “containes” → “contains” and simplify phrasing.

Apply this diff:

-Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.+Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.
Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
🧰 Tools
🪛 LanguageTool

[grammar] ~5-~5: There might be a mistake here.
Context: ... that containes the plan details drawer.

(QB_NEW_EN)

🤖 Prompt for AI Agents
In .changeset/legal-ants-flow.md around line 5, the changeset entry has a typo
and awkward phrasing: replace “containes” with “contains” and simplify the
sentence to read something like: "Add class `cl-planDetails-root` to the parent
div that contains the plan details drawer." Update the line accordingly to fix
the spelling and tighten the wording.

5 changes: 5 additions & 0 deletions .changeset/little-seals-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/testing': patch
---

Add `planDetails` to the page details object.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { SignedIn } from '@clerk/nextjs';
import { CheckoutButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SignedIn>
<CheckoutButton
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'
planPeriod='month'
>
Checkout Now
</CheckoutButton>
</SignedIn>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { PlanDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'>Plan details</PlanDetailsButton>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { SubscriptionDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SubscriptionDetailsButton>Subscription details</SubscriptionDetailsButton>
</main>
);
}
2 changes: 1 addition & 1 deletion integration/templates/next-app-router/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
61 changes: 61 additions & 0 deletions integration/tests/pricing-table.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,29 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible();
});

test('renders pricing details of a specific plan', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/billing/plan-details-btn');

await u.po.page.getByRole('button', { name: 'Plan details' }).click();

await u.po.planDetails.waitForMounted();
const { root } = u.po.planDetails;
await expect(root.getByRole('heading', { name: 'Plus' })).toBeVisible();
await expect(root.getByText('$9.99')).toBeVisible();
await expect(root.getByText('This is the Plus plan!')).toBeVisible();
await expect(root.getByText('Feature One')).toBeVisible();
await expect(root.getByText('First feature')).toBeVisible();
await expect(root.getByText('Feature Two')).toBeVisible();
await expect(root.getByText('Second feature')).toBeVisible();
await expect(root.getByText('Feature Three')).toBeVisible();
await expect(root.getByText('Third feature')).toBeVisible();
});

test('when signed out, clicking subscribe button navigates to sign in page', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/pricing-table');
Expand All@@ -39,6 +62,10 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
});

test('when signed in, clicking get started button opens checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
Expand All@@ -64,6 +91,21 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByText('Checkout')).toBeVisible();
});

test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/checkout-btn');

await u.po.page.getByRole('button', { name: 'Checkout Now' }).click();
await u.po.checkout.waitForMounted();
await u.po.page.getByText(/^Checkout$/).click();
await u.po.checkout.fillTestCard();
});

test('can subscribe to a plan', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand All@@ -86,6 +128,25 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
}
});

test('Displays subscription details drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/subscription-details-btn');

await u.po.page.getByRole('button', { name: 'Subscription details' }).click();

await u.po.subscriptionDetails.waitForMounted();
await expect(u.po.page.getByText('Plus')).toBeVisible();
await expect(u.po.page.getByText('Subscription details')).toBeVisible();
await expect(u.po.page.getByText('Current billing cycle')).toBeVisible();
await expect(u.po.page.getByText('Next payment on')).toBeVisible();
await expect(u.po.page.getByText('Next payment amount')).toBeVisible();
});

test('can upgrade to a new plan with saved card', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand Down
11 changes: 8 additions & 3 deletions packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
Col,
descriptors,
Flex,
Flow,
Heading,
localizationKeys,
Span,
Expand All@@ -30,9 +31,13 @@ import {

export const PlanDetails = (props: __internal_PlanDetailsProps) => {
return (
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
<Flow.Root flow='planDetails'>
<Flow.Part>
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
</Flow.Part>
</Flow.Root>
);
};

Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/contexts/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export type FlowMetadata = {
| 'apiKeys'
| 'oauthConsent'
| 'subscriptionDetails'
| 'subscriptionDetails'
| 'taskChooseOrganization';
part?:
| 'start'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { createExpectPageObject } from './expect';
import { createImpersonationPageObject } from './impersonation';
import { createKeylessPopoverPageObject } from './keylessPopover';
import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcher';
import { createPlanDetailsPageObject } from './planDetails';
import { createPricingTablePageObject } from './pricingTable';
import { createSessionTaskComponentPageObject } from './sessionTask';
import { createSignInComponentPageObject } from './signIn';
Expand DownExpand Up@@ -50,5 +51,6 @@ export const createPageObjects = ({
waitlist: createWaitlistComponentPageObject(testArgs),
apiKeys: createAPIKeysComponentPageObject(testArgs),
subscriptionDetails: createSubscriptionDetailsPageObject(testArgs),
planDetails: createPlanDetailsPageObject(testArgs),
};
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import type { EnhancedPage } from './app';
import { common } from './common';

export const createPlanDetailsPageObject = (testArgs: { page: EnhancedPage }) => {
const { page } = testArgs;
const self = {
...common(testArgs),
waitForMounted: (selector = '.cl-planDetails-root') => {
return page.waitForSelector(selector, { state: 'attached' });
},
root: page.locator('.cl-planDetails-root'),
};
return self;
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
5 changes: 5 additions & 0 deletions .changeset/legal-ants-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo and tighten wording in changeset entry

Correct “containes” → “contains” and simplify phrasing.

Apply this diff:

-Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.+Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Add class `cl-planDetails-root` to the parent div element that containes the plan details drawer.
Add CSS class `cl-planDetails-root` to the parent div that contains the plan details drawer.
🧰 Tools
🪛 LanguageTool

[grammar] ~5-~5: There might be a mistake here.
Context: ... that containes the plan details drawer.

(QB_NEW_EN)

🤖 Prompt for AI Agents
In .changeset/legal-ants-flow.md around line 5, the changeset entry has a typo
and awkward phrasing: replace “containes” with “contains” and simplify the
sentence to read something like: "Add class `cl-planDetails-root` to the parent
div that contains the plan details drawer." Update the line accordingly to fix
the spelling and tighten the wording.

5 changes: 5 additions & 0 deletions .changeset/little-seals-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/testing': patch
---

Add `planDetails` to the page details object.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { SignedIn } from '@clerk/nextjs';
import { CheckoutButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SignedIn>
<CheckoutButton
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'
planPeriod='month'
>
Checkout Now
</CheckoutButton>
</SignedIn>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { PlanDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'>Plan details</PlanDetailsButton>
</main>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import { SubscriptionDetailsButton } from '@clerk/nextjs/experimental';

export default function Home() {
return (
<main>
<SubscriptionDetailsButton>Subscription details</SubscriptionDetailsButton>
</main>
);
}
2 changes: 1 addition & 1 deletion integration/templates/next-app-router/tsconfig.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
Expand Down
61 changes: 61 additions & 0 deletions integration/tests/pricing-table.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,29 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByRole('heading', { name: 'Pro' })).toBeVisible();
});

test('renders pricing details of a specific plan', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/billing/plan-details-btn');

await u.po.page.getByRole('button', { name: 'Plan details' }).click();

await u.po.planDetails.waitForMounted();
const { root } = u.po.planDetails;
await expect(root.getByRole('heading', { name: 'Plus' })).toBeVisible();
await expect(root.getByText('$9.99')).toBeVisible();
await expect(root.getByText('This is the Plus plan!')).toBeVisible();
await expect(root.getByText('Feature One')).toBeVisible();
await expect(root.getByText('First feature')).toBeVisible();
await expect(root.getByText('Feature Two')).toBeVisible();
await expect(root.getByText('Second feature')).toBeVisible();
await expect(root.getByText('Feature Three')).toBeVisible();
await expect(root.getByText('Third feature')).toBeVisible();
});

test('when signed out, clicking subscribe button navigates to sign in page', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.page.goToRelative('/pricing-table');
Expand All@@ -39,6 +62,10 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
});

test('when signed in, clicking get started button opens checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}

const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
Expand All@@ -64,6 +91,21 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
await expect(u.po.page.getByText('Checkout')).toBeVisible();
});

test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/checkout-btn');

await u.po.page.getByRole('button', { name: 'Checkout Now' }).click();
await u.po.checkout.waitForMounted();
await u.po.page.getByText(/^Checkout$/).click();
await u.po.checkout.fillTestCard();
});

test('can subscribe to a plan', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand All@@ -86,6 +128,25 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
}
});

test('Displays subscription details drawer', async ({ page, context }) => {
if (!app.name.includes('next')) {
return;
}
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.page.goToRelative('/billing/subscription-details-btn');

await u.po.page.getByRole('button', { name: 'Subscription details' }).click();

await u.po.subscriptionDetails.waitForMounted();
await expect(u.po.page.getByText('Plus')).toBeVisible();
await expect(u.po.page.getByText('Subscription details')).toBeVisible();
await expect(u.po.page.getByText('Current billing cycle')).toBeVisible();
await expect(u.po.page.getByText('Next payment on')).toBeVisible();
await expect(u.po.page.getByText('Next payment amount')).toBeVisible();
});

test('can upgrade to a new plan with saved card', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.po.signIn.goTo();
Expand Down
11 changes: 8 additions & 3 deletions packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
Col,
descriptors,
Flex,
Flow,
Heading,
localizationKeys,
Span,
Expand All@@ -30,9 +31,13 @@ import {

export const PlanDetails = (props: __internal_PlanDetailsProps) => {
return (
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
<Flow.Root flow='planDetails'>
<Flow.Part>
<Drawer.Content>
<PlanDetailsInternal {...props} />
</Drawer.Content>
</Flow.Part>
</Flow.Root>
);
};

Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/contexts/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export type FlowMetadata = {
| 'apiKeys'
| 'oauthConsent'
| 'subscriptionDetails'
| 'subscriptionDetails'
| 'taskChooseOrganization';
part?:
| 'start'
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { createExpectPageObject } from './expect';
import { createImpersonationPageObject } from './impersonation';
import { createKeylessPopoverPageObject } from './keylessPopover';
import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcher';
import { createPlanDetailsPageObject } from './planDetails';
import { createPricingTablePageObject } from './pricingTable';
import { createSessionTaskComponentPageObject } from './sessionTask';
import { createSignInComponentPageObject } from './signIn';
Expand DownExpand Up@@ -50,5 +51,6 @@ export const createPageObjects = ({
waitlist: createWaitlistComponentPageObject(testArgs),
apiKeys: createAPIKeysComponentPageObject(testArgs),
subscriptionDetails: createSubscriptionDetailsPageObject(testArgs),
planDetails: createPlanDetailsPageObject(testArgs),
};
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import type { EnhancedPage } from './app';
import { common } from './common';

export const createPlanDetailsPageObject = (testArgs: { page: EnhancedPage }) => {
const { page } = testArgs;
const self = {
...common(testArgs),
waitForMounted: (selector = '.cl-planDetails-root') => {
return page.waitForSelector(selector, { state: 'attached' });
},
root: page.locator('.cl-planDetails-root'),
};
return self;
};