use a travis build matrix

paulryanclark · Feb 26, 2014 · 6cbe83a · 6cbe83a
1 parent 061b6da
commit 6cbe83a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,3 +5,19 @@ notifications:
 language: node_js
 node_js:
   - '0.10'
+env:
+  matrix:
+    -BUNDLE="ember=1.2.0&jQuery=1.10.1"
+    -BUNDLE="ember=1.2.1&jQuery=1.10.1"
+    -BUNDLE="ember=1.2.2&jQuery=1.10.1"
+    -BUNDLE="ember=1.3.0&jQuery=1.10.1"
+    -BUNDLE="ember=1.3.1&jQuery=1.10.1"
+    -BUNDLE="ember=1.3.2&jQuery=1.10.1"
+    -BUNDLE="ember=1.2.0&jQuery=2.0.2"
+    -BUNDLE="ember=1.2.1&jQuery=2.0.2"
+    -BUNDLE="ember=1.2.2&jQuery=2.0.2"
+    -BUNDLE="ember=1.3.0&jQuery=2.0.2"
+    -BUNDLE="ember=1.3.1&jQuery=2.0.2"
+    -BUNDLE="ember=1.3.2&jQuery=2.0.2"
+    -BUNDLE="ember=1.4.0&jQuery=1.11.0"
+    -BUNDLE="ember=1.4.0&jQuery=2.1.0"
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -34,14 +34,7 @@ module.exports = function(grunt) {
     'jshint',
     'build_tests',
     'connect:dev',
-    'qunit:default'
-  ]);
-
-  this.registerTask('ci', 'Executes the tests on the ci server', [
-    'jshint',
-    'build_tests',
-    'connect:dev',
-    'qunit:ci'
+    'qunit'
   ]);
 
   this.registerTask('docs', 'Builds the documentation', [
@@ -199,35 +192,14 @@ module.exports = function(grunt) {
     clean: ['dist', 'tmp', 'docs/build'],
 
     qunit: {
-      default: {
-        options: {
-          urls: [
-            'http://localhost:8000/test/index.html'
-          ]
-        }
-      },
-      ci: {
+      all: {
         options: {
-          urls: function() {
+          urls: function(process) {
+            var bundle = process.env.BUNDLE || '';
             return [
-              'ember=1.2.0&jQuery=1.10.1',
-              'ember=1.2.1&jQuery=1.10.1',
-              'ember=1.2.2&jQuery=1.10.1',
-              'ember=1.3.0&jQuery=1.10.1',
-              'ember=1.3.1&jQuery=1.10.1',
-              'ember=1.3.2&jQuery=1.10.1',
-              'ember=1.2.0&jQuery=2.0.2',
-              'ember=1.2.1&jQuery=2.0.2',
-              'ember=1.2.2&jQuery=2.0.2',
-              'ember=1.3.0&jQuery=2.0.2',
-              'ember=1.3.1&jQuery=2.0.2',
-              'ember=1.3.2&jQuery=2.0.2',
-              'ember=1.4.0&jQuery=1.11.0',
-              'ember=1.4.0&jQuery=2.1.0'
-            ].map(function(bundle) {
-              return ('http://localhost:8000/test/index.html?' + bundle);
-            });
-          }()
+              'http://localhost:8000/test/index.html?' + bundle
+            ]
+          }(process)
         }
       }
     },