updated mock tests to stop using real backend

Author: Tom J

test/source/mock/backend/backend-endpoints.ts

@@ -1,7 +1,5 @@
 /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */
 
-import * as request from 'fc-node-requests';
-
 import { HttpAuthErr, HttpClientErr } from '../lib/api';
 
 import { BackendData } from './backend-data';
@@ -14,30 +12,6 @@ import { expect } from 'chai';
 
 export const mockBackendData = new BackendData(oauth);
 
-const fwdToRealBackend = async (parsed: any, req: IncomingMessage): Promise<string> => {
-  // we are forwarding this request to backend, but we are not properly authenticated with real backend
-  // better remove authentication: requests that we currently forward during tests don't actually require it
-  delete req.headers.host;
-  delete req.headers['content-length'];
-  const forwarding: any = { headers: req.headers, url: `https://flowcrypt.com${req.url}` };
-  if (req.url!.includes('message/upload')) {
-    // Removing mock auth when forwarding request to real backend at ${req.url}
-    // here a bit more difficult, because the request was already encoded as form-data
-    parsed.body = (parsed.body as string).replace(/(-----END PGP MESSAGE-----\r\n\r\n------[A-Za-z0-9]+)(.|\r\n)*$/gm, (_, found) => `${found}--\r\n`);
-    forwarding.body = parsed.body; // FORM-DATA
-    const r = await request.post(forwarding);
-    return r.body; // already json-stringified for this call, maybe because backend doesn't return proper content-type
-  }
-  if (parsed.body && typeof parsed.body === 'object' && parsed.body.account && parsed.body.uuid) {
-    // Removing mock auth when forwarding request to real backend at ${req.url}
-    delete parsed.body.account;
-    delete parsed.body.uuid;
-  }
-  forwarding.json = parsed.body; // JSON
-  const r = await request.post(forwarding);
-  return JSON.stringify(r.body);
-};
-
 export const mockBackendEndpoints: HandlersDefinition = {
   '/api/account/login': async ({ body }, req) => {
     const parsed = throwIfNotPostWithAuth(body, req);
@@ -78,11 +52,15 @@ export const mockBackendEndpoints: HandlersDefinition = {
     expect((body as any).email).to.equal('flowcrypt.compatibility@gmail.com');
     return { sent: true, text: 'Feedback sent' };
   },
-  '/api/message/presign_files': fwdToRealBackend,
-  '/api/message/confirm_files': fwdToRealBackend,
-  '/api/message/upload': fwdToRealBackend,
-  '/api/link/message': fwdToRealBackend,
-  '/api/link/me': fwdToRealBackend,
+  '/api/message/upload': async ({ }) => {
+    return { short: '0000000000', url: 'https://example.com/msg-123', admin_code: 'mocked-admin-code' };
+  },
+  '/api/link/message': async ({ }) => {
+    return { "url": "https://example.com/msg-123", "repliable": "False", "expire": "2100-05-18 16:31:28", "expired": "False", "deleted": "False" };
+  },
+  '/api/link/me': async ({ }, req) => {
+    throw new Error(`${req.url} mock not implemented`);
+  },
 };
 
 const throwIfNotPostWithAuth = (body: unknown, req: IncomingMessage) => {

test/source/test.ts

@@ -24,6 +24,7 @@ import { TestUrls } from './browser/test-urls';
 export const { testVariant, testGroup, oneIfNotPooled, buildDir, isMock } = getParsedCliParams();
 export const internalTestState = { expectIntentionalErrReport: false }; // updated when a particular test that causes an error is run
 const DEBUG_BROWSER_LOG = false; // set to true to print / export information from browser
+const DEBUG_MOCK_LOG = false; // se to true to print mock server logs
 
 process.setMaxListeners(60);
 
@@ -52,7 +53,12 @@ ava.before('set config and mock api', async t => {
   Config.extensionId = await browserPool.getExtensionId(t);
   console.info(`Extension url: chrome-extension://${Config.extensionId}`);
   if (isMock) {
-    const mockApi = await mock(line => mockApiLogs.push(line));
+    const mockApi = await mock(line => {
+      if (DEBUG_MOCK_LOG) {
+        console.log(line);
+      }
+      mockApiLogs.push(line);
+    });
     closeMockApi = mockApi.close;
   }
   t.pass();

test/source/tests/flaky.ts

@@ -108,16 +108,7 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test
       await ComposePageRecipe.sendAndClose(composePage, { password: msgPwd });
       const msg = (await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com')).getMessageBySubject(subject)!;
       const webDecryptUrl = msg.payload!.body!.data!.replace(///g, '/').match(/https:\/\/flowcrypt.com\/[a-z0-9A-Z]+/g)![0];
-      // while this test runs on a mock, it forwards the message/upload call to real backend - see `fwdToRealBackend`
-      // that's why we are able to test the message on real flowcrypt.com/api and web.
-      const webDecryptPage = await browser.newPage(t, webDecryptUrl);
-      await webDecryptPage.waitAndType('@input-msg-pwd', msgPwd);
-      await webDecryptPage.waitAndClick('@action-decrypt');
-      await webDecryptPage.waitForContent('@container-pgp-decrypted-content', subject);
-      await webDecryptPage.waitForContent('@container-pgp-decrypted-content', 'flowcrypt.compatibility test footer with an img');
-      await webDecryptPage.waitAll('@container-att-name(small.txt)');
-      const fileText = await webDecryptPage.awaitDownloadTriggeredByClicking('@container-att-name(small.txt)');
-      expect(fileText.toString()).to.equal(`small text file\nnot much here\nthis worked\n`);
+      expect(webDecryptUrl).to.not.be.empty('missing webDecryptUrl');
     }));
 
     ava.default(`[unit][Stream.readToEnd] efficiently handles multiple chunks`, async t => {