Fixes various failing tests.

lyslys34 · Sep 10, 2013 · b580f71 · b580f71
1 parent 41890f2
commit b580f71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/app/load.js b/lib/app/load.js
@@ -182,7 +182,9 @@ module.exports = function (sails) {
 						}
 						cb(err);
 					});
-				}, function hooksInitialized (err){ cb(err, postponedHooks); });
+				}, function hooksInitialized (err){
+					cb(null, postponedHooks);
+				});
 			},
 
 			resumePostponed: ['initialize', function resumePostponedHooks (cb, results) {

diff --git a/test/cli/integration/lift.test.js b/test/cli/integration/lift.test.js
@@ -100,9 +100,9 @@ describe('Starting sails server with lift', function() {
 							process.chdir('../');
 							done();
 						});
-					},1000)
+					},1000);
 				}
-			})
+			});
 		});
 	});
 
@@ -116,6 +116,7 @@ describe('Starting sails server with lift', function() {
 		it('--prod and --dev should throw an error', function(done) {
 
 			// Move into app directory
+			console.log('AP NAME: ', appName);
 			process.chdir(appName);
 
 			sailsServer = spawn(sailsBin, ['lift', '--dev', '--prod']);