diff --git a/.travis.yml b/.travis.yml index 6d12680a1..4592b095c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ matrix: firefox: latest env: - TEST_COMMAND="xvfb-run npm run test:integration" - - SKIP_REMOTE_BROWSERS=true - node_js: '9' addons: @@ -55,3 +54,4 @@ matrix: sauce_connect: true env: - TEST_COMMAND="xvfb-run npm run test:integration" + - WCT_SAUCE=true diff --git a/packages/esm-amd-loader/test/package.json b/packages/esm-amd-loader/test/package.json index db2c1cf4f..2990f0390 100644 --- a/packages/esm-amd-loader/test/package.json +++ b/packages/esm-amd-loader/test/package.json @@ -7,7 +7,7 @@ "clean": "rm -rf lib/", "lint": "tslint --project . --format stylish", "build": "npm run clean && tsc", - "test:wct": "npm run lint && npm run build && wct" + "test:wct": "npm run lint && npm run build && bash run-wct.sh" }, "devDependencies": { "@polymer/esm-amd-loader": "^1.0.0", diff --git a/packages/esm-amd-loader/test/run-wct.sh b/packages/esm-amd-loader/test/run-wct.sh new file mode 100755 index 000000000..5be20925a --- /dev/null +++ b/packages/esm-amd-loader/test/run-wct.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +if [ -n "$WCT_SAUCE" ]; then + npx wct --plugin local --plugin sauce +else + npx wct --plugin local +fi diff --git a/packages/esm-amd-loader/test/wct.conf.json b/packages/esm-amd-loader/test/wct.conf.json index 03117ef55..44c163e5b 100644 --- a/packages/esm-amd-loader/test/wct.conf.json +++ b/packages/esm-amd-loader/test/wct.conf.json @@ -3,5 +3,31 @@ "moduleResolution": "node", "suites": [ "static/**/*.html" - ] + ], + "plugins": { + "local": { + "disabled": false, + "browsers": ["all"] + }, + "sauce": { + "disabled": true, + "browsers": [ + { + "browserName": "internet explorer", + "platform": "Windows 8.1", + "version": "11" + }, + { + "browserName": "microsoftedge", + "platform": "Windows 10", + "version": "latest" + }, + { + "browserName": "safari", + "platform": "OS X 10.13", + "version": "latest" + } + ] + } + } } diff --git a/packages/web-component-tester/test/integration/browser.ts b/packages/web-component-tester/test/integration/browser.ts index f4d11fae4..d8fc75c83 100644 --- a/packages/web-component-tester/test/integration/browser.ts +++ b/packages/web-component-tester/test/integration/browser.ts @@ -49,8 +49,12 @@ function loadOptionsFile(dir: string): config.Config { const testLocalBrowsers = !process.env.SKIP_LOCAL_BROWSERS; const testLocalBrowsersList = parseList(process.env.TEST_LOCAL_BROWSERS); -const testRemoteBrowsers = !process.env.SKIP_REMOTE_BROWSERS && - process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY; +const testRemoteBrowsers = process.env.WCT_SAUCE; +if (testRemoteBrowsers && + !(process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY)) { + throw new Error( + 'Must set SAUCE_USERNAME and SAUCE_ACCESS_KEY when WCT_SAUCE is set.'); +} const testRemoteBrowsersList = parseList(process.env.TEST_REMOTE_BROWSERS); if (testRemoteBrowsersList.length === 0) { testRemoteBrowsersList.push('default');