Try eliminating some flakiness in Playwright welcome/* specs (#16777)

* Add more steps to firefox-welcome-6 test spec

* Update firefox-welcome-4 test spec for consistency

Author: janbrasna

tests/playwright/specs/products/firefox/welcome/firefox-welcome-4.spec.js

@@ -8,12 +8,12 @@
 
 const { test, expect } = require('@playwright/test');
 const openPage = require('../../../../scripts/open-page');
-const url = '/firefox/welcome/4/';
+const url = 'firefox/welcome/4';
 
 test.describe(
     `${url} page`,
     {
-        tag: ['@firefox', '@wfc-redirect']
+        tag: '@firefox'
     },
     () => {
         test('Send to device form success', async ({ page, browserName }) => {
@@ -22,7 +22,7 @@ test.describe(
                 'Page shown to Firefox browsers only'
             );
 
-            await openPage('/en-US/' + url, page, browserName);
+            await openPage(`/en-US/${url}/`, page, browserName);
 
             const qrCode = page.getByTestId('firefox-qr-code');
             const emailField = page.getByTestId(
@@ -37,6 +37,7 @@ test.describe(
 
             await expect(qrCode).not.toBeVisible();
             await expect(thanksMessage).not.toBeVisible();
+            await expect(submitButton).toBeVisible();
             await emailField.fill('[email protected]');
             await submitButton.click();
             await expect(submitButton).not.toBeVisible();
@@ -49,7 +50,7 @@ test.describe(
                 'Page shown to Firefox browsers only'
             );
 
-            await openPage('/en-US/' + url, page, browserName);
+            await openPage(`/en-US/${url}/`, page, browserName);
 
             const qrCode = page.getByTestId('firefox-qr-code');
             const emailField = page.getByTestId(
@@ -62,6 +63,7 @@ test.describe(
 
             await expect(qrCode).not.toBeVisible();
             await expect(errorMessage).not.toBeVisible();
+            await expect(submitButton).toBeVisible();
             await emailField.fill('[email protected]');
             await submitButton.click();
             await expect(errorMessage).toBeVisible();
@@ -73,7 +75,7 @@ test.describe(
                 'Page shown to Firefox browsers only'
             );
 
-            await openPage('/sv-SE/' + url, page, browserName);
+            await openPage(`/fy-NL/${url}/`, page, browserName);
 
             const qrCode = page.getByTestId('firefox-qr-code');
             const emailField = page.getByTestId(

tests/playwright/specs/products/firefox/welcome/firefox-welcome-6.spec.js

@@ -8,15 +8,15 @@
 
 const { test, expect } = require('@playwright/test');
 const openPage = require('../../../../scripts/open-page');
-const url = '/firefox/welcome/6/';
+const url = 'firefox/welcome/6';
 
 test.describe(
     `${url} page`,
     {
-        tag: ['@firefox', '@wfc-redirect']
+        tag: '@firefox'
     },
     () => {
-        test('Send set as default button displayed', async ({
+        test('Set as default button displayed', async ({
             page,
             browserName
         }) => {
@@ -55,6 +55,7 @@ test.describe(
             await getAppButton.click();
             await expect(qrCode).not.toBeVisible();
             await expect(thanksMessage).not.toBeVisible();
+            await expect(submitButton).toBeVisible();
             await emailField.fill('[email protected]');
             await submitButton.click();
             await expect(submitButton).not.toBeVisible();
@@ -82,6 +83,7 @@ test.describe(
             await getAppButton.click();
             await expect(qrCode).not.toBeVisible();
             await expect(errorMessage).not.toBeVisible();
+            await expect(submitButton).toBeVisible();
             await emailField.fill('[email protected]');
             await submitButton.click();
             await expect(errorMessage).toBeVisible();
@@ -93,7 +95,7 @@ test.describe(
                 'Page shown to Firefox browsers only'
             );
 
-            await openPage(`/it/${url}/?default=true`, page, browserName);
+            await openPage(`/fy-NL/${url}/?default=true`, page, browserName);
 
             const getAppButton = page.getByTestId('button-firefox-get-app');
             const qrCode = page.getByTestId('firefox-qr-code');