diff --git a/Gruntfile.js b/Gruntfile.js index c72f0f0..90eb3d2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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', diff --git a/lib/server/controllers/apiController.js b/lib/server/controllers/apiController.js index 715a57c..fab7781 100644 --- a/lib/server/controllers/apiController.js +++ b/lib/server/controllers/apiController.js @@ -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'; diff --git a/lib/server/middlewares/apiLimitsMiddleware.js b/lib/server/middlewares/apiLimitsMiddleware.js index cce5df2..7e2c643 100644 --- a/lib/server/middlewares/apiLimitsMiddleware.js +++ b/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) { diff --git a/lib/server/middlewares/authMiddleware.js b/lib/server/middlewares/authMiddleware.js index e5335e6..d7094e2 100644 --- a/lib/server/middlewares/authMiddleware.js +++ b/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) {