Updated unit tests to run off of the combined NEXT source.

Author: wdamien

.gitignore

@@ -17,3 +17,5 @@ docs/**/
 main.css
 *.codekit
 *.sass-cache
+tests/.grunt
+_SpecRunner.html

tests/Gruntfile.js

@@ -1,70 +1,88 @@
 module.exports = function (grunt) {
 	grunt.initConfig(
-		{
-			pkg: grunt.file.readJSON('package.json'),
+			{
+				pkg: grunt.file.readJSON('package.json'),
 
-			jasmine: {
-				run: {
-					src: [
-						'../lib/preloadjs-0.4.1.combined.js'
-					],
-					options: {
-						specs: 'spec/*Spec.js',
-						helpers: []
-					}
-				}
-			},
-
-			connect: {
-				server: {
-					options: {
-						keepalive: true,
-						base: ['../_assets/', '../lib/', '../', './'],
-						middleware: function (connect, options, middlewares) {
-							middlewares.unshift(function echo(req, res, next) {
-								if (req.method == "POST") {
-									res.end(JSON.stringify(req.body));
-								} else {
-									next();
-								}
-							});
+				jasmine: {
+					run: {
+						src: [
+							'../lib/preloadjs-NEXT.combined.js',
+							'../lib/movieclip-NEXT.combined.js'
+						],
 
-							var bodyParser = require('body-parser')
-							middlewares.unshift(bodyParser.json());
-							middlewares.unshift(bodyParser.urlencoded({
-							  extended: true
-							}));
-
-							return middlewares;
-						},
+						options: {
+							specs: 'spec/*Spec.js',
+							helpers: [
+								'spec/Helpers.js'
+							],
+							vendor: [
+								'../_assets/libs/easeljs-NEXT.min.js',
+								'../_assets/libs/preloadjs-NEXT.min.js'
+							],
+							host: 'http://127.0.0.1:<%=connect.serve.options.port%>/'
+						}
 					}
-				}
-			},
+				},
 
-			findopenport: {
 				connect: {
-					options: {
-						ports: [8000, 8888, 9000, 9999, 9001, 8001],
-						configName: "connect.server.options.port"
+					serve: {
+						options: {
+							keepalive: true,
+							base: [
+								{
+									path: __dirname,
+									options: {
+										index: '_SpecRunner.html'
+									}
+								}, '..', '../_assets/', '../lib/', './'
+							],
+							useAvailablePort: true,
+							port: 8000,
+							open: true,
+							// Used to test the POST functionality, it just echo's back what data was sent.
+							middleware: function (connect, options, middlewares) {
+								middlewares.unshift(function echo (req, res, next) {
+									if (req.method == "POST") {
+										res.end(JSON.stringify(req.body));
+									} else {
+										next();
+									}
+								});
+								var bodyParser = require('body-parser')
+								middlewares.unshift(bodyParser.json());
+								middlewares.unshift(bodyParser.urlencoded({
+									extended: true
+								}));
+
+								return middlewares;
+							},
+						}
 					}
-				}
-			},
+				},
 
-			listips: {
-				run: {
-					options: {
-						port: "<%=connect.server.options.port %>",
-						label: "Normal"
+				listips: {
+					run: {
+						options: {
+							label: "Normal"
+						}
 					}
 				}
 			}
-		}
 	);
 
+	grunt.registerTask('configureConnectHeadless', function () {
+		grunt.config('connect.serve.options.keepalive', false);
+		grunt.config('connect.serve.options.open', false);
+	});
+
 	// Load all the tasks we need
 	grunt.loadNpmTasks('grunt-contrib-jasmine');
 	grunt.loadNpmTasks('grunt-contrib-connect');
 	grunt.loadTasks('tasks/');
 
-	grunt.registerTask("default", ["findopenport", "listips", "connect"]);
+	grunt.registerTask("default", "Launches browser-based tests", "serve");
+	grunt.registerTask("serve", "Launches browser-based tests", ["listips", "connect"]);
+
+	grunt.registerTask("headless", "phantom");
+	grunt.registerTask("phantom", "Launches phantom-based tests", ["configureConnectHeadless", "connect", "jasmine"]);
 };

tests/index.html

@@ -7,8 +7,8 @@
   "devDependencies": {
     "body-parser": "^1.9.2",
     "grunt": "~0.4.5",
-    "grunt-contrib-connect": "^0.8.0",
-    "grunt-contrib-jasmine": "^0.8.1"
+    "grunt-contrib-connect": "^0.9.0",
+    "grunt-contrib-jasmine": "^0.8.2"
   },
   "engine": "node >= 0.10.22"
 }