Fix wct/browser.js load order, simplify travis config

2026-03-10 08:51:22 +00:00 · 2015-10-23 14:28:57 -07:00
parent 610b11a6ae
commit ef97843756
33 changed files with 36 additions and 42 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 matrix:
  include:
  - node_js: stable
-    script: xvfb-run -a wct --simpleOutput
+    script: xvfb-run wct
    addons:
      firefox: latest
      apt:
@@ -15,7 +15,7 @@ matrix:
    script:
    - |
      if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
-        wct --simpleOutput -s 'Windows 10/microsoftedge' -s 'Windows 8.1/internet explorer@11' -s 'Windows 7/internet explorer@10' -s 'OS X 10.10/safari@8' -s 'OS X 10.9/safari@7'
+        wct -s 'default'
      fi
 before_script:
 - export PATH=$PWD/node_modules/.bin:$PATH
--- a/tests/CustomElements/html/attributes.html
+++ b/tests/CustomElements/html/attributes.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>Custom Elements: attributes</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/CustomElements/CustomElements.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>
    <script>
--- a/tests/CustomElements/html/customevent-detail.html
+++ b/tests/CustomElements/html/customevent-detail.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>CustomEvent detail test</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/CustomElements/CustomElements.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>
    <script>
--- a/tests/CustomElements/html/imports.html
+++ b/tests/CustomElements/html/imports.html
@@ -19,7 +19,6 @@
        }
      };
    </script>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script>
      HTMLImports = {};

@@ -42,6 +41,7 @@
      });
    </script>
    <script src="../../../src/CustomElements/CustomElements.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
    <script>
      (function() {
        var proto = Object.create(HTMLElement.prototype);
--- a/tests/CustomElements/html/shadowdom.html
+++ b/tests/CustomElements/html/shadowdom.html
@@ -11,11 +11,11 @@
 <html>
 <head>
  <title>Custom Elements: shadowdom integration</title>
-  <script src="../../../../web-component-tester/browser.js"></script>
  <script>
    hasShadowDOM = Boolean(Element.prototype.createShadowRoot);
  </script>
  <script src="../../../src/CustomElements/CustomElements.js"></script>
+  <script src="../../../../web-component-tester/browser.js"></script>
 </head>
 <body>
  <x-host></x-host>
--- a/tests/CustomElements/html/throttled-attached.html
+++ b/tests/CustomElements/html/throttled-attached.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>Custom Elements: throttle attached</title>
-  <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/CustomElements/CustomElements.js?wc-throttle-attached"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>
    <script>
--- a/tests/CustomElements/html/upgrade-dcl.html
+++ b/tests/CustomElements/html/upgrade-dcl.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>Custom Elements: upgrade order</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/CustomElements/CustomElements.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>
    <script>
--- a/tests/CustomElements/html/upgrade-order.html
+++ b/tests/CustomElements/html/upgrade-order.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>Custom Elements: upgrade order</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/CustomElements/CustomElements.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>
    <script>
--- a/tests/CustomElements/runner.html
+++ b/tests/CustomElements/runner.html
@@ -11,8 +11,8 @@
 <title>CustomElements Tests</title>
 <meta charset="utf-8">

-<script src="../../../web-component-tester/browser.js"></script>
 <script src="../../src/CustomElements/CustomElements.js"></script>
+<script src="../../../web-component-tester/browser.js"></script>

 <script>
  WCT.loadSuites([
--- a/tests/HTMLImports/html/HTMLImports.html
+++ b/tests/HTMLImports/html/HTMLImports.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>HTML Imports Test</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
    <link rel="import" href="imports/import-1.html">
  </head>
  <body>
--- a/tests/HTMLImports/html/HTMLImportsLoaded-native.html
+++ b/tests/HTMLImports/html/HTMLImportsLoaded-native.html
@@ -12,8 +12,8 @@
  <head>
    <title>HTMLImportsLoaded, native</title>
    <script>WCT = {waitFor: function(cb){ cb() }}</script>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>
    <link rel="import" href="imports/import-1.html">
--- a/tests/HTMLImports/html/csp.html
+++ b/tests/HTMLImports/html/csp.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>parser Test</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>

    <meta http-equiv='Content-Security-Policy' content="script-src 'self';">
    <link rel="import" href="imports/csp-import-1.html">
--- a/tests/HTMLImports/html/currentScript.html
+++ b/tests/HTMLImports/html/currentScript.html
@@ -12,8 +12,8 @@
  <head>
    <title>_currentScript Test</title>
    <script>WCT = {waitFor: function(cb){cb()}};</script>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
    <link rel="import" href="imports/script-1.html">
    <script src="imports/current-script.js"></script>
  </head>
--- a/tests/HTMLImports/html/customevent-detail.html
+++ b/tests/HTMLImports/html/customevent-detail.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>CustomEvent detail test</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>
    <script>
--- a/tests/HTMLImports/html/dedupe.html
+++ b/tests/HTMLImports/html/dedupe.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>HTML dedupe Test</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
    <link rel="import" href="imports/dedupe.html">
    <script>
      var link = document.createElement('link');
--- a/tests/HTMLImports/html/dynamic-all-imports-detail.html
+++ b/tests/HTMLImports/html/dynamic-all-imports-detail.html
@@ -19,8 +19,8 @@
        }
      };
    </script>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>

--- a/tests/HTMLImports/html/dynamic-errors-detail.html
+++ b/tests/HTMLImports/html/dynamic-errors-detail.html
@@ -19,8 +19,8 @@
        }
      };
    </script>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>

--- a/tests/HTMLImports/html/dynamic-loaded-detail.html
+++ b/tests/HTMLImports/html/dynamic-loaded-detail.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>HTML Imports Dynamic</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>

--- a/tests/HTMLImports/html/dynamic.html
+++ b/tests/HTMLImports/html/dynamic.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>HTML Imports Dynamic</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
  </head>
  <body>

--- a/tests/HTMLImports/html/encoding.html
+++ b/tests/HTMLImports/html/encoding.html
@@ -12,8 +12,8 @@
 <head>
  <meta charset="UTF-8">
  <title></title>
-  <script src="../../../../web-component-tester/browser.js"></script>
  <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+  <script src="../../../../web-component-tester/browser.js"></script>
  <link rel="import" href="imports/encoding-import.html">
 </head>
 <body>
--- a/tests/HTMLImports/html/load-404.html
+++ b/tests/HTMLImports/html/load-404.html
@@ -14,8 +14,8 @@
    <script>
      WCT = {waitFor: function(cb){cb()}};
    </script>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
    <script>
      var errors = 0;
      function errorHandler() {
--- a/tests/HTMLImports/html/load-loop.html
+++ b/tests/HTMLImports/html/load-loop.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>load loop Test</title>
-    <script src="../../../../web-component-tester/browser.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
    <script>var loaded = [];</script>
    <link rel="import" href="imports/load-a.html">
  </head>
--- a/tests/HTMLImports/html/template-script.html
+++ b/tests/HTMLImports/html/template-script.html
@@ -11,21 +11,19 @@
 <html>
  <head>
    <title>template script test</title>
-    <script src="../../tools/htmltest.js"></script>
-    <script src="../../tools/chai/chai.js"></script>
    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+    <script src="../../../../web-component-tester/browser.js"></script>
    <link rel="import" href="imports/template-import.html">
  </head>
  <body>
    <script>
-      addEventListener('HTMLImportsLoaded', function() {
+      test('scripts inside templates execute', function() {
        var link = document.querySelector('link');
        var template = link.import.querySelector('template');
        chai.assert.ok(template, 'found import template');
        var content = template.content || template;
        document.body.appendChild(content.cloneNode(true));
        chai.assert.ok(window.executedTemplateScript, 'executedTemplateScript');
-        done();
      });
    </script>
  </body>
--- a/tests/HTMLImports/runner.html
+++ b/tests/HTMLImports/runner.html
@@ -19,8 +19,8 @@
    }
  };
 </script>
-<script src="../../bower_components/web-component-tester/browser.js"></script>
 <script src="../../src/HTMLImports/HTMLImports.js"></script>
+<script src="../../bower_components/web-component-tester/browser.js"></script>
 <script>
  var suites = [
  'html/HTMLImports.html',
@@ -40,6 +40,7 @@
  'html/csp.html',
  'html/customevent-detail.html',
  'html/encoding.html',
+  'html/template-script.html',
  'html/HTMLImportsLoaded-native.html',
  ];
  // NOTE: The MO polyfill does not function on disconnected documents
--- a/tests/ShadowDOM/html/document-body-inner-html.html
+++ b/tests/ShadowDOM/html/document-body-inner-html.html
@@ -8,9 +8,8 @@
    Code distributed by Google as part of the polymer project is also
    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<script src="../../../../web-component-tester/browser.js"></script>
-
 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
+<script src="../../../../web-component-tester/browser.js"></script>
 <script>

 var assert = chai.assert;
--- a/tests/ShadowDOM/html/document-body-shadow-root.html
+++ b/tests/ShadowDOM/html/document-body-shadow-root.html
@@ -8,9 +8,8 @@
    Code distributed by Google as part of the polymer project is also
    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<script src="../../../../web-component-tester/browser.js"></script>
-
 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
+<script src="../../../../web-component-tester/browser.js"></script>
 <script>

 var assert = chai.assert;
--- a/tests/ShadowDOM/html/document-write.html
+++ b/tests/ShadowDOM/html/document-write.html
@@ -8,9 +8,8 @@
    Code distributed by Google as part of the polymer project is also
    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<script src="../../../../web-component-tester/browser.js"></script>
-
 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
+<script src="../../../../web-component-tester/browser.js"></script>
 <a></a><script>
 var assert = chai.assert;
 var wrap = ShadowDOMPolyfill.wrap;
--- a/tests/ShadowDOM/html/full-suite.html
+++ b/tests/ShadowDOM/html/full-suite.html
@@ -10,8 +10,8 @@
 -->
 <title>Full ShadowDOM suite</title>
 <meta charset="utf-8">
-<script src="../../../../web-component-tester/browser.js"></script>
 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
+<script src="../../../../web-component-tester/browser.js"></script>

 <script>
  // common utils
--- a/tests/ShadowDOM/html/head-then-body.html
+++ b/tests/ShadowDOM/html/head-then-body.html
@@ -8,8 +8,8 @@
    Code distributed by Google as part of the polymer project is also
    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<script src="../../../../web-component-tester/browser.js"></script>
 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
+<script src="../../../../web-component-tester/browser.js"></script>
 <head>
 <script>

--- a/tests/ShadowDOM/html/on-load-test.html
+++ b/tests/ShadowDOM/html/on-load-test.html
@@ -15,9 +15,9 @@
    }
  };
 </script>
-<script src="../../../../web-component-tester/browser.js"></script>

 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
+<script src="../../../../web-component-tester/browser.js"></script>
 <script>

 var wrap = ShadowDOMPolyfill.wrap;
--- a/tests/ShadowDOM/html/on-unload-test.html
+++ b/tests/ShadowDOM/html/on-unload-test.html
@@ -8,9 +8,8 @@
    Code distributed by Google as part of the polymer project is also
    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<script src="../../../../web-component-tester/browser.js"></script>
-
 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
+<script src="../../../../web-component-tester/browser.js"></script>
 <script>
 // Note: this test will navigate away from the page. It is designed to be run
 // in an iframe. Use ShadowDOM/test/runner.html?grep=unload for running it by
--- a/tests/Template/tests.html
+++ b/tests/Template/tests.html
@@ -11,8 +11,8 @@
 <html>
  <head>
    <title>Template Test</title>
-    <script src="../../../web-component-tester/browser.js"></script>
    <script src="../../src/Template/Template.js"></script>
+    <script src="../../../web-component-tester/browser.js"></script>
  </head>
  <body>
    <template>
--- a/wct.conf.json
+++ b/wct.conf.json
@@ -1,4 +1,3 @@
 {
-  "suites": ["tests/runner.html"],
-  "expanded": "true"
+  "suites": ["tests/runner.html"]
 }