Merge pull request #193 from Polymer/wct1

Switch completely over to web-component-tester
googlearchive · Oct 3, 2014 · 2131874 · 2131874
2 parents f4572ef + 89bb9ef
commit 2131874
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 77 deletions.
diff --git a/bower.json b/bower.json
@@ -9,7 +9,6 @@
     "observe-js": "Polymer/observe-js#master"
   },
   "devDependencies": {
-    "tools": "Polymer/tools#master",
     "web-component-tester": "Polymer/web-component-tester#^0.5.1"
   },
   "license": "BSD",

diff --git a/conf/karma.conf.js b/conf/karma.conf.js
diff --git a/conf/mocha.conf.js b/conf/mocha.conf.js
diff --git a/gruntfile.js b/gruntfile.js
@@ -8,17 +8,13 @@
 module.exports = function(grunt) {
 
   grunt.initConfig({
-    karma: {
-      options: {
-        configFile: 'conf/karma.conf.js',
-        keepalive: true
+    'wct-test': {
+      local: {
+        options: {remote: false},
       },
-      buildbot: {
-        reporters: ['crbot'],
-        logLevel: 'OFF'
+      remote: {
+        options: {remote: true},
       },
-      TemplateBinding: {
-      }
     },
     concat: {
       modules: {
@@ -30,10 +26,11 @@ module.exports = function(grunt) {
   });
 
   grunt.loadTasks('../tools/tasks');
-  grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('web-component-tester');
 
   grunt.registerTask('default', 'concat');
-  grunt.registerTask('test', ['override-chrome-launcher', 'karma:TemplateBinding']);
-  grunt.registerTask('test-buildbot', ['override-chrome-launcher', 'karma:buildbot']);
+  grunt.registerTask('test', ['wct-test:local']);
+  grunt.registerTask('test-remote', ['wct-test:remote']);
+  grunt.registerTask('test-buildbot', ['wct-test:local']);
 };
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/package.json b/package.json
@@ -18,19 +18,8 @@
   "license": "Apache License 2.0",
   "gitHead": "cdd89f1fb6273ede781c9e00a512720df1adffff",
   "devDependencies": {
-    "chai": "*",
     "grunt": "*",
     "grunt-contrib-concat": "~0.3.0",
-    "grunt-karma": "*",
-    "karma": "~0.12",
-    "karma-mocha": "*",
-    "karma-firefox-launcher": "*",
-    "gulp": "^3.8.7",
-    "karma-ie-launcher": "*",
-    "karma-mocha": "*",
-    "karma-safari-launcher": "*",
-    "karma-script-launcher": "*",
-    "mocha": ">=1.9",
-    "web-component-tester": "^0.5.1"
+    "web-component-tester": "^1.0.0"
   }
 }
diff --git a/tests/index.html → test/index.html b/tests/index.html → test/index.html
diff --git a/tests/tests.js → test/tests.js b/tests/tests.js → test/tests.js