Moved tests into Browserify bundle (temporarily)

jamesshore · jamesshore · commit 2ca05da2d8b1 · 2013-05-21T14:53:45.000-07:00
diff --git a/Jakefile.js b/Jakefile.js
@@ -88,7 +88,10 @@
 		console.log("Bundling client files with Browserify...");
 		var b = browserify([
 			"./src/client/client.js",
-			"./src/client/html_element.js"
+			"./src/client/html_element.js",
+			"./src/client/_svg_canvas_test.js",
+			"./src/client/_client_test.js",
+			"./src/client/_html_element_test.js"
 //			"./src/client/vendor/jquery-1.8.2.js",
 //			"./src/client/vendor/raphael-2.1.0.js"
 		]);
diff --git a/build/karma.conf.js b/build/karma.conf.js
@@ -13,8 +13,7 @@ files = [
 	"node_modules/expect.js/expect.js",
 	"generated/build/client/vendor/jquery-1.8.2.js",
 	"generated/build/client/vendor/raphael-2.1.0.js",
-	"generated/build/client/bundle.js",
-	"src/client/_*_test.js"
+	"generated/build/client/bundle.js"
 ];
 
 
diff --git a/todo.txt b/todo.txt
@@ -22,14 +22,15 @@ Engineering Tasks:
   - Use Modernizr to eliminate duplicate browserSupportsTouchEvents() function (in _client_test.js & _dom_element_test.js)
 
 To Do on current task:
-- Incrementally migrate our code from wwp global to browserify's require() calls
 - Get tests working with require()
 - Get index.html working with require()
 - Figure out how to bundle vendor files
 - What about deployment? (Punt?)
 - Duplication between weewikipaint.js CONTENT_DIR and our Jakefile
 - Do we want to copy src/server/ files to build directory?
 - Fix Karma error messages using source maps
+- Unbundle tests from production code
+  - Deal with 'can't find describe()' error in smoke test
 
 
 Future ideas:
