Merge pull request #8 from Polymer/fix-tests-for-all-browsers

Fix tests for all browsers
googlearchive · Mar 24, 2015 · 14f2ee1 · 14f2ee1
2 parents 96ced89 + 3ac20f5
commit 14f2ee1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -3,9 +3,10 @@
   "version": "0.0.1",
   "description": "A simple element to fixture DOM for tests.",
   "dependencies": {
-    "webcomponentsjs": "~0.5.3"
+    "webcomponentsjs": "webcomponents/webcomponentsjs#~0.6.0"
   },
   "devDependencies": {
-    "web-component-tester": "*"
+    "web-component-tester": "~2.2.6",
+    "polymer": "polymer/polymer#0.8-preview"
   }
 }
diff --git a/test-fixture.html b/test-fixture.html
@@ -52,7 +52,7 @@
       var fixturedElement;
 
       if (!(fixtureTemplate &&
-            fixtureTemplate instanceof HTMLTemplateElement)) {
+            fixtureTemplate.tagName === 'TEMPLATE')) {
         return;
       }
 

diff --git a/test/index.html b/test/index.html
@@ -11,10 +11,10 @@
   <head>
     <meta charset="utf-8">
 
-    <script src="../bower_components/webcomponentsjs/webcomponents.js"></script>
-    <script src="../bower_components/web-component-tester/browser.js"></script>
+    <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
+    <script src="../../web-component-tester/browser.js"></script>
 
-    <link rel="import" href="../bower_components/polymer/polymer.html">
+    <link rel="import" href="../../polymer/polymer.html">
 
   </head>
   <body>

diff --git a/test/test-fixture.html b/test/test-fixture.html
@@ -67,6 +67,7 @@
     });
 
     it('clones all template fragments within itself', function () {
+      expect(el).to.be.ok;
       expect(document.getElementById('Foo')).to.be.ok;
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,6 +67,7 @@ @@
         });
         it('clones all template fragments within itself', function () {
+          expect(el).to.be.ok;
           expect(document.getElementById('Foo')).to.be.ok;
         });
@@ Expand Down @@