Fix tests

This commit is contained in:
Gaël Métais
2018-01-17 10:58:02 -06:00
parent 09615f8ec4
commit 84425e1319
4 changed files with 13 additions and 6 deletions
+7 -1
View File
@@ -103,7 +103,7 @@ module.exports = function(grunt) {
options: {
reporter: 'spec',
},
src: ['test/core/contentTypeCheckerTest.js']
src: ['test/api/apiTest.js']
}
},
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', [
'webfont:icons',
@@ -257,6 +261,7 @@ module.exports = function(grunt) {
]);
grunt.registerTask('test', [
'test-settings',
'build',
'express:testSuite',
'express:test',
@@ -265,6 +270,7 @@ module.exports = function(grunt) {
]);
grunt.registerTask('test-current-work', [
'test-settings',
'jshint',
'express:testSuite',
'express:test-current-work',
+2 -1
View File
@@ -6,7 +6,8 @@ var ScreenshotHandler = require('../../screenshotHandler');
var RunsQueue = require('../datastores/runsQueue');
var RunsDatastore = require('../datastores/runsDatastore');
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) {
'use strict';
@@ -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) {
+2 -2
View File
@@ -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) {