Use WCT 4

Fix travis for building on modern node Fix Template HTMLImports loading dependence in wct 4
2026-03-10 08:51:22 +00:00 · 2015-12-15 15:26:57 -08:00
parent 698e8e429d
commit 3efad399c0
5 changed files with 16 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,15 @@
 language: node_js
 sudo: false
-node_js: 4
+node_js: stable
 addons:
  firefox: latest
  apt:
    sources:
    - google-chrome
+    - ubuntu-toolchain-r-test
    packages:
    - google-chrome-stable
-before_script:
- export PATH=$PWD/node_modules/.bin:$PATH
+    - g++-4.8
 script:
 - xvfb-run wct
 - "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
@@ -17,3 +17,4 @@ env:
  global:
  - secure: c0kVrjNDtqd06Gyg4Xi3iopr0KCz1k0LbZeL+TCbnyCdmAE7m9FcJASWvM2Zr7d774hTiMSi0Z79SlV6XZhLN2pi4EsbdEpsnVeAXXH/GYzDKgpXbdfD/nQv4n1nMXL6XSaZkAX7WwgmrjzJ9cXQJYV9vNHIBRcGoVRRyCFx9v4=
  - secure: Mo+AVRGUmlDENnZ2GioF5pU62WhyLUMnPlSqzeodZzJoAnwcNr9VnHiRCgQBLnHCZwjbMv6C0vhWopY7lN9w77vlS5vr8MDZKjYT/YRl9jk0+hStJ+diSS9MD+FnNNerXe+V+WA6NYVHno3vdWRqDDMYzCdH/pyLukkuKdMFaAU=
+  - CXX=g++-4.8
--- a/bower.json
+++ b/bower.json
@@ -16,6 +16,6 @@
  "license": "BSD",
  "ignore": [],
  "devDependencies": {
-    "web-component-tester": "3.4"
+    "web-component-tester": "^4.0.1"
  }
 }
--- a/package.json
+++ b/package.json
@@ -15,6 +15,9 @@
  "bugs": {
    "url": "https://github.com/webcomponents/webcomponentsjs/issues"
  },
+  "scripts": {
+    "test": "wct"
+  },
  "homepage": "http://webcomponents.org",
  "devDependencies": {
    "gulp": "^3.8.8",
@@ -23,6 +26,6 @@
    "gulp-header": "^1.1.1",
    "gulp-uglify": "^1.0.1",
    "run-sequence": "^1.0.1",
-    "web-component-tester": "^3"
+    "web-component-tester": "^4.0.1"
  }
 }
--- a/tests/HTMLImports/runner.html
+++ b/tests/HTMLImports/runner.html
@@ -14,7 +14,6 @@
 <!-- HTMLImports -->
 <script>
  WCT = {
-    environmentImports: [],
    waitFor: function(callback) {
      this.HTMLImports.whenReady(callback);
    }
--- a/tests/Template/imports.html
+++ b/tests/Template/imports.html
@@ -13,6 +13,13 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    <title>Template with HTMLImports Test</title>
    <script src="../../src/Template/Template.js"></script>
    <script src="../../src/HTMLImports/HTMLImports.js"></script>
+    <script>
+      WCT = {
+        waitFor: function(callback) {
+          this.HTMLImports.whenReady(callback);
+        }
+      };
+    </script>
    <script src="../../../web-component-tester/browser.js"></script>
  </head>
  <body>