Merge pull request #190 from Polymer/wct

switch to web-component-tester
googlearchive · Sep 19, 2014 · 8d3161c · 8d3161c
2 parents 3ab4dff + f6dde5d
commit 8d3161c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 50 deletions.
diff --git a/bower.json b/bower.json
@@ -9,7 +9,7 @@
     "observe-js": "Polymer/observe-js#master"
   },
   "devDependencies": {
-    "polymer-test-tools": "Polymer/polymer-test-tools#master"
+    "web-component-tester": "Polymer/web-component-tester#^0.5.1"
   },
   "license": "BSD",
   "private": true,

diff --git a/package.json b/package.json
@@ -31,6 +31,6 @@
     "karma-safari-launcher": "*",
     "karma-script-launcher": "*",
     "mocha": ">=1.9",
-    "web-component-tester": "^0.3.2"
+    "web-component-tester": "^0.5.1"
   }
 }
diff --git a/tests/index.html b/tests/index.html
@@ -11,9 +11,7 @@
 <head>
 <title>TemplateBinding tests</title>
 <meta charset="utf-8">
-<link rel="stylesheet" href="../node_modules/mocha/mocha.css">
-<script src="../node_modules/chai/chai.js"></script>
-<script src="../node_modules/mocha/mocha.js"></script>
+<script src="../../web-component-tester/browser.js"></script>
 <script>
 var parserHasNativeTemplate = function() {
   var div = document.createElement('div');
@@ -26,19 +24,7 @@
 </head>
 <body>
 <script>
-
-mocha.setup({
-  ui: 'tdd',
-  ignoreLeaks: true
-});
-
-var assert = chai.assert;
-
-</script>
-<script src="tests.js"></script>
-<div id="mocha"></div>
-<script>
-mocha.run();
+WCT.loadSuites(['tests.js']);
 </script>
 </body>
 </html>
diff --git a/tests/runner.html b/tests/runner.html
diff --git a/tests/tests.json b/tests/tests.json