Skip to content

Commit

Permalink
Turn off grunt in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
sgress454 committed Feb 15, 2016
1 parent 2560f26 commit 8fc8053
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
2 changes: 2 additions & 0 deletions test/integration/helpers/appHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ module.exports.lift = function(options, callback) {
port: 1342,
environment: process.env.TEST_ENV
});
options.hooks = options.hooks || {};
options.hooks.grunt = options.hooks.grunt || false;

Sails().lift(options, function(err, sails) {
if (err) return callback(err);
Expand Down
6 changes: 3 additions & 3 deletions test/integration/middleware.compression.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('middleware :: ', function() {
port: 1535,
environment: 'production',
log: {level: 'silent'},
hooks: {session: false},
hooks: {session: false, grunt: false},
routes: {
'/test': function(req, res) {
res.send(lipsum);
Expand Down Expand Up @@ -50,7 +50,7 @@ describe('middleware :: ', function() {
// unmodified http.IncomingMessage object
response.on('data', function(data) {
rawLen += data.length;
})
});
})
.on('end', function(err) {
assert.equal(res, lipsum);
Expand All @@ -72,7 +72,7 @@ describe('middleware :: ', function() {
port: 1535,
environment: 'development',
log: {level: 'silent'},
hooks: {session: false},
hooks: {session: false, grunt: false},
routes: {
'/test': function(req, res) {
res.send(lipsum);
Expand Down
7 changes: 5 additions & 2 deletions test/integration/middleware.cookieParser.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ describe('middleware :: ', function() {
session: {
secret: 'abc123'
},
hooks: {grunt: false},
routes: {
'/test': function(req, res) {
res.json({
Expand Down Expand Up @@ -76,7 +77,8 @@ describe('middleware :: ', function() {
secret: null
},
hooks: {
session: false
session: false,
grunt: false
},
routes: {
'/test': function(req, res) {
Expand Down Expand Up @@ -133,7 +135,8 @@ describe('middleware :: ', function() {
secret: 12345
},
hooks: {
session: false
session: false,
grunt: false
},
routes: {
'/test': function(req, res) {
Expand Down
2 changes: 2 additions & 0 deletions test/integration/middleware.session.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe('middleware :: ', function() {
session: {
secret: 'abc123'
},
hooks: {grunt: false},
routes: {
'/test': function(req, res) {
var count = req.session.count || 1;
Expand Down Expand Up @@ -91,6 +92,7 @@ describe('middleware :: ', function() {
session: {
secret: 12345
},
hooks: {grunt: false},
routes: {
'/test': function(req, res) {
res.json({
Expand Down

0 comments on commit 8fc8053

Please sign in to comment.