Fix: test regression

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

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/index.js b/src/index.js
@@ -253,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 (true || devMode) {
+              if (devMode) {
                 const event = {
                   module,
                   family: family.name,
@@ -326,7 +326,7 @@ const init = async ({
 };
 
 const getHistory = () => {
-  if (true || devMode) {
+  if (devMode) {
     return history;
   }
 

diff --git a/tests/utils.js b/tests/utils.js
@@ -30,14 +30,16 @@ 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-runner>jest-circus'),
+  // console.log(Sandworm.getHistory().map((call) => `${call.module}: ${call.family}.${call.method}`));
+  const call = Sandworm.getHistory().filter(({module}) =>
+    (fromRoot ? ['root'] : ['jest-runner>jest-circus', 'jest-circus']).includes(module),
   )[index];
 
   callExpects({call, family, method, firstArg, secondArg});
 };
 
 const expectCallToThrow = (call) => {
+  // console.log(Sandworm.getHistory().map((c) => `${c.module}: ${c.family}.${c.method}`));
   expect(call).toThrow(Sandworm.Error);
 };
 
@@ -70,8 +72,13 @@ const loadSandwormInProductionMode = async () =>
     skipTracking: true,
     allowInitFrom: /jest-circus/,
     permissions: [
+      // These are the Jest runner modules on node v12.0.0+
       {module: 'jest-runner>jest-circus>expect', permissions: false},
       {module: 'jest-runner>jest-circus', permissions: false},
+      // These are the Jest runner modules on node v12.0.0 and below
+      {module: 'jest-circus>expect', permissions: false},
+      {module: 'jest-circus', permissions: false},
+      // These are required by Jest
       {module: /jest/, permissions: true},
       {module: /istanbul/, permissions: true},
       {module: /babel/, permissions: true},