Browse Source

Fix tests

Gaël Métais 7 năm trước cách đây
mục cha
commit
84425e1319

+ 7 - 1
Gruntfile.js

@@ -103,7 +103,7 @@ module.exports = function(grunt) {
                 options: {
                 options: {
                     reporter: 'spec',
                     reporter: 'spec',
                 },
                 },
-                src: ['test/core/contentTypeCheckerTest.js']
+                src: ['test/api/apiTest.js']
             }
             }
         },
         },
         env: {
         env: {
@@ -217,6 +217,10 @@ module.exports = function(grunt) {
         }
         }
     });
     });
 
 
+    // Custom task that sets a variable for tests
+    grunt.registerTask('test-settings', function() {
+        process.env.IS_TEST = true;
+    });
 
 
     grunt.registerTask('icons', [
     grunt.registerTask('icons', [
         'webfont:icons',
         'webfont:icons',
@@ -257,6 +261,7 @@ module.exports = function(grunt) {
     ]);
     ]);
 
 
     grunt.registerTask('test', [
     grunt.registerTask('test', [
+        'test-settings',
         'build',
         'build',
         'express:testSuite',
         'express:testSuite',
         'express:test',
         'express:test',
@@ -265,6 +270,7 @@ module.exports = function(grunt) {
     ]);
     ]);
 
 
     grunt.registerTask('test-current-work', [
     grunt.registerTask('test-current-work', [
+        'test-settings',
         'jshint',
         'jshint',
         'express:testSuite',
         'express:testSuite',
         'express:test-current-work',
         'express:test-current-work',

+ 2 - 1
lib/server/controllers/apiController.js

@@ -6,7 +6,8 @@ var ScreenshotHandler   = require('../../screenshotHandler');
 var RunsQueue           = require('../datastores/runsQueue');
 var RunsQueue           = require('../datastores/runsQueue');
 var RunsDatastore       = require('../datastores/runsDatastore');
 var RunsDatastore       = require('../datastores/runsDatastore');
 var ResultsDatastore    = require('../datastores/resultsDatastore');
 var ResultsDatastore    = require('../datastores/resultsDatastore');
-var serverSettings      = require('../../../server_config/settings.json');
+
+var serverSettings      = (process.env.IS_TEST) ? require('../../../test/fixtures/settings.json') : require('../../../server_config/settings.json');
 
 
 var ApiController = function(app) {
 var ApiController = function(app) {
     'use strict';
     'use strict';

+ 2 - 2
lib/server/middlewares/apiLimitsMiddleware.js

@@ -1,6 +1,6 @@
-var config      = require('../../../server_config/settings.json');
+var config = (process.env.IS_TEST) ? require('../../../test/fixtures/settings.json') : require('../../../server_config/settings.json');
 
 
-var debug       = require('debug')('apiLimitsMiddleware');
+var debug = require('debug')('apiLimitsMiddleware');
 
 
 
 
 var apiLimitsMiddleware = function(req, res, next) {
 var apiLimitsMiddleware = function(req, res, next) {

+ 2 - 2
lib/server/middlewares/authMiddleware.js

@@ -1,6 +1,6 @@
-var config      = require('../../../server_config/settings.json');
+var config = (process.env.IS_TEST) ? require('../../../test/fixtures/settings.json') : require('../../../server_config/settings.json');
 
 
-var debug       = require('debug')('authMiddleware');
+var debug = require('debug')('authMiddleware');
 
 
 
 
 var authMiddleware = function(req, res, next) {
 var authMiddleware = function(req, res, next) {