Copy review feedback

duckduckgo · Nov 22, 2024 · 4d1bdee · 4d1bdee
1 parent 6586630
commit 4d1bdee
Show file tree

Hide file tree

Showing 19 changed files with 248 additions and 139 deletions.
diff --git a/guides/toggle-report.md b/guides/toggle-report.md
@@ -51,11 +51,12 @@ The following are all sent in response to user interactions
 | ------------------- | ------------------------------------------------------------------------------------------------------------------ |
 | appVersion          | App version number                                                                                                 |
 | atb                 | Anonymous experiment group for feature testing                                                                     |
+| description         | Your selected category and optional comments                                                                       |
 | device              | Device make, model, and manufacturer                                                                               |
 | didOpenReportInfo   | Whether or not you opted to show this report info                                                                  |
 | errorDescriptions   | Browser-reported errors                                                                                            |
 | extensionVersion    | Extension version number                                                                                           |
-| features            | List of which protections and browser features were active                                                         |
+| features            | List of which browser features were active                                                                         |
 | httpErrorCodes      | Website response status (HTTP) codes                                                                               |
 | jsPerformance       | How quickly parts of the page loaded                                                                               |
 | lastSentDay         | Date of last report sent for this site                                                                             |

diff --git a/integration-tests/DashboardPage.js b/integration-tests/DashboardPage.js
@@ -426,8 +426,21 @@ export class DashboardPage {
         await this.page.getByLabel('Something else').waitFor();
     }
 
-    async breakageFormIsVisible() {
-        await this.page.getByRole('button', { name: 'Send Report' }).waitFor();
+    async breakageFormIsVisible(categoryText) {
+        const formView = this.page.getByTestId('subview-breakageFormFinalStep');
+
+        await formView.getByRole('button', { name: 'Send Report' }).waitFor();
+        if (categoryText) {
+            await formView.getByText(categoryText).waitFor();
+        }
+    }
+
+    async descriptionPromptIsVisible() {
+        await this.page.getByText('What happened?').waitFor();
+    }
+
+    async descriptionPromptIsNotVisible() {
+        await expect(this.page.getByText('What happened?')).not.toBeVisible();
     }
 
     /**

diff --git a/integration-tests/android.spec-int.js b/integration-tests/android.spec-int.js
@@ -91,11 +91,26 @@ test.describe('breakage form', () => {
         await dash.screenshot('category-selection.png');
         await dash.selectsCategory('Site layout broken', 'layout');
         await dash.breakageFormIsVisible();
+        await dash.descriptionPromptIsVisible();
         await dash.screenshot('screen-breakage-form.png');
         await dash.submitFeedbackForm();
         await dash.mocks.calledForSubmitBreakageForm({ category: 'layout', description: '' });
     });
 
+    test('hides description prompt on "dislike" category', { tag: '@screenshots' }, async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.webkit(page, {
+            screen: 'breakageForm',
+            randomisedCategories: 'false',
+            platform: 'macos',
+        });
+        await dash.addState([testDataStates.google]);
+        await dash.selectsCategoryType('I dislike the content on this site', 'dislike');
+        await dash.breakageFormIsVisible('I dislike the content');
+        await dash.descriptionPromptIsNotVisible();
+        await dash.screenshot('category-type-dislike.png');
+    });
+
     test('skips to breakage form when disliked', async ({ page }) => {
         /** @type {DashboardPage} */
         const dash = await DashboardPage.android(page, { screen: 'breakageForm' });

diff --git a/integration-tests/browser.spec-int.js b/integration-tests/browser.spec-int.js
@@ -30,11 +30,26 @@ test.describe('breakage form', () => {
         await dash.screenshot('category-selection.png');
         await dash.selectsCategory('Site layout broken', 'layout');
         await dash.breakageFormIsVisible();
+        await dash.descriptionPromptIsVisible();
         await dash.screenshot('screen-breakage-form.png');
         await dash.submitFeedbackForm();
         await dash.mocks.calledForSubmitBreakageForm({ category: 'layout', description: '' });
     });
 
+    test('hides description prompt on "dislike" category', { tag: '@screenshots' }, async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.webkit(page, {
+            screen: 'breakageForm',
+            randomisedCategories: 'false',
+            platform: 'macos',
+        });
+        await dash.addState([testDataStates.google]);
+        await dash.selectsCategoryType('I dislike the content on this site', 'dislike');
+        await dash.breakageFormIsVisible('I dislike the content');
+        await dash.descriptionPromptIsNotVisible();
+        await dash.screenshot('category-type-dislike.png');
+    });
+
     test('skips to breakage form when disliked', async ({ page }) => {
         /** @type {DashboardPage} */
         const dash = await DashboardPage.browser(page, testDataStates.google, { screen: 'breakageForm' });

diff --git a/integration-tests/ios.spec-int.js b/integration-tests/ios.spec-int.js
@@ -160,11 +160,26 @@ test.describe('breakage form', () => {
         await dash.screenshot('category-selection.png');
         await dash.selectsCategory('Site layout broken', 'layout');
         await dash.breakageFormIsVisible();
+        await dash.descriptionPromptIsVisible();
         await dash.screenshot('screen-breakage-form.png');
         await dash.submitFeedbackForm();
         await dash.mocks.calledForSubmitBreakageForm({ category: 'layout', description: '' });
     });
 
+    test('hides description prompt on "dislike" category', { tag: '@screenshots' }, async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.webkit(page, {
+            screen: 'breakageForm',
+            randomisedCategories: 'false',
+            platform: 'macos',
+        });
+        await dash.addState([testDataStates.google]);
+        await dash.selectsCategoryType('I dislike the content on this site', 'dislike');
+        await dash.breakageFormIsVisible('I dislike the content');
+        await dash.descriptionPromptIsNotVisible();
+        await dash.screenshot('category-type-dislike.png');
+    });
+
     test('skips to breakage form when disliked', async ({ page }) => {
         /** @type {DashboardPage} */
         const dash = await DashboardPage.webkit(page, { screen: 'breakageForm', platform: 'ios' });

diff --git a/integration-tests/macos.spec-int.js b/integration-tests/macos.spec-int.js
@@ -90,12 +90,27 @@ test.describe('breakage form', () => {
         await dash.screenshot('category-selection.png');
         await dash.selectsCategory('Site layout broken', 'layout');
         await dash.breakageFormIsVisible();
+        await dash.descriptionPromptIsVisible();
         await dash.screenshot('screen-breakage-form.png');
         await dash.submitFeedbackForm();
         await dash.showsBreakageFormSuccessScreen();
         await dash.mocks.calledForSubmitBreakageForm({ category: 'layout', description: '' });
     });
 
+    test('hides description prompt on "dislike" category', { tag: '@screenshots' }, async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.webkit(page, {
+            screen: 'breakageForm',
+            randomisedCategories: 'false',
+            platform: 'macos',
+        });
+        await dash.addState([testDataStates.google]);
+        await dash.selectsCategoryType('I dislike the content on this site', 'dislike');
+        await dash.breakageFormIsVisible('I dislike the content');
+        await dash.descriptionPromptIsNotVisible();
+        await dash.screenshot('category-type-dislike.png');
+    });
+
     test('skips to breakage form when disliked', async ({ page }) => {
         /** @type {DashboardPage} */
         const dash = await DashboardPage.webkit(page, { screen: 'breakageForm', platform: 'macos' });

diff --git a/...ration-tests/macos.spec-int.js-snapshots/category-type-dislike-macos-darwin.png b/...ration-tests/macos.spec-int.js-snapshots/category-type-dislike-macos-darwin.png
diff --git a/...s.spec-int.js-snapshots/screen-breakage-form-empty-description-macos-darwin.png b/...s.spec-int.js-snapshots/screen-breakage-form-empty-description-macos-darwin.png
diff --git a/...gration-tests/macos.spec-int.js-snapshots/screen-breakage-form-macos-darwin.png b/...gration-tests/macos.spec-int.js-snapshots/screen-breakage-form-macos-darwin.png
diff --git a/...on-tests/macos.spec-int.js-snapshots/screen-toggle-report-show-macos-darwin.png b/...on-tests/macos.spec-int.js-snapshots/screen-toggle-report-show-macos-darwin.png
diff --git a/integration-tests/windows.spec-int.js b/integration-tests/windows.spec-int.js
@@ -41,12 +41,27 @@ test.describe('breakage form', () => {
         await dash.screenshot('category-selection.png');
         await dash.selectsCategory('Site layout broken', 'layout');
         await dash.breakageFormIsVisible();
+        await dash.descriptionPromptIsVisible();
         await dash.screenshot('screen-breakage-form.png');
         await dash.submitFeedbackForm();
         await dash.showsBreakageFormSuccessScreen();
         await dash.mocks.calledForSubmitBreakageForm({ category: 'layout', description: '' });
     });
 
+    test('hides description prompt on "dislike" category', { tag: '@screenshots' }, async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.webkit(page, {
+            screen: 'breakageForm',
+            randomisedCategories: 'false',
+            platform: 'macos',
+        });
+        await dash.addState([testDataStates.google]);
+        await dash.selectsCategoryType('I dislike the content on this site', 'dislike');
+        await dash.breakageFormIsVisible('I dislike the content');
+        await dash.descriptionPromptIsNotVisible();
+        await dash.screenshot('category-type-dislike.png');
+    });
+
     test('skips to breakage form when disliked', async ({ page }) => {
         /** @type {DashboardPage} */
         const dash = await DashboardPage.windows(page, { screen: 'breakageForm' });

diff --git a/schema/__fixtures__/toggle-report-screen.json b/schema/__fixtures__/toggle-report-screen.json
@@ -62,6 +62,9 @@
         },
         {
             "id": "locale"
+        },
+        {
+            "id": "description"
         }
     ]
 }
diff --git a/schema/__generated__/schema.parsers.mjs b/schema/__generated__/schema.parsers.mjs
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,9 @@ @@
             },
             {
                 "id": "locale"
+            },
+            {
+                "id": "description"
             }
         ]
     }