fix(ava-xs): anchor match patterns

- style: make esmRequire look more like require for dev tools - prune some debug logging
Agoric · Mar 16, 2021 · c753779 · c753779
1 parent bc36651
commit c753779
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/packages/xsnap/src/ava-xs.js b/packages/xsnap/src/ava-xs.js
@@ -9,10 +9,12 @@ const { promises } = require('fs');
 const path = require('path');
 const glob = require('glob');
 
-esmRequire('@agoric/install-ses');
-const bundleSource = esmRequire('@agoric/bundle-source').default;
+// eslint-disable-next-line no-global-assign
+require = esmRequire; // help vs-code navigate
+require('@agoric/install-ses');
+const bundleSource = require('@agoric/bundle-source').default;
 
-const { main, makeBundleResolve } = esmRequire('./avaXS');
+const { main, makeBundleResolve } = require('./avaXS');
 
 Promise.resolve()
   .then(_ =>

diff --git a/packages/xsnap/src/avaAssertXS.js b/packages/xsnap/src/avaAssertXS.js
@@ -337,9 +337,9 @@ function test(label, run, htestOpt) {
     const out = tapFormat(htest.send);
     const t = makeTester(htest, out);
     try {
-      out.diagnostic('start', label);
+      // out.diagnostic('start', label);
       await run(t);
-      out.diagnostic('end', label);
+      // out.diagnostic('end', label);
     } catch (ex) {
       console.log('FAIL (todo route console)', ex);
       t.fail(`${label} threw: ${ex.message}`);

diff --git a/packages/xsnap/src/avaXS.js b/packages/xsnap/src/avaXS.js
@@ -50,7 +50,7 @@ const { keys } = Object;
  * @param {string} pattern
  */
 function isMatch(specimen, pattern) {
-  return specimen.match(pattern.replace(/\*/g, '.*'));
+  return specimen.match(`^${pattern.replace(/\*/g, '.*')}$`);
 }
 
 /**