Skip to content
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.

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

feat: dsw-2308-radio-styles integration #215

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nextjs-app-v13/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@justeattakeaway/pie-cookie-banner": "0.26.5",
"@justeattakeaway/pie-css": "0.13.0",
"@justeattakeaway/pie-icons-webc": "0.25.1",
"@justeattakeaway/pie-webc": "0.5.37",
"@justeattakeaway/pie-webc": "0.5.42",
"@lit-labs/nextjs": "0.1.4",
"@lit/react": "1.0.2",
"next": "13.5.6",
Expand Down
4 changes: 2 additions & 2 deletions nextjs-app-v13/src/pages/integrations/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ export default function Form() {
</PieCheckboxGroup>

<fieldset>
<PieRadio value="radio-1" name="radio-group" onInput={handleRadioInput as any}>Radio 1</PieRadio>
<PieRadio value="radio-2" name="radio-group" onInput={handleRadioInput as any}>Radio 2</PieRadio>
<PieRadio value="radio-1" name="radioValue" onInput={handleRadioInput as any}>Radio 1</PieRadio>
<PieRadio data-test-id="radio-2" value="radio-2" name="radioValue" onInput={handleRadioInput as any}>Radio 2</PieRadio>
</fieldset>
</div>
<div className="form-btns">
Expand Down
1 change: 1 addition & 0 deletions nextjs-app-v13/test/visual/nextjs.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ describe('NextJS Aperture App', () => {
{ url: '/components/lottie-player.html', name: 'Lottie Player', pauseBeforeScreenshot: true },
{ url: '/components/modal.html', name: 'Modal' },
{ url: '/components/notification.html', name: 'Notification' },
{ url: '/components/radio.html', name: 'Radio' },
{ url: '/components/spinner.html', name: 'Spinner' },
{ url: '/components/switch.html', name: 'Switch' },
{ url: '/components/tag.html', name: 'Tag' },
Expand Down
2 changes: 1 addition & 1 deletion nextjs-app-v14/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@justeattakeaway/pie-cookie-banner": "0.26.5",
"@justeattakeaway/pie-css": "0.13.0",
"@justeattakeaway/pie-icons-webc": "0.25.1",
"@justeattakeaway/pie-webc": "0.5.37",
"@justeattakeaway/pie-webc": "0.5.42",
"@lit-labs/nextjs": "0.2.0",
"@lit/react": "1.0.5",
"next": "14.2.3",
Expand Down
4 changes: 2 additions & 2 deletions nextjs-app-v14/src/app/integrations/form/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ export default function Form() {
</PieCheckboxGroup>

<fieldset>
<PieRadio value="radio-1" name="radio-group" onInput={handleRadioInput as any}>Radio 1</PieRadio>
<PieRadio value="radio-2" name="radio-group" onInput={handleRadioInput as any}>Radio 2</PieRadio>
<PieRadio value="radio-1" name="radioValue" onInput={handleRadioInput as any}>Radio 1</PieRadio>
<PieRadio data-test-id="radio-2" value="radio-2" name="radioValue" onInput={handleRadioInput as any}>Radio 2</PieRadio>
</fieldset>
</div>
<div className='form-btns'>
Expand Down
1 change: 1 addition & 0 deletions nextjs-app-v14/test/visual/nextjs.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ describe('NextJS Aperture App', () => {
{ url: '/components/lottie-player', name: 'Lottie Player', pauseBeforeScreenshot: true },
{ url: '/components/modal', name: 'Modal' },
{ url: '/components/notification', name: 'Notification' },
{ url: '/components/radio', name: 'Radio' },
{ url: '/components/spinner', name: 'Spinner' },
{ url: '/components/switch', name: 'Switch' },
{ url: '/components/tag', name: 'Tag' },
Expand Down
2 changes: 1 addition & 1 deletion nuxt-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@justeattakeaway/pie-cookie-banner": "0.26.5",
"@justeattakeaway/pie-css": "0.13.0",
"@justeattakeaway/pie-icons-webc": "0.25.1",
"@justeattakeaway/pie-webc": "0.5.37",
"@justeattakeaway/pie-webc": "0.5.42",
"just-kebab-case": "4.2.0",
"nuxt-ssr-lit": "1.6.16"
},
Expand Down
7 changes: 4 additions & 3 deletions nuxt-app/pages/integrations/form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,14 @@
<fieldset>
<pie-radio
value="radio-1"
name="radio-group"
name="radioValue"
@change="radio = $event.target.value">
Radio 1
</pie-radio>
<pie-radio
data-test-id="radio-2"
value="radio-2"
name="radio-group"
name="radioValue"
@change="radio = $event.target.value">
Radio 2
</pie-radio>
Expand Down Expand Up @@ -238,7 +239,7 @@ function handleSubmit() {
email: email.value,
tel: tel.value,
url: url.value,
radio: radio.value,
radioValue: radio.value,
password: password.value,
approveSettings: approveSettings.value,
enableNotifications: notifications.value,
Expand Down
1 change: 1 addition & 0 deletions nuxt-app/test/visual/nuxt.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ describe('Nuxt Aperture App', () => {
{ url: '/components/lottie-player.html', name: 'Lottie Player', pauseBeforeScreenshot: true },
{ url: '/components/modal.html', name: 'Modal' },
{ url: '/components/notification.html', name: 'Notification' },
{ url: '/components/radio.html', name: 'Radio' },
{ url: '/components/spinner.html', name: 'Spinner' },
{ url: '/components/switch.html', name: 'Switch' },
{ url: '/components/tag.html', name: 'Tag' },
Expand Down
46 changes: 25 additions & 21 deletions test/playwright/page-objects/form.page.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
import { type Locator, type Page } from '@playwright/test';
const { APP_NAME } = process.env;

export type TestFormData = {
username: string;
favouriteNumber: string;
email: string;
url: string;
tel: string;
password: string;
radioValue: string;
approveSettings: boolean;
enableNotifications: boolean;
newsletterSignup: boolean;
description: string;
contactByEmail: boolean;
contactByPhone: boolean;
};

export class FormPage {
readonly page: Page;
readonly usernameField: Locator;
Expand All @@ -18,6 +34,7 @@ export class FormPage {
readonly newsletterSignupCheckbox: Locator;
readonly contactByEmailCheckbox: Locator;
readonly contactByPhoneCheckbox: Locator;
readonly radioButton2: Locator;

constructor(page: Page) {
this.page = page;
Expand All @@ -33,6 +50,7 @@ export class FormPage {
this.newsletterSignupCheckbox = page.getByTestId('newsletterSignup').getByTestId('checkbox-component');
this.contactByEmailCheckbox = page.getByTestId('contactByEmail').getByTestId('checkbox-component');
this.contactByPhoneCheckbox = page.getByTestId('contactByPhone').getByTestId('checkbox-component');
this.radioButton2 = page.getByTestId('radio-2').getByTestId('pie-radio');
this.resetBtn = page.getByTestId('reset-btn');
this.submitBtn = page.getByTestId('submit-btn');

Expand All @@ -45,34 +63,20 @@ export class FormPage {
await this.page.goto(formattedUrl);
}

async fillForm(formData: any) {
async fillForm(formData: TestFormData) {
await this.usernameField.locator('input').fill(formData.username);
await this.favouriteNumberField.locator('input').fill(formData.favouriteNumber);
await this.emailField.locator('input').fill(formData.email);
await this.urlField.locator('input').fill(formData.url);
await this.telField.locator('input').fill(formData.tel);
await this.passwordField.locator('input').fill(formData.password);
await this.descriptionField.locator('textarea').fill(formData.description);

if (formData.approveSettings) {
await this.approveSettingsSwitch.click();
}

if (formData.enableNotifications) {
await this.enableNotificationsSwitch.click();
}

if (formData.newsletterSignup) {
await this.newsletterSignupCheckbox.click();
}

if (formData.contactByEmail) {
await this.contactByEmailCheckbox.click();
}

if (formData.contactByPhone) {
await this.contactByPhoneCheckbox.click();
}
await this.approveSettingsSwitch.click();
await this.enableNotificationsSwitch.click();
await this.newsletterSignupCheckbox.click();
await this.contactByEmailCheckbox.click();
await this.contactByPhoneCheckbox.click();
await this.radioButton2.click();
}

async submitForm() {
Expand Down
6 changes: 3 additions & 3 deletions test/system/form.spec.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { test, expect } from '@playwright/test';
import { FormPage } from '../playwright/page-objects/form.page';
import { FormPage, type TestFormData } from '../playwright/page-objects/form.page';

test.describe(`Form Page - ${process.env.APP_NAME}`, () => {
test('should submit the correct form data', async ({ page }) => {
// Arrange
const expectFormData = {
const expectFormData: TestFormData = {
username: 'John Doe',
favouriteNumber: '42',
email: 'foo@bar.com',
url: 'https://example.com',
tel: '1234567890',
password: 'foo',
radioValue: '',
radioValue: 'radio-2',
approveSettings: true,
enableNotifications: true,
newsletterSignup: true,
Expand Down
4 changes: 2 additions & 2 deletions vanilla-app/integrations/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ <h1>Vanilla - PIE Form Test Page</h1>
</pie-checkbox-group>

<fieldset>
<pie-radio name="radio-group" value="radio-1">Radio option 1</pie-radio>
<pie-radio name="radio-group" value="radio-2">Radio option 2</pie-radio>
<pie-radio name="radioValue" value="radio-1">Radio option 1</pie-radio>
<pie-radio data-test-id="radio-2" name="radioValue" value="radio-2">Radio option 2</pie-radio>
</fieldset>
</div>
<div class="form-btns">
Expand Down
2 changes: 1 addition & 1 deletion vanilla-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@justeattakeaway/pie-cookie-banner": "0.26.5",
"@justeattakeaway/pie-css": "0.13.0",
"@justeattakeaway/pie-icons-webc": "0.25.1",
"@justeattakeaway/pie-webc": "0.5.37"
"@justeattakeaway/pie-webc": "0.5.42"
},
"installConfig": {
"hoistingLimits": "workspaces"
Expand Down
1 change: 1 addition & 0 deletions vanilla-app/test/visual/vanilla.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ describe('Vanilla Aperture App', () => {
{ url: '/components/lottie-player.html', name: 'Lottie Player', pauseBeforeScreenshot: true },
{ url: '/components/modal.html', name: 'Modal' },
{ url: '/components/notification.html', name: 'Notification' },
{ url: '/components/radio.html', name: 'Radio' },
{ url: '/components/spinner.html', name: 'Spinner' },
{ url: '/components/switch.html', name: 'Switch' },
{ url: '/components/tag.html', name: 'Tag' },
Expand Down
Loading
Loading