Move common test routines into modules

extensions/chromium/runet-censorship-bypass/package.json

@@ -3,6 +3,7 @@
   "version": "0.0.19",
   "description": "Development tools for chromium extension",
   "scripts": {
+    "postinstall": "node --use_strict -e \"const fs = require('fs'), path = 'node_modules/_project-root'; fs.unlink(path, ()=> fs.symlinkSync('..', path, 'dir'));\"",
     "lint": "eslint ./src/**/*.js --ignore-pattern vendor",
     "gulp": "gulp",
     "test": "mocha --recursive ./src/**/test/*"

extensions/chromium/runet-censorship-bypass/src/extension-common/test/pac-kitchen.js

@@ -1,72 +1,11 @@
 'use strict';
 
 const Chrome = require('sinon-chrome');
+const Storage = require('_project-root/tools/sinon-storage');
 const Chai = require('chai');
 const Mocha = require('mocha');
 
-const storageMock = function storageMock() {
+const MyRequire = require('_project-root/tools/cacheless-require')(module);
-
-  let storage = {};
-
-  return new Proxy({
-    setItem: function(key, value) {
-
-      storage[key] = value || '';
-
-    },
-    getItem: function(key) {
-
-      return key in storage ? storage[key] : null;
-
-    },
-    removeItem: function(key) {
-
-      delete storage[key];
-
-    },
-    get length() {
-
-      return Object.keys(storage).length;
-
-    },
-    key: function(i) {
-
-      throw new Error('Not implemented!');
-
-    },
-    clear: function() {
-
-      storage = {};
-
-    },
-  }, {
-    get: function(target, name) {
-
-      if (name in target) {
-        return target[name];
-      }
-      return target.getItem(name);
-
-    },
-    set: function(target, prop, value) {
-
-      if (prop in target) {
-        target[prop] = value;
-        return;
-      }
-      return target.setItem(prop, value);
-
-    },
-  });
-
-};
-
-const myRequire = (path) => {
-
-  delete require.cache[require.resolve(path)];
-  return require(path);
-
-};
 
 Mocha.describe('window.apis.pacKitchen', function () {
 
@@ -76,15 +15,15 @@ Mocha.describe('window.apis.pacKitchen', function () {
     global.chrome = Chrome;
     global.window = {
       chrome: Chrome,
-      localStorage: new storageMock(),
+      localStorage: new Storage(),
     };
-    myRequire('../00-init-apis.js');
+    MyRequire('../00-init-apis.js');
 
   });
 
   Mocha.it('is evaluated and defined', function () {
 
-    myRequire('../35-pac-kitchen-api.js');
+    MyRequire('../35-pac-kitchen-api.js');
     Chai.assert.ok(window.apis.pacKitchen, 'exports to globals');
 
   });

extensions/chromium/runet-censorship-bypass/src/extension-common/test/utils.js

@@ -3,22 +3,21 @@
 const Chai = require('chai');
 const Mocha = require('mocha');
 
+const MyRequire = require('_project-root/tools/cacheless-require')(module);
+
 Mocha.describe('window.utils', function () {
 
   const initApis = '../00-init-apis.js';
 
   Mocha.beforeEach(function() {
 
-    delete require.cache[require.resolve(initApis)];
     global.window = {};
 
   });
 
   Mocha.it('exports as global', function () {
 
-    console.log('1',window);
+    MyRequire(initApis);
-    require(initApis);
-    console.log('2',window);
     Chai.assert.ok(window.utils, 'exported to globals');
     Chai.assert.isNotOk(window.apis.version.ifMini, 'is not MINI version');
 

extensions/chromium/runet-censorship-bypass/tools/cacheless-require.js

@@ -0,0 +1,10 @@
+'ust strict';
+
+module.exports = (parentModule) => function cachelessRequire(path) {
+
+  for(let key of Object.keys(require.cache)) {
+    delete require.cache[key];
+  }
+  return parentModule.require(path);
+
+};

extensions/chromium/runet-censorship-bypass/tools/sinon-storage.js

@@ -0,0 +1,48 @@
+'use strict';
+
+const Sinon = require('sinon');
+
+module.exports = function storageMock() {
+
+  let storage = {};
+
+  return new Proxy({
+    setItem: Sinon.spy(function(key, value) {
+      storage[key] = value || '';
+    }),
+    getItem: Sinon.spy(function(key) {
+      return key in storage ? storage[key] : null;
+    }),
+    removeItem: Sinon.spy(function(key) {
+      delete storage[key];
+    }),
+    get length() {
+      return Object.keys(storage).length;
+    },
+    key: Sinon.spy(function(i) {
+      throw new Error('Not implemented!');
+    }),
+    clear: Sinon.spy(function() {
+      storage = {};
+    }),
+  }, {
+    get: function(target, name) {
+
+      if (name in target) {
+        return target[name];
+      }
+      return target.getItem(name);
+
+    },
+    set: function(target, prop, value) {
+
+      if (prop in target) {
+        target[prop] = value;
+        return;
+      }
+      return target.setItem(prop, value);
+
+    },
+  });
+
+};