Merge 626c15d into 8f6af53

Author: noisysocks

special-pages/pages/onboarding/integration-tests/onboarding.js

@@ -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
     }
 
@@ -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 */
@@ -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 */

special-pages/pages/onboarding/integration-tests/onboarding.spec.js

@@ -37,7 +37,7 @@ test.describe('onboarding', () => {
             onboarding.withInitData({
                 stepDefinitions: {
                     systemSettings: {
-                        rows: ['dock', 'ad-blocking', 'import'],
+                        rows: ['dock', 'import', 'ad-blocking'],
                     },
                 },
                 order: 'v3',
@@ -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) => {
@@ -269,7 +273,7 @@ test.describe('onboarding', () => {
             onboarding.withInitData({
                 stepDefinitions: {
                     systemSettings: {
-                        rows: ['dock', 'ad-blocking', 'import'],
+                        rows: ['dock', 'import', 'ad-blocking'],
                     },
                 },
                 order: 'v3',
@@ -284,7 +288,7 @@ test.describe('onboarding', () => {
             onboarding.withInitData({
                 stepDefinitions: {
                     systemSettings: {
-                        rows: ['dock', 'ad-blocking', 'import'],
+                        rows: ['dock', 'import', 'ad-blocking'],
                     },
                 },
                 order: 'v3',
@@ -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',
@@ -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',

special-pages/pages/onboarding/src/mock-transport.js

@@ -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'],
                         };
                     }