Remove 'when' module

Author: knolleary

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-admin",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "The Node-RED admin command line interface",
     "homepage": "http://nodered.org",
     "bugs": {
@@ -28,12 +28,12 @@
         "test": "./node_modules/.bin/mocha "
     },
     "dependencies": {
+        "axios": "0.19.2",
         "bcryptjs": "^2.4.3",
         "cli-table": "^0.3.1",
         "colors": "^1.4.0",
         "minimist": "^1.2.5",
-        "read": "^1.0.7",
-        "axios": "0.19.2"
+        "read": "^1.0.7"
     },
     "devDependencies": {
         "grunt": "^1.0.4",

test/lib/commands/disable_spec.js

@@ -18,7 +18,6 @@ var command = require("../../../lib/commands/disable");
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 
 var request = require("../../../lib/request");
 var result = require("./result_helper");
@@ -43,15 +42,15 @@ describe("commands/disable", function() {
             } catch(err) {
                 error = err;
             }
-            return when.resolve([]);
+            return Promise.resolve([]);
         });
         command({_:[null,"testnode"]},result).then(function() {
             if (error) {
                 throw error;
             }
             result.logList.called.should.be.true();
             done();
-        }).otherwise(done);
+        }).catch(done);
     });
 
     it('displays command help if node not specified', function(done) {

test/lib/commands/enable_spec.js

@@ -18,7 +18,6 @@ var command = require("../../../lib/commands/enable");
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 
 var request = require("../../../lib/request");
 var result = require("./result_helper");
@@ -43,15 +42,15 @@ describe("commands/enable", function() {
             } catch(err) {
                 error = err;
             }
-            return when.resolve([]);
+            return Promise.resolve([]);
         });
         command({_:[null,"testnode"]},result).then(function() {
             if (error) {
                 throw error;
             }
             result.logList.called.should.be.true();
             done();
-        }).otherwise(done);
+        }).catch(done);
     });
 
     it('displays command help if node not specified', function(done) {

test/lib/commands/hash_spec.js

@@ -20,7 +20,6 @@ var prompt = require("../../../lib/prompt");
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 
 
 var request = require("../../../lib/request");

test/lib/commands/info_spec.js

@@ -18,7 +18,6 @@ var command = require("../../../lib/commands/info");
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 
 var request = require("../../../lib/request");
 var result = require("./result_helper");
@@ -30,7 +29,7 @@ describe("commands/info", function() {
         }
         result.reset();
     });
-    
+
     it('displays information on a module', function(done) {
         var error;
         sinon.stub(request,"request",function(path,opts) {
@@ -40,17 +39,17 @@ describe("commands/info", function() {
             } catch(err) {
                 error = err;
             }
-            return when.resolve([]);
+            return Promise.resolve([]);
         });
         command({_:[null,"testnode"]},result).then(function() {
             if (error) {
                 throw error;
             }
             result.logDetails.called.should.be.true();
             done();
-        }).otherwise(done);
+        }).catch(done);
     });
-    
+
     it('reports error', function(done) {
         var error;
         sinon.stub(request,"request",function(path,opts) {
@@ -60,7 +59,7 @@ describe("commands/info", function() {
             } catch(err) {
                 error = err;
             }
-            return when.reject("error");
+            return Promise.reject("error");
         });
         command({_:[null,"testnode"]},result).then(function() {
             if (error) {
@@ -70,13 +69,13 @@ describe("commands/info", function() {
             result.warn.called.should.be.true();
             result.warn.args[0][0].should.eql("error");
             done();
-        }).otherwise(done);
+        }).catch(done);
     });
-    
+
     it('displays command help if node not specified', function(done) {
         command({_:{}},result);
         result.help.called.should.be.true();
         done();
     });
-        
+
 });

test/lib/commands/install_spec.js

@@ -18,7 +18,6 @@ var command = require("../../../lib/commands/install");
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 
 var request = require("../../../lib/request");
 var result = require("./result_helper");
@@ -43,15 +42,15 @@ describe("commands/install", function() {
             } catch(err) {
                 error = err;
             }
-            return when.resolve([]);
+            return Promise.resolve([]);
         });
         command({_:[null,"testnode"]},result).then(function() {
             if (error) {
                 throw error;
             }
             result.logDetails.called.should.be.true();
             done();
-        }).otherwise(done);
+        }).catch(done);
     });
 
     it('displays command help if node not specified', function(done) {

test/lib/commands/list_spec.js

@@ -38,15 +38,15 @@ describe("commands/list", function() {
             } catch(err) {
                 error = err;
             }
-            return when.resolve([]);
+            return Promise.resolve([]);
         });
         command({},result).then(function() {
             if (error) {
                 throw error;
             }
             result.logNodeList.called.should.be.true();
             done();
-        }).otherwise(done);
+        }).catch(done);
     });
 
 });

test/lib/commands/remove_spec.js

@@ -18,7 +18,6 @@ var command = require("../../../lib/commands/remove");
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 
 var request = require("../../../lib/request");
 var result = require("./result_helper");
@@ -30,7 +29,7 @@ describe("commands/remove", function() {
         }
         result.reset();
     });
-    
+
     it('removes a node', function(done) {
         var error;
         sinon.stub(request,"request",function(path,opts) {
@@ -42,17 +41,17 @@ describe("commands/remove", function() {
             } catch(err) {
                 error = err;
             }
-            return when.resolve([]);
+            return Promise.resolve([]);
         });
         command({_:[null,"testnode"]},result).then(function() {
             if (error) {
                 throw error;
             }
             result.log.called.should.be.true();
             done();
-        }).otherwise(done);
+        }).catch(done);
     });
-    
+
     it('displays command help if node not specified', function(done) {
         command({_:{}},result);
         result.help.called.should.be.true();

test/lib/commands/result_helper.js

@@ -24,7 +24,7 @@ module.exports = {
     logList: sinon.spy(),
     logNodeList: sinon.spy(),
     logDetails: sinon.spy(),
-    
+
     reset: function() {
         module.exports.log.reset();
         module.exports.warn.reset();

test/lib/commands/target_spec.js

@@ -18,7 +18,6 @@ var command = require("../../../lib/commands/target");
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 
 var config = require("../../../lib/config");
 
@@ -36,7 +35,7 @@ describe("commands/target", function() {
         result.reset();
         config.target.restore();
     });
-    
+
     it('queries the target', function(done) {
         command({_:[]},result);
         config.target.called.should.be.true();
@@ -45,7 +44,7 @@ describe("commands/target", function() {
         /http\:\/\/test\.example\.com/.test(result.log.args[0][0]).should.be.true();
         done();
     });
-    
+
     it('sets the target', function(done) {
         command({_:[null,"http://newtarget.example.com"]},result);
         config.target.called.should.be.true();
@@ -54,7 +53,7 @@ describe("commands/target", function() {
         /http\:\/\/newtarget\.example\.com/.test(result.log.args[0][0]).should.be.true();
         done();
     });
-    
+
     it('rejects non http targets', function(done) {
         command({_:[null,"ftp://newtarget.example.com"]},result);
         config.target.called.should.be.false();
@@ -67,8 +66,8 @@ describe("commands/target", function() {
         config.target.args[0][0].should.eql("http://newtarget.example.com");
         done();
     });
-    
-    
-    
-        
+
+
+
+
 });