Permalink
Browse files

Added makefile and cleaned up the test config

  • Loading branch information...
1 parent 7671589 commit d18d58dd9b4395f9aa04b56b91e212a5d95dac0e @thedersen thedersen committed Jan 21, 2012
Showing with 36 additions and 18 deletions.
  1. +0 −16 buster.js
  2. +14 −0 buster.min.js
  3. +22 −0 makefile
  4. 0 tests/support/default.js
  5. +0 −2 tests/support/noConflict.js
View
@@ -6,25 +6,9 @@ config['Default'] = {
'lib/jquery-1.6.2.js',
'lib/underscore.js',
'lib/backbone.js',
- 'tests/support/default.js',
'backbone.validation.js'
],
tests: [
'tests/**/*.js'
]
};
-
-// config['NoConflict'] = {
-// environment: 'browser',
-// sources: [
-// 'lib/jquery-1.6.2.js',
-// 'lib/underscore.js',
-// 'lib/backbone.js',
-// 'lib/backbone.modelbinding.js',
-// 'tests/support/noConflict.js',
-// 'backbone.validation.js'
-// ],
-// tests: [
-// 'tests/*.js'
-// ]
-// };
View
@@ -0,0 +1,14 @@
+var config = exports;
+
+config['Minified'] = {
+ environment: 'browser',
+ sources: [
+ 'lib/jquery-1.6.2.js',
+ 'lib/underscore.js',
+ 'lib/backbone.js',
+ 'backbone.validation.min.js'
+ ],
+ tests: [
+ 'tests/**/*.js'
+ ]
+};
View
@@ -0,0 +1,22 @@
+default: test
+
+test:
+ buster test
+
+test-min:
+ buster test --config buster.min.js
+
+spec:
+ buster test --reporter specification
+
+capture:
+ open -g http://localhost:1111/capture
+
+minify:
+ uglifyjs -o backbone.validation.min.js backbone.validation.js
+
+install:
+ npm install -g buster
+ npm install -g uglify-js
+
+.PHONY: default test test-min spec capture minify install
No changes.
@@ -1,2 +0,0 @@
-Backbone = Backbone.noConflict();
-_ = _.noConflict();

0 comments on commit d18d58d

Please sign in to comment.