Controller class upgrade

Gruntfile.js

@@ -3,7 +3,8 @@ const fs = require('fs');
 
 
 module.exports = function(grunt) {
-    var testFiles = ["test/*.js"];
+    var testFilesApi = ["test/tests_api/*.js"];
+    var testFilesUnit = ["test/tests_unittests/*.js"];
 
     grunt.initConfig({
         express: {
@@ -29,28 +30,29 @@ module.exports = function(grunt) {
         exec: {
             restore_db: {
                 cmd: './scripts/dbrestore_linux.sh local ./test/seeds/test_dump/',
-                stdout: true,
+                stdout: false,
                 stderr: true,
-		options: {
-		    shell: 'bash'
-		}
+                options: {
+                    shell: 'bash',
+                }            
             }
         },
         simplemocha: {
             options: {
                 globals: ["should"],
-                timeout: 3000,
+                timeout: 120000,
                 ignoreLeaks: false,
-                ui: "bdd",
-                reporter: "xunit-file"
             },
-            all: {
-                src: testFiles
+            api: {
+                src: testFilesApi
+            },
+            unit: {
+                src: testFilesUnit
             }
-        }
+        },
     });
 
-    grunt.registerTask('FindTests', 'Find all tests under the addons', function() {
+    grunt.registerTask('FindApiTests', 'Find all tests under the addons', function() {
         var root = "app/addons";
         (function walk(path) {
             var items = fs.readdirSync(path);
@@ -63,7 +65,7 @@ module.exports = function(grunt) {
                         if ((dirName.match(/\//g) || []).length === 3) {
                             // only add test js files that are in the root of the /test directory.
                             // if you need to include subdirs, modify this to: dirName + '/' + '**/*.js'
-                            testFiles.push(dirName + '/' + '*.js');
+                            testFilesApi.push(dirName + '/' + '*.js');
                         }
                     }
                     walk(path + '/' + item);
@@ -76,6 +78,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks("grunt-express-server");
     grunt.loadNpmTasks("grunt-exec");
     grunt.loadNpmTasks("grunt-simple-mocha");
-    grunt.registerTask("default", ["FindTests", "express:test", "waitServer", "exec", "simplemocha:all"]);
-    grunt.registerTask("no-db-restore", ["FindTests", "express:test", "waitServer", "simplemocha:all"]);
+    grunt.registerTask("default", ["simplemocha:unit", "FindApiTests", "express:test", "waitServer", "exec", "simplemocha:api"]);
+    grunt.registerTask("apitests", ["FindApiTests", "express:test", "waitServer", "exec", "simplemocha:api"]);
+    grunt.registerTask("unittests", ["simplemocha:unit"]);
 };

app/controllers/apikeys.js

@@ -1,8 +1,8 @@
-var _ = require('lodash');
-var mongoose = require('mongoose');
+const _ = require('lodash');
+const mongoose = require('mongoose');
 
-var User = mongoose.model('User');
-var ApiKey = mongoose.model('ApiKey');
+const User = mongoose.model('User');
+const ApiKey = mongoose.model('ApiKey');
 
 module.exports = {
   keys: (req, res) => {
@@ -38,7 +38,7 @@ module.exports = {
         return res.status(401).send({ message: error });
       }
 
-      return res.send({ ok: ok });
+      return res.send({ ok });
     });
   },
 };