test: only launch canary with flags on mac

Polymer · Oct 8, 2013 · 6e09dc9 · 6e09dc9
1 parent dff3e29
commit 6e09dc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -109,6 +109,7 @@ module.exports = function(grunt) {
     pkg: grunt.file.readJSON('package.json')
   });
 
+  grunt.loadTasks('../tools/tasks');
   // plugins
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-yuidoc');
@@ -132,7 +133,7 @@ module.exports = function(grunt) {
   grunt.registerTask('default', ['concat_sourcemap', 'uglify', 'sourcemap_copy:polymer.concat.js.map:polymer.min.js.map', 'audit']);
   grunt.registerTask('minify', ['uglify']);
   grunt.registerTask('docs', ['yuidoc']);
-  grunt.registerTask('test', ['karma:polymer']);
-  grunt.registerTask('test-buildbot', ['karma:buildbot']);
+  grunt.registerTask('test', ['override-chrome-launcher', 'karma:polymer']);
+  grunt.registerTask('test-buildbot', ['override-chrome-launcher', 'karma:buildbot']);
 };
 
diff --git a/package.json b/package.json
@@ -9,7 +9,6 @@
     "grunt-contrib-yuidoc": "*",
     "grunt-karma": "*",
     "karma-mocha": "*",
-		"karma-chrome-launcher": "morethanreal/karma-chrome-launcher",
     "karma-ie-launcher": "*",
     "karma-safari-launcher": "*",
     "karma-script-launcher": "*",