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

cdata · cdata · commit 14f2ee103a51 · 2015-03-24T13:24:11.000-07:00
Fix tests for all browsers
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 number	Diff line change
`@@ -3,9 +3,10 @@`
`3`	`3`	`"version": "0.0.1",`
`4`	`4`	`"description": "A simple element to fixture DOM for tests.",`
`5`	`5`	`"dependencies": {`
`6`		`- "webcomponentsjs": "~0.5.3"`
	`6`	`+ "webcomponentsjs": "webcomponents/webcomponentsjs#~0.6.0"`
`7`	`7`	`},`
`8`	`8`	`"devDependencies": {`
`9`		`- "web-component-tester": "*"`
	`9`	`+ "web-component-tester": "~2.2.6",`
	`10`	`+ "polymer": "polymer/polymer#0.8-preview"`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`var fixturedElement;`
`53`	`53`
`54`	`54`	`if (!(fixtureTemplate &&`
`55`		`- fixtureTemplate instanceof HTMLTemplateElement)) {`
	`55`	`+ fixtureTemplate.tagName === 'TEMPLATE')) {`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`