test: only include custom-elements-es5-adapter for non-IE11 ES5 tests #…

…66

.travis.yml

@@ -12,3 +12,5 @@ addons:
 script:
   - npm run bower
   - npm run test:ci
+  - npm run test:ci:es5
+  - npm run test:ci:ie11

package.json

@@ -21,8 +21,11 @@
     "lint": "tslint --project origami/tsconfig.json",
     "bower": "bower install",
     "test": "karma start",
+    "test:es5": "ES5=true karma start",
     "test:watch": "karma start --auto-watch --no-single-run --browsers Chrome",
     "test:ci": "CI=true karma start",
+    "test:ci:es5": "ES5=true CI=true karma start",
+    "test:ci:ie11": "IE11=true ES5=true CI=true karma start",
     "precommit": "npm run lint",
     "commitmsg": "validate-commit-msg",
     "commit": "git-cz",

test/karma.conf.js

@@ -1,5 +1,7 @@
 module.exports = function(config) {
   const CI = Boolean(process.env.CI);
+  const ES5 = Boolean(process.env.ES5);
+  const IE11 = Boolean(process.env.IE11);
   const TRAVIS = Boolean(process.env.TRAVIS);
   const COVERAGE = !CI;
 
@@ -15,7 +17,6 @@ module.exports = function(config) {
       require('karma-mocha-reporter')
     ],
     files: [
-      './bower_components/webcomponentsjs/custom-elements-es5-adapter.js',
       './bower_components/webcomponentsjs/webcomponents-loader.js',
       { pattern: './bower_components/**/*', watched: false, included: false, served: true },
       { pattern: './test/karma-shim.js', watched: false }
@@ -57,6 +58,11 @@ module.exports = function(config) {
     }
   };
 
+  if (ES5 && !IE11) {
+    configuration.files.splice(0, 0,
+      './bower_components/webcomponentsjs/custom-elements-es5-adapter.js');
+  }
+
   if (COVERAGE) {
     configuration.plugins.push(require('karma-coverage-istanbul-reporter'));
     configuration.reporters.push('coverage-istanbul');
@@ -75,19 +81,12 @@ module.exports = function(config) {
   if (CI) {
     configuration.plugins.push(require('karma-sauce-launcher'));
     configuration.sauceLabs = {
-      testName: 'Origami Karma',
+      testName: ES5 ? 'Origami Karma (ES5)' : 'Origami Karma',
       startConnect: TRAVIS ? false : true,
       tunnelIdentifier: TRAVIS ? process.env.TRAVIS_JOB_NUMBER : undefined
     };
 
-    // IE11 takes a while and doesn't respond
-    configuration.browserNoActivityTimeout = 5 * 60 * 1000;
     configuration.customLaunchers = {
-      SL_IE_11: {
-        base: 'SauceLabs',
-        browserName: 'internet explorer',
-        version: '11'
-      },
       SL_Chrome: {
         base: 'SauceLabs',
         browserName: 'chrome',
@@ -130,6 +129,19 @@ module.exports = function(config) {
       }
     };
 
+    if (ES5 && IE11) {
+      configuration.sauceLabs.testName += ' (IE11)';
+      // IE11 takes a while and doesn't respond
+      configuration.browserNoActivityTimeout = 5 * 60 * 1000;
+      configuration.customLaunchers = {
+        SL_IE_11: {
+          base: 'SauceLabs',
+          browserName: 'internet explorer',
+          version: '11'
+        }
+      };
+    }
+
     configuration.browsers = Object.keys(configuration.customLaunchers);
     configuration.reporters.push('saucelabs');
   }

test/webpack.test.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 
+const ES5 = Boolean(process.env.ES5);
 const ROOT = path.resolve(__dirname, '..');
 
 function root(args) {
@@ -9,8 +10,7 @@ function root(args) {
 }
 
 const compilerOptions = require(root('tsconfig.json')).compilerOptions;
-// TODO: ES5 and ES6 tests
-compilerOptions.target = 'ES5';
+compilerOptions.target = ES5 ? 'ES5' : 'ES6';
 compilerOptions.module = 'commonjs';
 compilerOptions.declaration = false;
 compilerOptions.silent = true;

tsconfig.json

@@ -16,6 +16,6 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "target": "ES5"
+    "target": "ES6"
   }
 }