Revert "change "useIstanbul" handling"

This reverts commit 7880a36.
yubik9 · Jan 15, 2018 · 888e2ba · 888e2ba
1 parent 775d47d
commit 888e2ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/test/lib/setup.js b/test/lib/setup.js
@@ -12,6 +12,7 @@ pkg.main = pkg.main || 'main.js';
 var adapterName = path.normalize(rootDir).replace(/\\/g, '/').split('/');
 adapterName = adapterName[adapterName.length - 2];
 var adapterStarted = false;
+var useIstanbul = false;
 
 function getAppName() {
     var parts = __dirname.replace(/\\/g, '/').split('/');
@@ -450,10 +451,7 @@ function setupController(cb) {
     });
 }
 
-function startAdapter(objects, states, callback, useIstanbul) {
-    if (useIstanbul === undefined) {
-        useIstanbul = false;
-    }
+function startAdapter(objects, states, callback) {
     if (adapterStarted) {
         console.log('Adapter already started ...');
         if (callback) callback(objects, states);
@@ -501,7 +499,7 @@ function startAdapter(objects, states, callback, useIstanbul) {
     if (callback) callback(objects, states);
 }
 
-function startController(isStartAdapter, onObjectChange, onStateChange, callback, useIstanbul) {
+function startController(isStartAdapter, onObjectChange, onStateChange, callback) {
     if (typeof isStartAdapter === 'function') {
         callback = onStateChange;
         onStateChange = onObjectChange;
@@ -513,9 +511,6 @@ function startController(isStartAdapter, onObjectChange, onStateChange, callback
         callback  = onObjectChange;
         onObjectChange = undefined;
     }
-    if (useIstanbul === undefined) {
-        useIstanbul = false;
-    }
 
     if (pid) {
         console.error('Controller is already started!');
@@ -558,7 +553,7 @@ function startController(isStartAdapter, onObjectChange, onStateChange, callback
                 if (isStatesConnected) {
                     console.log('startController: started!');
                     if (isStartAdapter) {
-                        startAdapter(objects, states, callback, useIstanbul);
+                        startAdapter(objects, states, callback);
                     } else {
                         if (callback) callback(objects, states);
                     }
@@ -600,7 +595,7 @@ function startController(isStartAdapter, onObjectChange, onStateChange, callback
                 isStatesConnected = true;
                 if (isObjectConnected) {
                     console.log('startController: started!!');
-                    startAdapter(objects, states, callback, useIstanbul);
+                    startAdapter(objects, states, callback);
                 }
             },
             change: onStateChange
@@ -715,4 +710,5 @@ if (typeof module !== undefined && module.parent) {
     module.exports.appName          = appName;
     module.exports.adapterName      = adapterName;
     module.exports.adapterStarted   = adapterStarted;
+    module.exports.useIstanbul      = useIstanbul;
 }
diff --git a/test/testAdapter.js b/test/testAdapter.js
@@ -139,6 +139,7 @@ describe('Test ' + adapterShortName + ' adapter', function() {
     before('Test ' + adapterShortName + ' adapter: Start js-controller', function (_done) {
         this.timeout(600000); // because of first install from npm
 
+        setup.useIstanbul = true;
         setup.setupController(function () {
             var config = setup.getAdapterConfig();
             // enable adapter
@@ -158,7 +159,7 @@ describe('Test ' + adapterShortName + ' adapter', function() {
                     objects = _objects;
                     states  = _states;
                     _done();
-                }, true);
+                });
             });
         });
     });