Skip to content

Onboarding: Move ad blocking setting row to the last position #1687

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
May 14, 2025
Merged

Onboarding: Move ad blocking setting row to the last position #1687

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
8 changes: 4 additions & 4 deletions special-pages/pages/onboarding/integration-tests/onboarding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,14 +482,14 @@ export class OnboardingPage {
async skipAdBlocking() {
const { page } = this;
await this.skippedCurrent();
await page.getByRole('button', { name: 'Import' }).waitFor();
await page.getByRole('button', { name: 'Next' }).waitFor();
await this.didSetAdBlocking({ enabled: false }); // important that setAdBlocking() is called when skipped so that native apps can fire a pixel
}

async skipYouTubeAdBlocking() {
const { page } = this;
await this.skippedCurrent();
await page.getByRole('button', { name: 'Import' }).waitFor();
await page.getByRole('button', { name: 'Next' }).waitFor();
await this.didSetAdBlocking({ enabled: false }); // important that setAdBlocking() is called when skipped so that native apps can fire a pixel
}

Expand Down Expand Up @@ -733,13 +733,13 @@ export class OnboardingPage {
apple: () => page.getByRole('button', { name: 'Keep in Dock' }),
});
await dockButton.click();
await page.getByRole('button', { name: 'Import Now', exact: true }).click();
await page
.getByRole('button', {
name: adBlockingId === 'youtube-ad-blocking' ? 'Block Ads' : 'Turn on Enhanced Ad Blocking',
exact: true,
})
.click();
await page.getByRole('button', { name: 'Import Now', exact: true }).click();
await page.getByRole('button', { name: 'Next' }).click();

/* No Duck Player step as ad blocking was enabled */
Expand Down Expand Up @@ -775,8 +775,8 @@ export class OnboardingPage {
apple: () => page.getByRole('button', { name: 'Keep in Dock' }),
});
await dockButton.click();
await page.getByRole('button', { name: 'Skip', exact: true }).click();
await page.getByRole('button', { name: 'Import Now', exact: true }).click();
await page.getByRole('button', { name: 'Skip', exact: true }).click();
await page.getByRole('button', { name: 'Next' }).click();

/* Duck Player */
Expand Down
22 changes: 13 additions & 9 deletions special-pages/pages/onboarding/integration-tests/onboarding.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ test.describe('onboarding', () => {
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'ad-blocking', 'import'],
rows: ['dock', 'import', 'ad-blocking'],
},
},
order: 'v3',
Expand Down Expand Up @@ -89,59 +89,63 @@ test.describe('onboarding', () => {
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'ad-blocking', 'import'],
rows: ['dock', 'import', 'ad-blocking'],
},
},
order: 'v3',
});
await onboarding.reducedMotion();
await onboarding.openPage({ env: 'app', page: 'systemSettings' });
await onboarding.skippedCurrent();
await onboarding.skippedCurrent();
await onboarding.enableEnhancedAdBlocking();
});
test('Then I can skip enhanced ad blocking', async ({ page }, workerInfo) => {
const onboarding = OnboardingPage.create(page, workerInfo);
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'ad-blocking', 'import'],
rows: ['dock', 'import', 'ad-blocking'],
},
},
order: 'v3',
});
await onboarding.reducedMotion();
await onboarding.openPage({ env: 'app', page: 'systemSettings' });
await onboarding.skippedCurrent();
await onboarding.skippedCurrent();
await onboarding.skipAdBlocking();
});
test('Then I can turn on YouTube ad blocking', async ({ page }, workerInfo) => {
const onboarding = OnboardingPage.create(page, workerInfo);
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'youtube-ad-blocking', 'import'],
rows: ['dock', 'import', 'youtube-ad-blocking'],
},
},
order: 'v3',
});
await onboarding.reducedMotion();
await onboarding.openPage({ env: 'app', page: 'systemSettings' });
await onboarding.skippedCurrent();
await onboarding.skippedCurrent();
await onboarding.enableYouTubeAdBlocking();
});
test('Then I can skip YouTube ad blocking', async ({ page }, workerInfo) => {
const onboarding = OnboardingPage.create(page, workerInfo);
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'youtube-ad-blocking', 'import'],
rows: ['dock', 'import', 'youtube-ad-blocking'],
},
},
order: 'v3',
});
await onboarding.reducedMotion();
await onboarding.openPage({ env: 'app', page: 'systemSettings' });
await onboarding.skippedCurrent();
await onboarding.skippedCurrent();
await onboarding.skipYouTubeAdBlocking();
});
test('Then I can skip all', async ({ page }, workerInfo) => {
Expand Down Expand Up @@ -269,7 +273,7 @@ test.describe('onboarding', () => {
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'ad-blocking', 'import'],
rows: ['dock', 'import', 'ad-blocking'],
},
},
order: 'v3',
Expand All @@ -284,7 +288,7 @@ test.describe('onboarding', () => {
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'ad-blocking', 'import'],
rows: ['dock', 'import', 'ad-blocking'],
},
},
order: 'v3',
Expand All @@ -299,7 +303,7 @@ test.describe('onboarding', () => {
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'youtube-ad-blocking', 'import'],
rows: ['dock', 'import', 'youtube-ad-blocking'],
},
},
order: 'v3',
Expand All @@ -314,7 +318,7 @@ test.describe('onboarding', () => {
onboarding.withInitData({
stepDefinitions: {
systemSettings: {
rows: ['dock', 'youtube-ad-blocking', 'import'],
rows: ['dock', 'import', 'youtube-ad-blocking'],
},
},
order: 'v3',
Expand Down
2 changes: 1 addition & 1 deletion special-pages/pages/onboarding/src/mock-transport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function mockTransport() {
stepDefinitions.systemSettings = {
id: 'systemSettings',
kind: 'settings',
rows: ['dock', adBlocking === 'youtube' ? 'youtube-ad-blocking' : 'ad-blocking', 'import'],
rows: ['dock', 'import', adBlocking === 'youtube' ? 'youtube-ad-blocking' : 'ad-blocking'],
};
}

Expand Down
Loading