Merge branch 'pr_1739'

.travis.yml

@@ -4,7 +4,7 @@ matrix:
   include:
     - node_js: "10"
       script:
-        - istanbul cover ./node_modules/.bin/grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
+        - ./node_modules/.bin/grunt && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
       before_script:
         - npm install -g istanbul coveralls
     - node_js: "8"

Gruntfile.js

@@ -55,7 +55,7 @@ module.exports = function(grunt) {
                 reportFormats: ['lcov','html'],
                 print: 'both'
             },
-            all: { src: ['test/**/*_spec.js'] },
+            all: { src: ["test/_spec.js","test/red/**/*_spec.js","test/nodes/**/*_spec.js"] },
             core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
@@ -474,7 +474,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('default',
         'Builds editor content then runs code style checks and unit tests on all components',
-        ['build','test-core','test-editor','test-nodes']);
+        ['build','jshint:editor','mocha_istanbul:all']);
 
     grunt.registerTask('test-core',
         'Runs code style check and unit tests on core runtime code',

red/api/auth/users.js

@@ -86,6 +86,10 @@ function init(config) {
         } else {
             api.authenticate = authenticate;
         }
+    } else {
+        api.get = get;
+        api.authenticate = authenticate;
+        api.default = api.default;
     }
     if (config.default) {
         if (typeof config.default === "function") {

test/red/api/auth/users_spec.js

@@ -194,8 +194,7 @@ describe("api/auth/users", function() {
             it('should fail to return user fred',function(done) {
                 Users.get("fred").then(function(userf) {
                     try {
-                        userf.should.not.have.a.property("username","fred");
-                        userf.should.not.have.a.property("permissions","*");
+                        should.not.exist(userf);
                         done();
                     } catch(err) {
                         done(err);
@@ -212,9 +211,12 @@ describe("api/auth/users", function() {
                 default: function() { return("Done"); }
             });
         });
+        after(function() {
+            Users.init({});
+        });
         describe('#default',function() {
             it('handles api.default being a function',function(done) {
-                Users.should.have.property('default').which.is.a.Function;
+                Users.should.have.property('default').which.is.a.Function();
                 (Users.default()).should.equal("Done");
                 done();
             });