test: only launch canary with flags on mac

googlearchive · Oct 8, 2013 · 75858bd · 75858bd
1 parent b110f42
commit 75858bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -54,10 +54,11 @@ module.exports = function(grunt) {
     }
   });
 
+  grunt.loadTasks('../tools/tasks');
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-contrib-concat');
 
   grunt.registerTask('default', 'concat');
-  grunt.registerTask('test', ['karma:polymer-expressions']);
-  grunt.registerTask('test-buildbot', ['karma:buildbot']);
+  grunt.registerTask('test', ['override-chrome-launcher', 'karma:polymer-expressions']);
+  grunt.registerTask('test-buildbot', ['override-chrome-launcher', 'karma:buildbot']);
 };
diff --git a/package.json b/package.json
@@ -18,7 +18,6 @@
     "grunt": "~0.4.1",
     "grunt-karma": "*",
     "karma-mocha": "*",
-		"karma-chrome-launcher": "morethanreal/karma-chrome-launcher",
     "karma-ie-launcher": "*",
     "karma-safari-launcher": "*",
     "karma-script-launcher": "*",