voidlabs
diff --git a/‎package-lock.json‎
Lines changed: 182 additions & 7 deletions b/‎package-lock.json‎
Lines changed: 182 additions & 7 deletions
diff --git a/‎package.json‎
Lines changed: 1 addition & 1 deletion b/‎package.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎spec/converter-spec.js‎
Lines changed: 6 additions & 6 deletions b/‎spec/converter-spec.js‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎spec/declarations-spec.js‎
Lines changed: 7 additions & 6 deletions b/‎spec/declarations-spec.js‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎spec/model-spec.js‎
Lines changed: 0 additions & 11 deletions b/‎spec/model-spec.js‎
Lines changed: 0 additions & 11 deletions
@@ -94,12 +94,12 @@
     "license-checker": "25.0.1",
     "load-grunt-tasks": "5.1.0",
     "lodash": "^4.17.21",
-    "mockery": "2.1.0",
     "multer": "2.0.2",
     "nodemailer": "7.0.5",
     "npm-force-resolutions": "0.0.10",
     "postcss": "8.5.6",
     "postcss-minify": "^1.2.0",
+    "rewiremock": "^3.14.6",
     "tinymce": "4.9.11"
   },
   "browserslist": [
 
@@ -4,7 +4,7 @@
 
 describe('Template converter', function() {
 
-  var mockery = require('mockery');
+  var rewiremock = require('rewiremock/node');
 
   var mockedBindingProvider = function(a, b) {
     // console.log("binding provider for", a, b);
@@ -18,9 +18,10 @@ describe('Template converter', function() {
   var _parseTemplate;
 
   beforeAll(function() {
-    mockery.registerMock('jquery', require('cheerio').load('<html />'));
-    mockery.registerAllowables(['fs', '../src/js/converter/checkdefs.js', '../src/js/converter/declarations.js', '../src/js/converter/model.js', '../src/js/converter/parser.js', 'console', './utils.js', './domutils.js', 'console', '../node_modules/mensch', './lib/lexer', './lib/parser', './lib/stringify', './debug', 'jsep', './declarations.js', './cssparser.js', 'mensch/lib/parser.js', './lexer', './stylesheet.js', './model.js']);
-    mockery.enable();
+    var cheerioMock = require('cheerio').load('<html />');
+    
+    rewiremock.enable();
+    rewiremock('jquery').with(cheerioMock);
 
     _parseTemplate = function(html) {
       var translateTemplate = require('../src/js/converter/parser.js');
@@ -299,8 +300,7 @@ describe('Template converter', function() {
   });
 
   afterAll(function() {
-    mockery.disable();
-    mockery.deregisterAll();
+    rewiremock.disable();
   });
 
 });
 
@@ -4,7 +4,7 @@
 
 describe('Style declaration processor', function() {
 
-  var mockery = require('mockery');
+  var rewiremock = require('rewiremock/node');
   var declarations;
 
   var templateUrlConverter = function(url) { return '.'+url; };
@@ -15,9 +15,11 @@ describe('Style declaration processor', function() {
   };
 
   beforeAll(function() {
-    mockery.registerMock('jquery', require('cheerio').load('<html />'));
-    mockery.registerAllowables(['cheerio', '../src/js/converter/declarations.js', './utils.js', 'console', 'jsep', 'mensch/lib/parser.js', './debug', './lexer', './domutils.js']);
-    mockery.enable();
+    var cheerioMock = require('cheerio').load('<html />');
+    
+    rewiremock.enable();
+    rewiremock('jquery').with(cheerioMock);
+    
     declarations = require('../src/js/converter/declarations.js');
   });
 
@@ -316,8 +318,7 @@ describe('Style declaration processor', function() {
   });
 
   afterAll(function() {
-    mockery.disable();
-    mockery.deregisterAll();
+    rewiremock.disable();
   });
 
 });
@@ -2,12 +2,6 @@
 /* globals it:false, describe:false, expect:false */
 
 describe('Model generator', function() {
-  var mockery = require('mockery');
-
-  beforeAll(function() {
-    mockery.enable();
-    mockery.registerAllowables(['console', './domutils.js', './cssparser.js', 'mensch/lib/parser.js', './debug', './lexer', '../src/js/converter/utils.js', 'jsep']);
-  });
 
   /*
   ensurePathAndGetBindValue: modelEnsurePathAndGetBindValue.bind(undefined, false),
@@ -33,9 +27,4 @@ describe('Model generator', function() {
 
   });
 
-  afterAll(function() {
-    mockery.disable();
-    mockery.deregisterAll();
-  });
-
 });