Merge pull request #20145 from mozilla/fxa-12624-v3

feat(fxa-auth-server): Migrate subscription & token integration tests PART 4

Author: vbudhram

packages/functional-tests/lib/pairing-helpers.ts

@@ -497,6 +497,7 @@ export async function enableTotpOnAccount(
 
 /**
  * Enter a TOTP code on the /pair/auth/totp page via Marionette.
+ * Waits for the page to navigate away from the TOTP page after submission.
  */
 export async function enterTotpCodeViaMarionette(
   client: MarionetteClient,
@@ -505,11 +506,13 @@ export async function enterTotpCodeViaMarionette(
   const totpInput = await findElementBySelectors(client, SELECTORS.TOTP_INPUT);
   const code = await getTotpCode(secret);
   await client.sendKeys(totpInput, code);
+  const preSubmitUrl = await client.getUrl();
   const submitBtn = await findElementBySelectors(
     client,
     SELECTORS.SUBMIT_BUTTON
   );
   await client.clickElement(submitBtn);
+  await waitForUrlChange(client, preSubmitUrl);
 }
 
 export function sleep(ms: number): Promise<void> {

packages/functional-tests/tests/pairing/pairingFlow.spec.ts

@@ -125,14 +125,9 @@ test.describe('severity-2 #smoke', () => {
       });
       await confirmButton.first().click();
 
-      await expect(async () => {
-        const url = page.url();
-        expect(url).not.toContain('pair/supp/allow');
-      }).toPass({ timeout: TIMEOUTS.AUTHORITY_COMPLETE });
-
-      const finalSuppUrl = page.url();
-      expect(finalSuppUrl).not.toContain('pair/failure');
-      expect(finalSuppUrl).toContain('oauth/success');
+      await page.waitForURL(/oauth\/success/, {
+        timeout: TIMEOUTS.AUTHORITY_COMPLETE,
+      });
 
       // Wait for authority to advance from wait_for_supp to complete
       await client.setContext('content');
@@ -208,10 +203,9 @@ test.describe('severity-2 #smoke', () => {
       });
       await confirmButton.first().click();
 
-      await expect(async () => {
-        expect(page.url()).not.toContain('pair/supp/allow');
-      }).toPass({ timeout: TIMEOUTS.AUTHORITY_COMPLETE });
-      expect(page.url()).toContain('oauth/success');
+      await page.waitForURL(/oauth\/success/, {
+        timeout: TIMEOUTS.AUTHORITY_COMPLETE,
+      });
 
       await client.setContext('content');
       const finalAuthUrl = await waitForUrlContaining(

packages/fxa-auth-server/test/remote/misc_tests.in.spec.ts

@@ -3,15 +3,22 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import http from 'http';
-import { createTestServer, TestServerInstance } from '../support/helpers/test-server';
+import {
+  createTestServer,
+  TestServerInstance,
+} from '../support/helpers/test-server';
 
 const Client = require('../client')();
 const packageJson = require('../../package.json');
 
 let server: TestServerInstance;
 
 beforeAll(async () => {
-  server = await createTestServer();
+  server = await createTestServer({
+    configOverrides: {
+      corsOrigin: ['http://foo', 'http://bar'],
+    },
+  });
 }, 120000);
 
 afterAll(async () => {
@@ -29,7 +36,12 @@ const testVersions = [
 function httpGet(
   url: string,
   options?: { headers?: Record<string, string> }
-): Promise<{ statusCode: number; headers: http.IncomingHttpHeaders; body: string; json: () => any }> {
+): Promise<{
+  statusCode: number;
+  headers: http.IncomingHttpHeaders;
+  body: string;
+  json: () => any;
+}> {
   return new Promise((resolve, reject) => {
     const parsed = new URL(url);
     const req = http.get(
@@ -41,7 +53,9 @@ function httpGet(
       },
       (res) => {
         let data = '';
-        res.on('data', (chunk) => { data += chunk; });
+        res.on('data', (chunk) => {
+          data += chunk;
+        });
         res.on('end', () => {
           resolve({
             statusCode: res.statusCode ?? 0,
@@ -60,7 +74,11 @@ function httpPost(
   url: string,
   payload: any,
   headers?: Record<string, string>
-): Promise<{ statusCode: number; headers: http.IncomingHttpHeaders; body: string }> {
+): Promise<{
+  statusCode: number;
+  headers: http.IncomingHttpHeaders;
+  body: string;
+}> {
   return new Promise((resolve, reject) => {
     const parsed = new URL(url);
     const body = JSON.stringify(payload);
@@ -78,7 +96,9 @@ function httpPost(
       },
       (res) => {
         let data = '';
-        res.on('data', (chunk) => { data += chunk; });
+        res.on('data', (chunk) => {
+          data += chunk;
+        });
         res.on('end', () => {
           resolve({
             statusCode: res.statusCode ?? 0,
@@ -144,7 +164,9 @@ describe.each(testVersions)(
       const res = await httpGet(`${server.publicUrl}/`, {
         headers: { Origin: randomAllowedOrigin },
       });
-      expect(res.headers['access-control-allow-origin']).toBe(randomAllowedOrigin);
+      expect(res.headers['access-control-allow-origin']).toBe(
+        randomAllowedOrigin
+      );
     });
 
     it('returns no Access-Control-Allow-Origin with not whitelisted Origin', async () => {
@@ -171,7 +193,11 @@ describe.each(testVersions)(
       const email = server.uniqueEmail();
       const password = 'allyourbasearebelongtous';
       const client = await Client.createAndVerify(
-        server.publicUrl, email, password, server.mailbox, testOptions
+        server.publicUrl,
+        email,
+        password,
+        server.mailbox,
+        testOptions
       );
 
       await client.login();
@@ -181,7 +207,7 @@ describe.each(testVersions)(
       );
 
       const res = await httpGet(url, {
-        headers: { 'Authorization': `Hawk id="${token.id}"` },
+        headers: { Authorization: `Hawk id="${token.id}"` },
       });
       const now = +new Date() / 1000;
       expect(Number(res.headers.timestamp)).toBeGreaterThan(now - 60);
@@ -226,22 +252,34 @@ describe.each(testVersions)(
         'GET',
         server.publicUrl + '/.well-known/browserid'
       );
-      expect(Object.prototype.hasOwnProperty.call(doc, 'public-key')).toBe(true);
+      expect(Object.prototype.hasOwnProperty.call(doc, 'public-key')).toBe(
+        true
+      );
       expect(/^[0-9]+$/.test(doc['public-key'].n)).toBe(true);
       expect(/^[0-9]+$/.test(doc['public-key'].e)).toBe(true);
-      expect(Object.prototype.hasOwnProperty.call(doc, 'authentication')).toBe(true);
-      expect(Object.prototype.hasOwnProperty.call(doc, 'provisioning')).toBe(true);
+      expect(Object.prototype.hasOwnProperty.call(doc, 'authentication')).toBe(
+        true
+      );
+      expect(Object.prototype.hasOwnProperty.call(doc, 'provisioning')).toBe(
+        true
+      );
       expect(doc.keys.length).toBe(1);
     });
 
     it('ignores fail on hawk payload mismatch', async () => {
       const email = server.uniqueEmail();
       const password = 'allyourbasearebelongtous';
       const client = await Client.createAndVerify(
-        server.publicUrl, email, password, server.mailbox, testOptions
+        server.publicUrl,
+        email,
+        password,
+        server.mailbox,
+        testOptions
       );
 
-      const token = await client.api.Token.SessionToken.fromHex(client.sessionToken);
+      const token = await client.api.Token.SessionToken.fromHex(
+        client.sessionToken
+      );
       const url = `${client.api.baseURL}/account/device`;
       const payload: any = {
         name: 'my cool device',
@@ -250,7 +288,7 @@ describe.each(testVersions)(
 
       payload.name = 'my stealthily-changed device name';
       const res = await httpPost(url, payload, {
-        'Authorization': `Hawk id="${token.id}"`,
+        Authorization: `Hawk id="${token.id}"`,
       });
       expect(res.statusCode).toBe(200);
     });