fix: ppr reviews

FlowCrypt · Jan 3, 2025 · b8e66df · b8e66df
1 parent 9fc50ad
commit b8e66df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/scripts/config-mock-build.sh b/scripts/config-mock-build.sh
@@ -3,4 +3,6 @@ BUILD_PATH=./build/test/mock-builds/port-$2-$(openssl rand -hex 12)
 mkdir -p $BUILD_PATH
 cp -r ./$1/* $BUILD_PATH
 grep "\[TEST_REPLACEABLE_MOCK_PORT\]" $BUILD_PATH -lr | xargs sed -i.bak -e "s/\[TEST_REPLACEABLE_MOCK_PORT\]/$2/g"
+# Replace export const MOCK_PORT line with the provided mock port
+grep "export const MOCK_PORT = '\[TEST_REPLACEABLE_MOCK_PORT\]';" $BUILD_PATH -lr | xargs sed -i.bak -e "s/export const MOCK_PORT = '\[TEST_REPLACEABLE_MOCK_PORT\]';/export const MOCK_PORT = '$2';/"
 echo $BUILD_PATH
diff --git a/test/source/test.ts b/test/source/test.ts
@@ -9,9 +9,10 @@ import { AvaContext, TestContext, getDebugHtmlAtts, minutes, standaloneTestTimeo
 import { Util, getParsedCliParams } from './util';
 
 import { mkdirSync, realpathSync } from 'fs';
-import { readFile, writeFile } from 'fs/promises';
+import { writeFile } from 'fs/promises';
 import { TestUrls } from './browser/test-urls';
 import { startAllApisMock } from './mock/all-apis-mock';
+import { reportedErrors } from './mock/fes/shared-tenant-fes-endpoints';
 import { defineComposeTests } from './tests/compose';
 import { defineContentScriptTests } from './tests/content-script';
 import { defineDecryptTests } from './tests/decrypt';
@@ -22,7 +23,6 @@ import { defineSettingsTests } from './tests/settings';
 import { defineSetupTests } from './tests/setup';
 import { defineUnitBrowserTests } from './tests/unit-browser';
 import { defineUnitNodeTests } from './tests/unit-node';
-import { reportedErrors } from './mock/fes/shared-tenant-fes-endpoints';
 
 export const { testVariant, testGroup, oneIfNotPooled, buildDir, isMock } = getParsedCliParams();
 export const internalTestState = { expectIntentionalErrReport: false }; // updated when a particular test that causes an error is run
@@ -107,11 +107,6 @@ const startMockApiAndCopyBuild = async (t: AvaContext) => {
   const address = mockApi.server.address();
   if (typeof address === 'object' && address) {
     const result = await asyncExec(`sh ./scripts/config-mock-build.sh ${buildDir} ${address.port}`);
-    const filepath = `${buildDir}/js/common/core/const.js`;
-
-    const fileContent = await readFile(filepath, { encoding: 'utf-8' });
-    const updatedCode = fileContent.replace(/const (MOCK_PORT) = [^;]+;/g, `const $1 = '${address.port}';`);
-    await writeFile(filepath, updatedCode);
     t.context.extensionDir = result.stdout;
     t.context.urls = new TestUrls(await browserPool.getExtensionId(t), address.port);
   } else {