Skip to content

test(site): refactor e2e tests for deployment/licenses #12926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2024
Merged

test(site): refactor e2e tests for deployment/licenses #12926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions site/e2e/tests/deployment/licenses.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { expect, test } from "@playwright/test";
import { requiresEnterpriseLicense } from "../../helpers";

test("license was added successfully", async ({ page }) => {
requiresEnterpriseLicense();

await page.goto("/deployment/licenses", { waitUntil: "domcontentloaded" });
const firstLicense = page.locator(".licenses > .license-card", {
hasText: "#1",
});
await expect(firstLicense).toBeVisible();

// Trial vs. Enterprise?
const accountType = firstLicense.locator(".account-type");
await expect(accountType).toHaveText("Enterprise");

// User limit 1/1
const userLimit = firstLicense.locator(".user-limit");
await expect(userLimit).toHaveText("1 / 1");

// License should not be expired yet
const licenseExpires = firstLicense.locator(".license-expires");
const licenseExpiresDate = new Date(await licenseExpires.innerText());
const now = new Date();
expect(licenseExpiresDate.getTime()).toBeGreaterThan(now.getTime());

// "Remove" button should be visible
const removeButton = firstLicense.locator(".remove-button");
await expect(removeButton).toBeVisible();
});
10 changes: 0 additions & 10 deletions site/e2e/tests/enterprise.spec.ts
View file
Open in desktop

This file was deleted.

14 changes: 10 additions & 4 deletions site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ export const LicenseCard: FC<LicenseCardProps> = ({
license.claims.features["user_limit"] || userLimitLimit;

return (
<Paper key={license.id} elevation={2} css={styles.licenseCard}>
<Paper
key={license.id}
elevation={2}
css={styles.licenseCard}
className="license-card"
>
<ConfirmDialog
type="delete"
hideCancel={false}
Expand All @@ -58,7 +63,7 @@ export const LicenseCard: FC<LicenseCardProps> = ({
alignItems="center"
>
<span css={styles.licenseId}>#{license.id}</span>
<span css={styles.accountType}>
<span css={styles.accountType} className="account-type">
{license.claims.trial ? "Trial" : "Enterprise"}
</span>
<Stack
Expand All @@ -72,7 +77,7 @@ export const LicenseCard: FC<LicenseCardProps> = ({
>
<Stack direction="column" spacing={0} alignItems="center">
<span css={styles.secondaryMaincolor}>Users</span>
<span css={styles.userLimit}>
<span css={styles.userLimit} className="user-limit">
{userLimitActual} {` / ${currentUserLimit || "Unlimited"}`}
</span>
</Stack>
Expand All @@ -92,7 +97,7 @@ export const LicenseCard: FC<LicenseCardProps> = ({
) : (
<span css={styles.secondaryMaincolor}>Valid Until</span>
)}
<span css={styles.licenseExpires}>
<span css={styles.licenseExpires} className="license-expires">
{dayjs
.unix(license.claims.license_expires)
.format("MMMM D, YYYY")}
Expand All @@ -104,6 +109,7 @@ export const LicenseCard: FC<LicenseCardProps> = ({
variant="contained"
size="small"
onClick={() => setLicenseIDMarkedForRemoval(license.id)}
className="remove-button"
>
Remove&hellip;
</Button>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const LicensesSettingsPageView: FC<Props> = ({
{isLoading && <Skeleton variant="rectangular" height={200} />}

{!isLoading && licenses && licenses?.length > 0 && (
<Stack spacing={4}>
<Stack spacing={4} className="licenses">
{licenses
?.sort(
(a, b) =>
Expand Down
Loading