Merge pull request #8883 from tschaub/new-ci

New test runner

.travis.yml

@@ -1,17 +0,0 @@
-language: node_js
-node_js:
-- '8'
-cache:
-  directories:
-  - node_modules
-after_success:
-- cat coverage/lcov.info | coveralls
-branches:
-  only:
-  - master
-addons:
-  hosts:
-    - travis.dev
-  jwt:
-    # This is the encrypted SAUCE_ACCESS_KEY
-    secure: bb2Ibzu9RLe6ZlIG7JVcuH7IoLMxa/i3LTM7t8mbsPjVOGs5ycyJ7M9MbvqB/F2EzbeV4XB2c9ufI4TkaLYceY5kdWjfZVN8iasr+GFqKMv1uR4i6bpu8KmHJ+blxwfY1QOQ/cGwEx+fbeycMtpTc3Y3GyXaPlCQLhbZvesMg88=

package.json

@@ -50,7 +50,7 @@
     "clean-css-cli": "4.2.1",
     "copy-webpack-plugin": "^4.4.1",
     "coveralls": "3.0.1",
-    "eslint": "5.0.1",
+    "eslint": "^5.8.0",
     "eslint-config-openlayers": "^11.0.0",
     "expect.js": "0.3.1",
     "front-matter": "^3.0.0",
@@ -61,14 +61,13 @@
     "jquery": "3.3.1",
     "jsdoc": "3.5.5",
     "jsdoc-plugin-typescript": "^1.0.2",
-    "karma": "^3.0.0",
+    "karma": "^3.1.1",
     "karma-chrome-launcher": "2.2.0",
-    "karma-coverage": "^1.1.1",
+    "karma-coverage": "^1.1.2",
     "karma-firefox-launcher": "^1.1.0",
     "karma-mocha": "1.3.0",
-    "karma-sauce-launcher": "1.2.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "4.0.0-beta.0",
+    "karma-webpack": "^4.0.0-rc.2",
     "marked": "0.5.1",
     "mocha": "5.2.0",
     "mustache": "^3.0.0",

test/karma.config.js

@@ -1,7 +1,4 @@
-/* eslint-env node, es6 */
-
 const path = require('path');
-const pkg = require('../package.json');
 
 module.exports = function(karma) {
   karma.set({
@@ -57,7 +54,7 @@ module.exports = function(karma) {
     preprocessors: {
       '**/*.js': ['webpack', 'sourcemap']
     },
-    reporters: ['progress'],
+    reporters: ['dots'],
     webpack: {
       devtool: 'inline-source-map',
       mode: 'development',
@@ -77,56 +74,9 @@ module.exports = function(karma) {
     }
   });
 
-  if (process.env.TRAVIS) {
-    const testName = process.env.TRAVIS_PULL_REQUEST ?
-      `https://github.com/openlayers/openlayers/pull/${process.env.TRAVIS_PULL_REQUEST}` :
-      `${pkg.name}@${pkg.version} (${process.env.TRAVIS_COMMIT})`;
-
-    // see https://wiki.saucelabs.com/display/DOCS/Platform+Configurator
-    // for platform and browserName options (Selenium API, node.js code)
-    const customLaunchers = {
-      SL_Chrome: {
-        base: 'SauceLabs',
-        browserName: 'chrome',
-        version: '62.0'
-      },
-      SL_Firefox: {
-        base: 'SauceLabs',
-        browserName: 'firefox',
-        version: '58'
-      },
-      SL_Edge: {
-        base: 'SauceLabs',
-        platform: 'Windows 10',
-        browserName: 'MicrosoftEdge'
-      },
-      SL_Safari: {
-        base: 'SauceLabs',
-        platform: 'macOS 10.12',
-        browserName: 'safari'
-      }
-    };
+  if (process.env.CIRCLECI) {
     karma.set({
-      sauceLabs: {
-        testName: testName,
-        recordScreenshots: false,
-        startConnect: true,
-        tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
-        username: 'openlayers',
-        accessKey: process.env.SAUCE_ACCESS_KEY,
-        connectOptions: {
-          noSslBumpDomains: 'all',
-          connectRetries: 5
-        }
-      },
-      hostname: 'travis.dev',
-      reporters: ['dots', 'saucelabs'],
-      browserDisconnectTimeout: 10000,
-      browserDisconnectTolerance: 1,
-      captureTimeout: 240000,
-      browserNoActivityTimeout: 240000,
-      customLaunchers: customLaunchers,
-      browsers: Object.keys(customLaunchers),
+      browsers: ['Chrome'],
       preprocessors: {
         '../src/**/*.js': ['coverage']
       },