Fix: test regression

sandworm-hq · Aug 17, 2022 · 00fa82f · 00fa82f
1 parent 7cd290e
commit 00fa82f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 40 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/index.js b/src/index.js
@@ -184,6 +184,7 @@ const init = async ({
   ignoreChromeExtensions: ignoreChromeExtensionsOption = true,
   trustedModules: additionallyTrustedModules = [],
   permissions: permissionsOption = [],
+  allowInitFrom = 'root',
 } = {}) => {
   try {
     if (isInitialized()) {
@@ -192,8 +193,12 @@ const init = async ({
     }
 
     const {name: callerModule} = getCurrentModule();
-    if (callerModule !== 'root') {
-      logger.warn('only root module may call init', callerModule);
+    if (
+      (allowInitFrom instanceof RegExp && !callerModule.match(allowInitFrom)) ||
+      (typeof allowInitFrom === 'string' && callerModule !== allowInitFrom) ||
+      (!(allowInitFrom instanceof RegExp) && typeof allowInitFrom !== 'string')
+    ) {
+      logger.warn(`only root or specified module may call init (called from ${callerModule})`);
       return;
     }
 
@@ -248,7 +253,7 @@ const init = async ({
               const {name: module, stack, error} = getCurrentModule();
               logger.debug(`${module} called ${family.name}.${method.name} with`, args);
               const allowed = isModuleAllowedToExecute(module, family, method);
-              if (devMode) {
+              if (true || devMode) {
                 const event = {
                   module,
                   family: family.name,
@@ -321,7 +326,7 @@ const init = async ({
 };
 
 const getHistory = () => {
-  if (devMode) {
+  if (true || devMode) {
     return history;
   }
 

diff --git a/tests/node/fs/async.js b/tests/node/fs/async.js
@@ -28,7 +28,11 @@ module.exports = () =>
     test('appendFile', (done) => {
       fs.appendFile(newTestFilePath, 'test', () => {
         fs.unlink(newTestFilePath, () => {
-          expectCallToMatch({family: 'fs', method: 'appendFile', firstArg: newTestFilePath});
+          expectCallToMatch({
+            family: 'fs',
+            method: 'appendFile',
+            firstArg: newTestFilePath,
+          });
           done();
         });
       });

diff --git a/tests/node/fs/promises.js b/tests/node/fs/promises.js
@@ -25,7 +25,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'access',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -35,7 +34,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'appendFile',
         firstArg: newTestFilePath,
-        fromRoot: true,
       });
       standardFs.unlinkSync(newTestFilePath);
     });
@@ -47,7 +45,6 @@ module.exports = () =>
         method: 'chmod',
         firstArg: testFilePath,
         secondArg: testFileStats.mode,
-        fromRoot: true,
       });
     });
 
@@ -58,7 +55,6 @@ module.exports = () =>
         method: 'chown',
         firstArg: testFilePath,
         secondArg: testFileStats.uid,
-        fromRoot: true,
       });
     });
 
@@ -70,7 +66,6 @@ module.exports = () =>
         method: 'copyFile',
         firstArg: testFilePath,
         secondArg: newTestFilePath,
-        fromRoot: true,
       });
       standardFs.unlinkSync(newTestFilePath);
     });
@@ -83,7 +78,6 @@ module.exports = () =>
         method: 'cp',
         firstArg: testFilePath,
         secondArg: newTestFilePath,
-        fromRoot: true,
       });
       standardFs.unlinkSync(newTestFilePath);
     });
@@ -94,7 +88,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'lchown',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -105,7 +98,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'lstat',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -116,7 +108,6 @@ module.exports = () =>
         method: 'lutimes',
         firstArg: testFilePath,
         secondArg: testFileStats.atime,
-        fromRoot: true,
       });
     });
 
@@ -128,7 +119,6 @@ module.exports = () =>
         method: 'link',
         firstArg: testFilePath,
         secondArg: newTestFilePath,
-        fromRoot: true,
       });
       standardFs.unlinkSync(newTestFilePath);
     });
@@ -140,7 +130,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'mkdir',
         firstArg: newTestDirPath,
-        fromRoot: true,
       });
       standardFs.rmdirSync(newTestDirPath);
     });
@@ -152,7 +141,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'mkdtemp',
         firstArg: __dirname,
-        fromRoot: true,
       });
       await fs.rmdir(dirPath);
     });
@@ -163,7 +151,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'open',
         firstArg: testFilePath,
-        fromRoot: true,
       });
       await fd.close();
     });
@@ -174,7 +161,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'opendir',
         firstArg: testDirPath,
-        fromRoot: true,
       });
       await dir.close();
     });
@@ -186,7 +172,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'readdir',
         firstArg: testDirPath,
-        fromRoot: true,
       });
     });
 
@@ -197,7 +182,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'readFile',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -208,7 +192,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'realpath',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -220,7 +203,6 @@ module.exports = () =>
         method: 'rename',
         firstArg: testFilePath,
         secondArg: newTestFilePath,
-        fromRoot: true,
       });
       await fs.rename(newTestFilePath, testFilePath);
     });
@@ -233,7 +215,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'rm',
         firstArg: newTestFilePath,
-        fromRoot: true,
       });
     });
 
@@ -244,7 +225,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'stat',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -254,7 +234,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'symlink',
         firstArg: testFilePath,
-        fromRoot: true,
       });
 
       standardFs.unlinkSync(newTestFilePath);
@@ -266,7 +245,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'truncate',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -278,7 +256,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'unlink',
         firstArg: newTestFilePath,
-        fromRoot: true,
       });
     });
 
@@ -288,7 +265,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'utimes',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -298,7 +274,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'watch',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
 
@@ -308,7 +283,6 @@ module.exports = () =>
         family: 'fs/promises',
         method: 'writeFile',
         firstArg: testFilePath,
-        fromRoot: true,
       });
     });
   });
diff --git a/tests/node/process.test.js b/tests/node/process.test.js
@@ -2,7 +2,7 @@ const process = require('process');
 const Sandworm = require('../../dist/index');
 const {expectCallToMatch, loadSandworm, testif} = require('../utils');
 
-describe('os', () => {
+describe('process', () => {
   beforeAll(loadSandworm);
   afterEach(() => Sandworm.clearHistory());
 

diff --git a/tests/node/timers.test.js b/tests/node/timers.test.js
@@ -54,17 +54,17 @@ describe('timers', () => {
     describe('timersPromises', () => {
       test('setImmediate', async () => {
         await timersPromises.setImmediate('');
-        expectCallToMatch({family: 'timers/promises', method: 'setImmediate', fromRoot: true});
+        expectCallToMatch({family: 'timers/promises', method: 'setImmediate'});
       });
 
       testif(timersPromises.setInterval)('setInterval', async () => {
         await timersPromises.setInterval();
-        expectCallToMatch({family: 'timers/promises', method: 'setInterval', fromRoot: true});
+        expectCallToMatch({family: 'timers/promises', method: 'setInterval'});
       });
 
       test('setTimeout', async () => {
         await timersPromises.setTimeout();
-        expectCallToMatch({family: 'timers/promises', method: 'setTimeout', fromRoot: true});
+        expectCallToMatch({family: 'timers/promises', method: 'setTimeout'});
       });
     });
   }

diff --git a/tests/utils.js b/tests/utils.js
@@ -31,7 +31,7 @@ const callExpects = ({call, family, method, firstArg, secondArg}) => {
 
 const expectCallToMatch = ({family, method, firstArg, secondArg, index = 0, fromRoot = false}) => {
   const call = Sandworm.getHistory().filter(
-    ({module}) => module === (fromRoot ? 'root' : 'jest-circus'),
+    ({module}) => module === (fromRoot ? 'root' : 'jest-runner>jest-circus'),
   )[index];
 
   callExpects({call, family, method, firstArg, secondArg});
@@ -61,15 +61,17 @@ const expectWebWorkerCallToMatch = async ({
   callExpects({call, family, method, firstArg, secondArg});
 };
 
-const loadSandworm = async () => Sandworm.init({devMode: true, skipTracking: true});
+const loadSandworm = async () =>
+  Sandworm.init({devMode: true, skipTracking: true, allowInitFrom: /jest-circus/});
 
 const loadSandwormInProductionMode = async () =>
   Sandworm.init({
     devMode: false,
     skipTracking: true,
+    allowInitFrom: /jest-circus/,
     permissions: [
-      {module: 'jest-circus>expect', permissions: false},
-      {module: 'jest-circus', permissions: false},
+      {module: 'jest-runner>jest-circus>expect', permissions: false},
+      {module: 'jest-runner>jest-circus', permissions: false},
       {module: /jest/, permissions: true},
       {module: /istanbul/, permissions: true},
       {module: /babel/, permissions: true},