0.9: Update tests and convert to a single mocha run

package.json

@@ -21,7 +21,7 @@
     "sails": "./bin/sails.js"
   },
   "scripts": {
-    "test": "node test/start.js"
+    "test": "mocha"
   },
   "directories": {
     "lib": "lib"

test/cli/integration/lift.test.js

@@ -84,7 +84,7 @@ describe('Starting sails server with lift', function() {
 			sailsServer.stderr.on('data', function(data){
 				var dataString = data + '';
 				// Server has finished starting up
-				if(dataString.indexOf('Sails lifted') !== -1) {
+				if (dataString.match(/Sails \S+ lifted/)) {
 					setTimeout(function(){
 						request('http://localhost:1337/', function(err, response) {
 							if (err) {

test/cli/integration/new.test.js

@@ -2,6 +2,7 @@ var assert = require('assert');
 var fs = require('fs');
 var wrench = require('wrench');
 var exec = require('child_process').exec;
+var _ = require('lodash');
 
 describe('New app generator', function() {
 	var sailsbin = './bin/sails.js';
@@ -165,13 +166,13 @@ describe('New app generator', function() {
 function checkGeneratedFiles(appName, templateLang) {
 	var expectedFiles = [
 		'.gitignore',
+		'Gruntfile.js',
 		'README.md',
 		'api',
 		'app.js',
 		'assets',
 		'config',
 		'package.json',
-		'public',
 		'views',
 		'api/adapters',
 		'api/controllers',
@@ -183,32 +184,34 @@ function checkGeneratedFiles(appName, templateLang) {
 		'api/models/.gitkeep',
 		'api/policies/authenticated.js',
 		'api/services/.gitkeep',
+		'assets/favicon.ico',
+		'assets/images',
 		'assets/js',
 		'assets/mixins',
+		'assets/robots.txt',
 		'assets/styles',
-		'assets/templates',
+		'assets/images/.gitkeep',
 		'assets/js/.gitkeep',
-		'assets/mixins/normalize.css',
-		'assets/mixins/sails.io.js',
+		'assets/js/sails.io.js',
+		'assets/mixins/socket.io.js',
 		'assets/styles/.gitkeep',
-		'assets/templates/.gitkeep',
+		'config/404.js',
+		'config/500.js',
 		'config/adapters.js',
-		'config/application.js',
-		'config/assets.js',
 		'config/bootstrap.js',
-		'config/io.js',
-		'config/local.ex.js',
+		'config/controllers.js',
+		'config/csrf.js',
 		'config/local.js',
 		'config/locales',
+		'config/log.js',
 		'config/policies.js',
 		'config/routes.js',
 		'config/session.js',
+		'config/sockets.js',
 		'config/views.js',
-		'config/locales/english.js',
-		'public/favicon.ico',
-		'public/images',
-		'public/robots.txt',
-		'public/images/.gitkeep'
+		'config/locales/_what_about_clientside.md',
+		'config/locales/de.js',
+		'config/locales/default.js'
 	];
 
 	// Add template files of the specified language
@@ -257,7 +260,8 @@ function checkGeneratedFiles(appName, templateLang) {
 
 	expectedFiles = JSON.stringify(expectedFiles.concat(templateFiles));
 
-	var files = JSON.stringify(wrench.readdirSyncRecursive(appName));
+	var files = wrench.readdirSyncRecursive(appName);
+	files = _.reject(files, function(f) { return f.match(/^node_modules/) });
 
-	return files === expectedFiles;
+	return JSON.stringify(files) === expectedFiles;
 }

test/config/integration/fixtures/config/io.js → test/config/integration/fixtures/config/sockets.js

@@ -1,5 +1,5 @@
 // Configuration for internal socket.io server
-module.exports.io = {
+module.exports.sockets = {
 // all uncommented configs will be tested
 
   // Setup adapter to use for socket.io MQ (pubsub) store

test/config/integration/load.test.js

@@ -59,7 +59,7 @@ describe('Configs', function () {
   });
 
   it('should load the io configs', function () {
-    var conf = config.io;
+    var conf = config.sockets;
     assert(conf.adapter === 'disk');
     assert(conf.transports[0] === 'websocket');
     assert(conf.origins === '*:1337');

test/mocha.opts

@@ -0,0 +1,4 @@
+--timeout 60000
+--reporter dot
+--ui bdd
+test/**/*.test.js

test/router/integration/helpers/httpHelper.js

@@ -27,7 +27,7 @@ module.exports = {
 			var dataString = data + '';
 
 			// Make request once server has sucessfully started
-			if (dataString.indexOf('http://localhost:1337') !== -1) {
+			if (dataString.match(/Sails \S+ lifted/)) {
 
 				request[method](options, function(err, response) {
 					if (err) callback(err);