From bd0dffb30e424ca489a2844951ee9f84088ed79e Mon Sep 17 00:00:00 2001
From: web-padawan <serguey.kulikov@gmail.com>
Date: Thu, 26 Apr 2018 12:42:51 +0300
Subject: [PATCH] Run P3 tests in all browsers. Bump node to 8.11

---
 .travis.yml | 11 +++++------
 wct.conf.js | 33 ++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 482f38e..57db701 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: true
 dist: trusty
 language: node_js
-node_js: 8.9
+node_js: 8.11
 
 cache:
   directories:
@@ -12,7 +12,7 @@ addons:
   chrome: stable
 
 before_script:
-  - npm install -g bower
+  - npm install -g bower polymer-cli@next
   - bower install
 
 env:
@@ -21,7 +21,6 @@ env:
 
 script:
   - if [[ "$POLYMER" = "2" ]]; then
-      npm install -g polymer-cli &&
       npm install &&
       gulp lint version:check &&
       polymer lint --rules polymer-2 --input ./src/*.html ./theme/**/*.html &&
@@ -33,15 +32,15 @@ script:
     fi
 
   - if [[ "$POLYMER" = "3" ]]; then
-      npm install -g yarn magi-cli polymer-cli@next &&
+      npm install -g yarn magi-cli &&
       (cd .. && git clone --depth 1 -b vaadin-components git://github.com/web-padawan/polymer-modulizer.git && cd polymer-modulizer && npm link) &&
       rm -rf node_modules &&
       magi p3-convert --out . --import-style=name &&
       yarn install --flat &&
       if [[ "$TRAVIS_EVENT_TYPE" = "pull_request" ]]; then
-        xvfb-run -s '-screen 0 1024x768x24' polymer test --module-resolution=node --npm -l chrome;
+        xvfb-run -s '-screen 0 1024x768x24' polymer test --module-resolution=node --npm;
       else
-        polymer test --module-resolution=node --npm --env saucelabs-p3;
+        polymer test --module-resolution=node --npm --env saucelabs;
       fi;
     fi
 
diff --git a/wct.conf.js b/wct.conf.js
index 6af45ca..18e4c92 100644
--- a/wct.conf.js
+++ b/wct.conf.js
@@ -2,28 +2,33 @@ var envIndex = process.argv.indexOf('--env') + 1;
 var env = envIndex ? process.argv[envIndex] : undefined;
 
 module.exports = {
+  testTimeout: 180 * 1000,
+  verbose: true,
   registerHooks: function(context) {
-    var saucelabsPlatforms = [
-      'Windows 10/chrome@65',
-      'Windows 10/firefox@59',
+    const saucelabsPlatformsMobile = [
       'macOS 10.12/iphone@10.3',
-      'macOS 10.12/ipad@11.0',
-      'Windows 10/microsoftedge@15',
-      'Windows 10/internet explorer@11',
-      'macOS 10.12/safari@11.0',
+      'macOS 10.12/ipad@11.2',
       'macOS 9.3.2/iphone@9.3'
     ];
 
-    var saucelabsPlatformsP3 = [
-      'macOS 10.12/iphone@11.2',
-      'macOS 10.12/ipad@11.2',
+    const saucelabsPlatformsMicrosoft = [
+      'Windows 10/microsoftedge@16',
+      'Windows 10/internet explorer@11'
+    ];
+
+    const saucelabsPlatformsDesktop = [
       'Windows 10/chrome@65',
-      'macOS 10.12/safari@11.0',
       'Windows 10/firefox@59',
-      'Windows 10/microsoftedge@16'
+      'macOS 10.12/safari@11.0'
+    ];
+
+    const saucelabsPlatforms = [
+      ...saucelabsPlatformsMobile,
+      ...saucelabsPlatformsMicrosoft,
+      ...saucelabsPlatformsDesktop
     ];
 
-    var cronPlatforms = [
+    const cronPlatforms = [
       'Android/chrome',
       'Windows 10/chrome@65',
       'Windows 10/firefox@59'
@@ -31,8 +36,6 @@ module.exports = {
 
     if (env === 'saucelabs') {
       context.options.plugins.sauce.browsers = saucelabsPlatforms;
-    } else if (env === 'saucelabs-p3') {
-      context.options.plugins.sauce.browsers = saucelabsPlatformsP3;
     } else if (env === 'saucelabs-cron') {
       context.options.plugins.sauce.browsers = cronPlatforms;
     }