From 4841f77456939fc39a6fe8f531ed087320a8cc9e Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 11:03:53 +0400 Subject: [PATCH 01/15] SauceLabs integration --- .travis.yml | 6 ++- README.md | 8 +++- karma-ci.conf.js | 95 +++++++++++++++++++++++++++++++++--------------- package.json | 1 - 4 files changed, 77 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74eaa9ef..8e1be81f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,12 @@ node_js: - '4' script: npm run ci-test +addons: + sauce_connect: true env: global: - - secure: PGLnN1ksLylD9BpxnKQymWfi6GpcGUuqkOlEJqA6yJp4oq7itvlPENtDYylVqmD3LM7tgFUk8PJHFsKDBY1d2dK6uqleKVMI0u49vZcAf4uIqDTJh1CEGhEMCZY7tgdLiGyjwSMzh/GqkJWia9hOCWSnpCmZi3gL/aaI46bm1aY= - - secure: E3GeYXyCZO/inAMVX+JZMtiJ2ocSTOkIsuML0tTWbHtd8abtX4hOkXqIlSE5WOqO1LnYX43Qs96iysg+D6S+JUlbESsU2+otl0PBV+cE8KMh23c8bUXCZ6NKAKGXXFTWc1UkeAqv8jeq+TSp2WtyBANXJWhaFNYnGOAN1jcvcUc= + - secure: Zmndw3YPp7JUPHRWfzF6ieqwDqWs4GnKMqXNaPNCcY1D76rH2CGTe6YQHhvNEgIm5UItH39x306TMWjqZfCFUVpAks8AQEigADAMPbgqLg8JG4QVIb1sQiZPiVHJA5Ho6YNB4hqv3fp+D9DWRDIMiLYmWiRD8/hFaow/xkfMyiA= + - secure: jdw+OA04vF8+t+iOkWRfDWexKGVxrjpt8iwkY/CBnmANFQckseLwVrDJyHrjcxQlY7SlkSudMNXizINKJDldPx4BBlt1I6n7441CYQ2KpRqzAQXgLPWy+Ea/lM2QcSfihG/xC8Q30CVfMUTZTZx/6nUlIoeB2eItzy9+KsE9UaU= matrix: - CI=TRAVIS diff --git a/README.md b/README.md index c7ae08cb..bdff15b7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # workfront-api [![NPM version][npm-version-image]][npm-url] [![NPM downloads][npm-downloads-image]][npm-url] [![Apache v2 License][license-image]][license-url] [![Build Status][travis-image]][travis-url] ![BrowserStack Status][browserstack-url] [![Coverage][coveralls-image]][coveralls-url] [![Code Climate][code-climate-image]][code-climate-url] +[![Build Status][saucelabs-badge]]([saucelabs-url]) +[![Build Status][saucelabs-matrix]]([saucelabs-url]) Thanks to [BrowserStack](https://www.browserstack.com/), the code is tested against `Chrome 56`, `Firefox 52`, `IE 11` and `Safari 10`. @@ -115,4 +117,8 @@ See the top-level file `LICENSE` and [code-climate-url]: https://codeclimate.com/github/Workfront/workfront-api [code-climate-image]: https://img.shields.io/codeclimate/github/Workfront/workfront-api.svg?style=flat -[browserstack-url]: https://www.browserstack.com/automate/badge.svg?badge_key=UlhFQU9IS014UmVHQ0tNVTdnK09ZRWdTdDdUcHpsSC90QXVJd2RIeGlrYz0tLUdybk9DbGxzalkxS2h6MlFrRWF3Tmc9PQ==--e8c67fb780c7cfc1b77d5ed945e7e91644c950cd \ No newline at end of file +[browserstack-url]: https://www.browserstack.com/automate/badge.svg?badge_key=UlhFQU9IS014UmVHQ0tNVTdnK09ZRWdTdDdUcHpsSC90QXVJd2RIeGlrYz0tLUdybk9DbGxzalkxS2h6MlFrRWF3Tmc9PQ==--e8c67fb780c7cfc1b77d5ed945e7e91644c950cd + +[saucelabs-badge]: https://saucelabs.com/buildstatus/citizensas +[saucelabs-url]: https://saucelabs.com/beta/builds/1b8be6f71455499c82f02afc881e6c14 +[saucelabs-matrix]: https://saucelabs.com/browser-matrix/citizensas.svg \ No newline at end of file diff --git a/karma-ci.conf.js b/karma-ci.conf.js index b43ca6d3..410d45fa 100644 --- a/karma-ci.conf.js +++ b/karma-ci.conf.js @@ -13,44 +13,81 @@ else if (CI === 'BS') { // Browsers to run on Sauce Labs const customLaunchers = { - 'bs_chrome_mac': { - base: 'BrowserStack', - browser: 'chrome', - browser_version: '56.0', - os: 'OS X', - os_version: 'Sierra' + 'SL_Chrome': { + base: 'SauceLabs', + browserName: 'chrome', + version: '48.0', + platform: 'Linux' }, - 'bs_firefox_mac': { - base: 'BrowserStack', - browser: 'firefox', - browser_version: '52.0', - os: 'OS X', - os_version: 'Sierra' + 'SL_Chrome56': { + base: 'SauceLabs', + browserName: 'chrome', + version: '56.0', + platform: 'OS X 10.12' }, - 'bs_internet_explorer_win': { - base: 'BrowserStack', - browser: 'ie', - browser_version: '11', - os: 'Windows', - os_version: '7' + 'SL_Chrome55': { + base: 'SauceLabs', + browserName: 'chrome', + version: '55.0', + platform: 'OS X 10.12' }, - 'bs_safari_mac': { - base: 'BrowserStack', - browser: 'safari', - browser_version: '10.0', - os: 'OS X', - os_version: 'Sierra' + 'SL_Firefox50': { + base: 'SauceLabs', + browserName: 'firefox', + version: '50.0', + platform: 'Windows 10' + }, + 'SL_Firefox51': { + base: 'SauceLabs', + browserName: 'firefox', + version: '51.0', + platform: 'Windows 10' + }, + 'SL_InternetExplorer10': { + base: 'SauceLabs', + browserName: 'internet explorer', + version: '11.0', + platform: 'Windows 7' + }, + 'SL_InternetExplorer11': { + base: 'SauceLabs', + browserName: 'internet explorer', + version: '11.0', + platform: 'Windows 7' + }, + 'SL_InternetExplorer13': { + base: 'SauceLabs', + browserName: 'internet explorer', + version: '13.0', + platform: 'Windows 10' + }, + 'SL_Safari10': { + base: 'SauceLabs', + browserName: 'safari', + platform: 'OS X 10.12', + version: '10.0' + }, + 'SL_Safari9': { + base: 'SauceLabs', + browserName: 'safari', + platform: 'OS X 10.11', + version: '9.0' } }; // Override config for CI. config.set({ - reporters: ['progress'], - browserStack: { - username: process.env.BROWSERSTACK_USER, - accessKey: process.env.BROWSERSTACK_ACCESSKEY, - project: 'workfront-api' + reporters: ['spec', 'coverage', 'saucelabs'], + sauceLabs: { + testName: 'workfront-api', + recordScreenshots: false, + recordVideo: false, + connectOptions: { + port: 5757 + }, + public: 'public' }, + captureTimeout: 120000, customLaunchers: customLaunchers, // start these browsers diff --git a/package.json b/package.json index e777c948..f940d13b 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "karma-spec-reporter": "0.0.30", "karma-webpack": "2.0.2", "mocha": "3.2.0", - "npm-run-all": "4.0.2", "phantomjs-polyfill-object-assign": "0.0.2", "phantomjs-prebuilt": "2.1.14", "remap-istanbul": "0.9.1", From 71a942d216412963bf0792273ba81e11fc9247b6 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 11:10:35 +0400 Subject: [PATCH 02/15] SauceLabs integration --- README.md | 7 ++++--- package.json | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bdff15b7..a9349a6e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # workfront-api -[![NPM version][npm-version-image]][npm-url] [![NPM downloads][npm-downloads-image]][npm-url] [![Apache v2 License][license-image]][license-url] [![Build Status][travis-image]][travis-url] ![BrowserStack Status][browserstack-url] [![Coverage][coveralls-image]][coveralls-url] [![Code Climate][code-climate-image]][code-climate-url] -[![Build Status][saucelabs-badge]]([saucelabs-url]) -[![Build Status][saucelabs-matrix]]([saucelabs-url]) +[![NPM version][npm-version-image]][npm-url] [![NPM downloads][npm-downloads-image]][npm-url] [![Apache v2 License][license-image]][license-url] [![Build Status][travis-image]][travis-url] [![Coverage][coveralls-image]][coveralls-url] [![Code Climate][code-climate-image]][code-climate-url] +[![Build Status][saucelabs-badge]][saucelabs-url] + +[![Build Status][saucelabs-matrix]][saucelabs-url] Thanks to [BrowserStack](https://www.browserstack.com/), the code is tested against `Chrome 56`, `Firefox 52`, `IE 11` and `Safari 10`. diff --git a/package.json b/package.json index f940d13b..ed6705dc 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "http-server": "0.9.0", "istanbul-instrumenter-loader": "2.0.0", "karma": "1.5.0", - "karma-browserstack-launcher": "1.2.0", "karma-chrome-launcher": "2.0.0", "karma-cli": "1.0.1", "karma-coverage": "1.1.1", From 8b61cbc4ab39cb13d3f1c1f7763b798d0ab8982a Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 11:16:52 +0400 Subject: [PATCH 03/15] Include Edge in automation --- .travis.yml | 2 +- karma-ci.conf.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e1be81f..e9e5ebfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ env: matrix: include: - node_js: '6' - env: CI=BS \ No newline at end of file + env: CI=SL \ No newline at end of file diff --git a/karma-ci.conf.js b/karma-ci.conf.js index 410d45fa..840d224c 100644 --- a/karma-ci.conf.js +++ b/karma-ci.conf.js @@ -7,7 +7,7 @@ const CI = process.env.CI if(CI === 'TRAVIS') { module.exports = karmaConfig } -else if (CI === 'BS') { +else if (CI === 'SL') { module.exports = function (config) { karmaConfig(config) @@ -57,7 +57,7 @@ else if (CI === 'BS') { }, 'SL_InternetExplorer13': { base: 'SauceLabs', - browserName: 'internet explorer', + browserName: 'edge', version: '13.0', platform: 'Windows 10' }, From fb553f13e0db5591fef70cc3275a50407a69a8e8 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 11:26:22 +0400 Subject: [PATCH 04/15] Include Edge in automation --- karma-ci.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/karma-ci.conf.js b/karma-ci.conf.js index 840d224c..75ff8a38 100644 --- a/karma-ci.conf.js +++ b/karma-ci.conf.js @@ -55,9 +55,9 @@ else if (CI === 'SL') { version: '11.0', platform: 'Windows 7' }, - 'SL_InternetExplorer13': { + 'SL_Edge13': { base: 'SauceLabs', - browserName: 'edge', + browserName: 'microsoftedge', version: '13.0', platform: 'Windows 10' }, From 9b4ce1eb6ffcfdf2320a4226a85272ec7d7c8481 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 11:36:30 +0400 Subject: [PATCH 05/15] Include Edge in automation --- karma-ci.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/karma-ci.conf.js b/karma-ci.conf.js index 75ff8a38..22c24a01 100644 --- a/karma-ci.conf.js +++ b/karma-ci.conf.js @@ -57,8 +57,8 @@ else if (CI === 'SL') { }, 'SL_Edge13': { base: 'SauceLabs', - browserName: 'microsoftedge', - version: '13.0', + browserName: 'MicrosoftEdge', + version: '13.10586', platform: 'Windows 10' }, 'SL_Safari10': { From 94ecd4656b5d4c8b168e498403e4c2f08663fe46 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 12:11:29 +0400 Subject: [PATCH 06/15] update SauceLabs browsers --- karma-ci.conf.js | 87 ++++++++++++++---------------------------------- 1 file changed, 25 insertions(+), 62 deletions(-) diff --git a/karma-ci.conf.js b/karma-ci.conf.js index 22c24a01..fcf50db2 100644 --- a/karma-ci.conf.js +++ b/karma-ci.conf.js @@ -11,69 +11,32 @@ else if (CI === 'SL') { module.exports = function (config) { karmaConfig(config) + const chrome = { + 'SL_Chrome_Latest': {version: 'latest', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'}, + 'SL_Chrome_Latest-1': {version: 'latest-1', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'}, + 'SL_Chrome_Latest-2': {version: 'latest-2', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'} + } + const firefox = { + 'SL_Firefox_Latest': {version: 'latest', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'}, + 'SL_Firefox_Latest-1': {version: 'latest-1', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'}, + 'SL_Firefox_Latest-2': {version: 'latest-2', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'} + } + const safari = { + 'SL_Safari_Latest': {version: 'latest', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'}, + 'SL_Safari_Latest-1': {version: 'latest-1', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'} + } + const ie = { + 'SL_InternetExplorer_Latest': {version: 'latest', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, + 'SL_InternetExplorer_Latest-1': {version: 'latest-1', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, + 'SL_InternetExplorer_Latest-2': {version: 'latest-2', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'} + } + const edge = { + 'SL_Edge_Latest': {version: 'latest', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, + 'SL_Edge_Latest-1': {version: 'latest-1', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'} + } + // Browsers to run on Sauce Labs - const customLaunchers = { - 'SL_Chrome': { - base: 'SauceLabs', - browserName: 'chrome', - version: '48.0', - platform: 'Linux' - }, - 'SL_Chrome56': { - base: 'SauceLabs', - browserName: 'chrome', - version: '56.0', - platform: 'OS X 10.12' - }, - 'SL_Chrome55': { - base: 'SauceLabs', - browserName: 'chrome', - version: '55.0', - platform: 'OS X 10.12' - }, - 'SL_Firefox50': { - base: 'SauceLabs', - browserName: 'firefox', - version: '50.0', - platform: 'Windows 10' - }, - 'SL_Firefox51': { - base: 'SauceLabs', - browserName: 'firefox', - version: '51.0', - platform: 'Windows 10' - }, - 'SL_InternetExplorer10': { - base: 'SauceLabs', - browserName: 'internet explorer', - version: '11.0', - platform: 'Windows 7' - }, - 'SL_InternetExplorer11': { - base: 'SauceLabs', - browserName: 'internet explorer', - version: '11.0', - platform: 'Windows 7' - }, - 'SL_Edge13': { - base: 'SauceLabs', - browserName: 'MicrosoftEdge', - version: '13.10586', - platform: 'Windows 10' - }, - 'SL_Safari10': { - base: 'SauceLabs', - browserName: 'safari', - platform: 'OS X 10.12', - version: '10.0' - }, - 'SL_Safari9': { - base: 'SauceLabs', - browserName: 'safari', - platform: 'OS X 10.11', - version: '9.0' - } - }; + const customLaunchers = Object.assign({}, chrome, firefox, safari, ie, edge) // Override config for CI. config.set({ From f1698fe2f6428629c992a341e4e2c7e4f88904c9 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 12:24:32 +0400 Subject: [PATCH 07/15] update SauceLabs browsers --- karma-ci.conf.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/karma-ci.conf.js b/karma-ci.conf.js index fcf50db2..a212a2b7 100644 --- a/karma-ci.conf.js +++ b/karma-ci.conf.js @@ -22,21 +22,25 @@ else if (CI === 'SL') { 'SL_Firefox_Latest-2': {version: 'latest-2', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'} } const safari = { - 'SL_Safari_Latest': {version: 'latest', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'}, - 'SL_Safari_Latest-1': {version: 'latest-1', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'} + 'SL_Safari_Latest': {version: '10.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'}, + 'SL_Safari_Latest-1': {version: '9.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'} } const ie = { - 'SL_InternetExplorer_Latest': {version: 'latest', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, - 'SL_InternetExplorer_Latest-1': {version: 'latest-1', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, - 'SL_InternetExplorer_Latest-2': {version: 'latest-2', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'} + 'SL_InternetExplorer_Latest': {version: '11.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, + 'SL_InternetExplorer_Latest-1': {version: '10.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, + 'SL_InternetExplorer_Latest-2': {version: '9.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'} } const edge = { - 'SL_Edge_Latest': {version: 'latest', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, - 'SL_Edge_Latest-1': {version: 'latest-1', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'} + 'SL_Edge_Latest': {version: '14.14393', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, + 'SL_Edge_Latest-1': {version: '13.10586', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'} + } + const linux = { + 'SL_Chrome_Linux': {version: 'latest', platform: 'Linux', browserName: 'chrome', base: 'SauceLabs'}, + 'SL_Firefox_Linux': {version: 'latest', platform: 'Linux', browserName: 'firefox', base: 'SauceLabs'}, } // Browsers to run on Sauce Labs - const customLaunchers = Object.assign({}, chrome, firefox, safari, ie, edge) + const customLaunchers = Object.assign({}, chrome, firefox, safari, ie, edge, linux) // Override config for CI. config.set({ From 0808e75bf0cab62d323847d4e8c52bef6c1ecdde Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 13:08:49 +0400 Subject: [PATCH 08/15] remove BrowserStack mentions --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index a9349a6e..357ebecd 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ [![Build Status][saucelabs-matrix]][saucelabs-url] -Thanks to [BrowserStack](https://www.browserstack.com/), the code is tested against `Chrome 56`, `Firefox 52`, `IE 11` and `Safari 10`. - ## Usage #### Server-side @@ -118,8 +116,6 @@ See the top-level file `LICENSE` and [code-climate-url]: https://codeclimate.com/github/Workfront/workfront-api [code-climate-image]: https://img.shields.io/codeclimate/github/Workfront/workfront-api.svg?style=flat -[browserstack-url]: https://www.browserstack.com/automate/badge.svg?badge_key=UlhFQU9IS014UmVHQ0tNVTdnK09ZRWdTdDdUcHpsSC90QXVJd2RIeGlrYz0tLUdybk9DbGxzalkxS2h6MlFrRWF3Tmc9PQ==--e8c67fb780c7cfc1b77d5ed945e7e91644c950cd - [saucelabs-badge]: https://saucelabs.com/buildstatus/citizensas [saucelabs-url]: https://saucelabs.com/beta/builds/1b8be6f71455499c82f02afc881e6c14 [saucelabs-matrix]: https://saucelabs.com/browser-matrix/citizensas.svg \ No newline at end of file From 0ae6c9f84c8a512abe6cf28255a3aa10bf301419 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Wed, 15 Mar 2017 14:16:02 +0400 Subject: [PATCH 09/15] codecov and new latest browsers --- .travis.yml | 4 +++- karma-ci.conf.js | 16 +++++++++------- karma.conf.js | 6 +++--- package.json | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9e5ebfd..ee079fb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,6 @@ env: matrix: include: - node_js: '6' - env: CI=SL \ No newline at end of file + env: CI=SL + +after_success: codecov \ No newline at end of file diff --git a/karma-ci.conf.js b/karma-ci.conf.js index a212a2b7..b52177dd 100644 --- a/karma-ci.conf.js +++ b/karma-ci.conf.js @@ -22,17 +22,19 @@ else if (CI === 'SL') { 'SL_Firefox_Latest-2': {version: 'latest-2', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'} } const safari = { - 'SL_Safari_Latest': {version: '10.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'}, - 'SL_Safari_Latest-1': {version: '9.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'} + 'SL_Safari_Latest': {version: 'latest', platform: 'OS X 10.12', browserName: 'safari', base: 'SauceLabs'}, + 'SL_Safari_10': {version: '10.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'}, + 'SL_Safari_9': {version: '9.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'} } const ie = { - 'SL_InternetExplorer_Latest': {version: '11.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, - 'SL_InternetExplorer_Latest-1': {version: '10.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, - 'SL_InternetExplorer_Latest-2': {version: '9.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'} + 'SL_InternetExplorer_11': {version: '11.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, + 'SL_InternetExplorer_10': {version: '10.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, + 'SL_InternetExplorer_9': {version: '9.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'} } const edge = { - 'SL_Edge_Latest': {version: '14.14393', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, - 'SL_Edge_Latest-1': {version: '13.10586', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'} + 'SL_Edge_Latest': {version: 'latest', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, + 'SL_Edge_14': {version: '14.14393', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, + 'SL_Edge_13': {version: '13.10586', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'} } const linux = { 'SL_Chrome_Linux': {version: 'latest', platform: 'Linux', browserName: 'chrome', base: 'SauceLabs'}, diff --git a/karma.conf.js b/karma.conf.js index 40814159..5568cf75 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,5 +1,7 @@ 'use strict' +const CI = process.env.CI + const webpackConfig = require('./webpack.config') webpackConfig.devtool = 'inline-source-map' @@ -66,9 +68,7 @@ module.exports = function (config) { reporters: [ {type: 'in-memory'}, // generates ./coverage/lcov.info - {type: 'lcov', subdir: '.'}, - // generates ./coverage/coverage-final.json - {type: 'json', subdir: '.'} + {type: CI ? 'lcovonly' : 'html', subdir: '.'} ] }, diff --git a/package.json b/package.json index ed6705dc..3e7b8305 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ }, "scripts": { "test": "karma start karma.conf.js", - "ci-test": "karma start karma-ci.conf.js && codecov", + "ci-test": "karma start karma-ci.conf.js", "build": "webpack -p --bail", "update-online-docs": "gulp publish-docs", "prepublish": "npm run build", From 1f42f3d70e288b2602d30bb7002baa09ef070ea6 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Mon, 20 Mar 2017 13:23:39 +0400 Subject: [PATCH 10/15] unify karma and karma.ci configuration files --- .travis.yml | 5 +- karma-ci.conf.js | 71 ---------------------------- karma.conf.js | 110 +++++++++++++++++++++++++++++++------------- package.json | 19 +++----- test/test-bundle.js | 2 +- tsconfig.json | 5 +- webpack.config.js | 89 ++++++++++++++++++++++++----------- 7 files changed, 150 insertions(+), 151 deletions(-) delete mode 100644 karma-ci.conf.js diff --git a/.travis.yml b/.travis.yml index ee079fb3..20b83708 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,19 +8,16 @@ node_js: - '6' - '4' -script: npm run ci-test addons: sauce_connect: true env: global: - secure: Zmndw3YPp7JUPHRWfzF6ieqwDqWs4GnKMqXNaPNCcY1D76rH2CGTe6YQHhvNEgIm5UItH39x306TMWjqZfCFUVpAks8AQEigADAMPbgqLg8JG4QVIb1sQiZPiVHJA5Ho6YNB4hqv3fp+D9DWRDIMiLYmWiRD8/hFaow/xkfMyiA= - secure: jdw+OA04vF8+t+iOkWRfDWexKGVxrjpt8iwkY/CBnmANFQckseLwVrDJyHrjcxQlY7SlkSudMNXizINKJDldPx4BBlt1I6n7441CYQ2KpRqzAQXgLPWy+Ea/lM2QcSfihG/xC8Q30CVfMUTZTZx/6nUlIoeB2eItzy9+KsE9UaU= - matrix: - - CI=TRAVIS matrix: include: - node_js: '6' - env: CI=SL + env: CI_MODE=saucelabs after_success: codecov \ No newline at end of file diff --git a/karma-ci.conf.js b/karma-ci.conf.js deleted file mode 100644 index b52177dd..00000000 --- a/karma-ci.conf.js +++ /dev/null @@ -1,71 +0,0 @@ -'use strict' - -const karmaConfig = require('./karma.conf'); - -const CI = process.env.CI - -if(CI === 'TRAVIS') { - module.exports = karmaConfig -} -else if (CI === 'SL') { - module.exports = function (config) { - karmaConfig(config) - - const chrome = { - 'SL_Chrome_Latest': {version: 'latest', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'}, - 'SL_Chrome_Latest-1': {version: 'latest-1', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'}, - 'SL_Chrome_Latest-2': {version: 'latest-2', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'} - } - const firefox = { - 'SL_Firefox_Latest': {version: 'latest', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'}, - 'SL_Firefox_Latest-1': {version: 'latest-1', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'}, - 'SL_Firefox_Latest-2': {version: 'latest-2', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'} - } - const safari = { - 'SL_Safari_Latest': {version: 'latest', platform: 'OS X 10.12', browserName: 'safari', base: 'SauceLabs'}, - 'SL_Safari_10': {version: '10.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'}, - 'SL_Safari_9': {version: '9.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'} - } - const ie = { - 'SL_InternetExplorer_11': {version: '11.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, - 'SL_InternetExplorer_10': {version: '10.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, - 'SL_InternetExplorer_9': {version: '9.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'} - } - const edge = { - 'SL_Edge_Latest': {version: 'latest', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, - 'SL_Edge_14': {version: '14.14393', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, - 'SL_Edge_13': {version: '13.10586', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'} - } - const linux = { - 'SL_Chrome_Linux': {version: 'latest', platform: 'Linux', browserName: 'chrome', base: 'SauceLabs'}, - 'SL_Firefox_Linux': {version: 'latest', platform: 'Linux', browserName: 'firefox', base: 'SauceLabs'}, - } - - // Browsers to run on Sauce Labs - const customLaunchers = Object.assign({}, chrome, firefox, safari, ie, edge, linux) - - // Override config for CI. - config.set({ - reporters: ['spec', 'coverage', 'saucelabs'], - sauceLabs: { - testName: 'workfront-api', - recordScreenshots: false, - recordVideo: false, - connectOptions: { - port: 5757 - }, - public: 'public' - }, - captureTimeout: 120000, - customLaunchers: customLaunchers, - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: Object.keys(customLaunchers), - singleRun: true - }) - } -} -else { - console.log('Please specify CI environment variable') -} \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index 5568cf75..eb69bf9d 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,31 +1,10 @@ 'use strict' const CI = process.env.CI +const CI_MODE = process.env.CI_MODE +console.log('CI=', CI, typeof CI) -const webpackConfig = require('./webpack.config') -webpackConfig.devtool = 'inline-source-map' - -webpackConfig.resolve.alias = webpackConfig.resolve.alias || {} - -// Conditional requires workaround (https://github.com/sinonjs/sinon/issues/830) -webpackConfig.resolve.alias.sinon ='sinon/pkg/sinon' - -webpackConfig.module.rules = webpackConfig.module.rules || [] -webpackConfig.module.rules.push({ - test: /\.[tj]s$/, - enforce: 'post', - exclude: /(test-bundle\.js|\.spec|node_modules|mock|\.mock|\.stub)/, - use: { - loader: 'istanbul-instrumenter-loader', - options: { - esModules: true, - produceSourceMap: true - } - } -}) - -webpackConfig.externals = [ -] +process.env.WEBPACK_ENV = 'test' module.exports = function (config) { config.set({ @@ -56,7 +35,7 @@ module.exports = function (config) { 'test/test-bundle.js': ['webpack', 'sourcemap'] }, - webpack: webpackConfig, + webpack: require('./webpack.config'), // level of logging // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG @@ -66,19 +45,29 @@ module.exports = function (config) { coverageReporter: { reporters: [ - {type: 'in-memory'}, - // generates ./coverage/lcov.info - {type: CI ? 'lcovonly' : 'html', subdir: '.'} + {type: 'in-memory'} ] }, remapOptions: { - warn: function() {} - }, - remapCoverageReporter: { - 'text-summary': null, // to show summary in console - html: './coverage' + // warn: function() {} }, + remapCoverageReporter: (function () { + if (CI) { + return { + 'text-summary': null, + lcovonly: './coverage' + } + } + return { + 'text-summary': null, + // to show summary in console + html: './coverage' + } + })(), + + // make sure both reporter plugins are loaded + // plugins: ['karma-coverage', 'karma-remap-coverage'], port: 9876, colors: true, @@ -86,4 +75,59 @@ module.exports = function (config) { browsers: ['PhantomJS'], singleRun: true }) + + if (CI_MODE === 'saucelabs') { + const chrome = { + 'SL_Chrome_Latest': {version: 'latest', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'}, + 'SL_Chrome_Latest-1': {version: 'latest-1', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'}, + 'SL_Chrome_Latest-2': {version: 'latest-2', platform: 'OS X 10.11', browserName: 'chrome', base: 'SauceLabs'} + } + const firefox = { + 'SL_Firefox_Latest': {version: 'latest', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'}, + 'SL_Firefox_Latest-1': {version: 'latest-1', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'}, + 'SL_Firefox_Latest-2': {version: 'latest-2', platform: 'OS X 10.11', browserName: 'firefox', base: 'SauceLabs'} + } + const safari = { + 'SL_Safari_Latest': {version: 'latest', platform: 'OS X 10.12', browserName: 'safari', base: 'SauceLabs'}, + 'SL_Safari_10': {version: '10.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'}, + 'SL_Safari_9': {version: '9.0', platform: 'OS X 10.11', browserName: 'safari', base: 'SauceLabs'} + } + const ie = { + 'SL_InternetExplorer_11': {version: '11.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, + 'SL_InternetExplorer_10': {version: '10.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'}, + 'SL_InternetExplorer_9': {version: '9.0', platform: 'Windows 7', browserName: 'internet explorer', base: 'SauceLabs'} + } + const edge = { + 'SL_Edge_Latest': {version: 'latest', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, + 'SL_Edge_14': {version: '14.14393', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'}, + 'SL_Edge_13': {version: '13.10586', platform: 'Windows 10', browserName: 'MicrosoftEdge', base: 'SauceLabs'} + } + const linux = { + 'SL_Chrome_Linux': {version: 'latest', platform: 'Linux', browserName: 'chrome', base: 'SauceLabs'}, + 'SL_Firefox_Linux': {version: 'latest', platform: 'Linux', browserName: 'firefox', base: 'SauceLabs'}, + } + + // Browsers to run on Sauce Labs + const customLaunchers = Object.assign({}, chrome, firefox, safari, ie, edge, linux) + + // Override config for CI. + config.set({ + reporters: ['spec', 'coverage', 'saucelabs'], + sauceLabs: { + testName: 'workfront-api', + recordScreenshots: false, + recordVideo: false, + connectOptions: { + port: 5757 + }, + public: 'public' + }, + captureTimeout: 120000, + customLaunchers: customLaunchers, + + // start these browsers + // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher + browsers: Object.keys(customLaunchers) + }) + } } \ No newline at end of file diff --git a/package.json b/package.json index 3e7b8305..3cfe67cb 100644 --- a/package.json +++ b/package.json @@ -4,17 +4,17 @@ "description": "A Workfront API for the Node.js and the Web", "main": "dist/workfront.js", "dependencies": { - "es6-promise": "4.0.5", - "form-data": "0.2.0", + "es6-promise": "4.1.0", + "form-data": "2.1.2", "isomorphic-fetch": "2.2.1", "workfront-api-constants": "2.0.0" }, "devDependencies": { - "@types/mocha": "2.2.39", + "@types/mocha": "2.2.40", "@types/node": "7.0.8", "@types/should": "8.1.30", "@types/sinon": "1.16.35", - "codecov": "1.0.1", + "codecov": "2.1.0", "dateformat": "1.0.12", "del": "1.2.1", "fetch-mock": "5.9.4", @@ -37,21 +37,17 @@ "karma-remap-coverage": "0.1.4", "karma-sauce-launcher": "1.1.0", "karma-sourcemap-loader": "0.3.7", - "karma-spec-reporter": "0.0.30", - "karma-webpack": "2.0.2", + "karma-webpack": "2.0.3", "mocha": "3.2.0", "phantomjs-polyfill-object-assign": "0.0.2", "phantomjs-prebuilt": "2.1.14", - "remap-istanbul": "0.9.1", - "requirejs": "2.3.3", "semver": "5.1.0", "shelljs": "0.5.3", "should": "11.2.1", "should-sinon": "0.0.5", "should-spies": "1.1.0", - "sinon": "^1.12.2", - "source-map-loader": "0.1.6", - "ts-loader": "2.0.1", + "sinon": "2.0.0", + "ts-loader": "2.0.2", "tslib": "1.6.0", "tslint": "4.5.1", "tslint-loader": "3.4.3", @@ -63,7 +59,6 @@ }, "scripts": { "test": "karma start karma.conf.js", - "ci-test": "karma start karma-ci.conf.js", "build": "webpack -p --bail", "update-online-docs": "gulp publish-docs", "prepublish": "npm run build", diff --git a/test/test-bundle.js b/test/test-bundle.js index 606ed948..e6caf7a6 100644 --- a/test/test-bundle.js +++ b/test/test-bundle.js @@ -2,5 +2,5 @@ // require all modules ending in ".spec.js", ".spec.ts" from the // current directory and all subdirectories -var testsContext = require.context('./', true, /\.spec\.[t]s$/) +const testsContext = require.context('.', true, /\.spec\.[t]s$/) testsContext.keys().forEach(testsContext) \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 9f7ad748..076433f0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,14 +1,14 @@ { "compilerOptions": { - "allowJs": true, "importHelpers": true, "module": "es6", + "moduleResolution": "node", + "noEmitHelpers": true, "noImplicitAny": false, "noLib": true, "noUnusedLocals": true, "sourceMap": true, "outDir": "./es", - "moduleResolution": "node", "target": "es5" }, "compileOnSave": false, @@ -22,6 +22,7 @@ ], "exclude": [ "node_modules", + "coverage", "dist" ] } \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index 7da1f711..85143acf 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,9 @@ 'use strict' +const WEBPACK_ENV = process.env.WEBPACK_ENV + module.exports = { + context: __dirname, entry: './src/index.ts', output: { path: __dirname + '/dist', @@ -10,7 +13,7 @@ module.exports = { }, // Enable sourcemaps for debugging webpack's output. - devtool: 'source-map', + devtool: WEBPACK_ENV === 'test' ? 'inline-source-map' : 'source-map', resolve: { // Add '.ts' and '.js' as resolvable extensions. @@ -18,40 +21,70 @@ module.exports = { }, module: { - rules: [ - // rules for modules (configure loaders, parser options, etc.) - // All files with a '.ts' extension will be handled by 'awesome-typescript-loader'. - { - test: /\.ts$/, - loader: 'ts-loader', - exclude: /(node_modules)/ - }, - - // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'. - { - enforce: 'pre', - test: /\.js$/, - loader: 'source-map-loader' - }, + rules: (function() { + const rules = [ + // rules for modules (configure loaders, parser options, etc.) + // All files with a '.ts' extension will be handled by 'ts-loader'. + { + test: /\.ts$/, + use: [ + { + loader: 'ts-loader', + options: (function() { + if (WEBPACK_ENV === 'test') { + return { + compilerOptions: { + sourceMap: false, + inlineSourceMap: true + } + } + } + return {} + })() + } + ], + exclude: /node_modules/ + }, - // lint - { - enforce: 'pre', - test: /\.ts$/, - loader: 'tslint-loader', - exclude: /(node_modules)/, - options: { - // failOnHint: true + // lint + { + enforce: 'pre', + test: /\.ts$/, + loader: 'tslint-loader', + exclude: /node_modules/, + options: { + // failOnHint: true + } } + ] + if (WEBPACK_ENV === 'test') { + rules.push({ + test: /\.[tj]s$/, + enforce: 'post', + exclude: /(test-bundle\.js|\.spec|node_modules|mock|\.mock|\.stub)/, + use: { + loader: 'istanbul-instrumenter-loader', + options: { + esModules: true, + produceSourceMap: true + } + } + }) } - ], + return rules + })() }, // When importing a module whose path matches one of the following, just // assume a corresponding global variable exists and use that instead. // This is important because it allows us to avoid bundling all of our // dependencies, which allows browsers to cache those libraries between builds. - externals: [ - 'isomorphic-fetch' - ] + externals: (function() { + if (WEBPACK_ENV === 'test') { + return [] + } + return [ + 'isomorphic-fetch' + ] + })() }; From d9af0a45891238cabd02a01c89fe61def043b0df Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Mon, 20 Mar 2017 13:28:00 +0400 Subject: [PATCH 11/15] unify karma and karma.ci configuration files --- karma.conf.js | 1 - test/test-bundle.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index eb69bf9d..b13fe463 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -2,7 +2,6 @@ const CI = process.env.CI const CI_MODE = process.env.CI_MODE -console.log('CI=', CI, typeof CI) process.env.WEBPACK_ENV = 'test' diff --git a/test/test-bundle.js b/test/test-bundle.js index e6caf7a6..792b0066 100644 --- a/test/test-bundle.js +++ b/test/test-bundle.js @@ -2,5 +2,5 @@ // require all modules ending in ".spec.js", ".spec.ts" from the // current directory and all subdirectories -const testsContext = require.context('.', true, /\.spec\.[t]s$/) +var testsContext = require.context('.', true, /\.spec\.[t]s$/) testsContext.keys().forEach(testsContext) \ No newline at end of file From 23e62e6bbd4d9336627f0938b1894622e1f86bd8 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Mon, 20 Mar 2017 15:33:23 +0400 Subject: [PATCH 12/15] fix: reporter for saucelabs --- karma.conf.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index b13fe463..4fe44798 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -70,9 +70,9 @@ module.exports = function (config) { port: 9876, colors: true, - autoWatch: false, - browsers: ['PhantomJS'], - singleRun: true + autoWatch: true, + browsers: ['Chrome'], + singleRun: false }) if (CI_MODE === 'saucelabs') { @@ -111,7 +111,7 @@ module.exports = function (config) { // Override config for CI. config.set({ - reporters: ['spec', 'coverage', 'saucelabs'], + reporters: ['progress', 'saucelabs'], sauceLabs: { testName: 'workfront-api', recordScreenshots: false, From 24bcac65942b5867c71acea1a1964e7dc854bfff Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Mon, 20 Mar 2017 15:49:45 +0400 Subject: [PATCH 13/15] fix: reporter for saucelabs --- karma.conf.js | 6 +++--- test/Api.spec.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 4fe44798..df3fa839 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -70,9 +70,9 @@ module.exports = function (config) { port: 9876, colors: true, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false + autoWatch: false, + browsers: ['PhantomJS'], + singleRun: true }) if (CI_MODE === 'saucelabs') { diff --git a/test/Api.spec.ts b/test/Api.spec.ts index 36e72644..3983021d 100644 --- a/test/Api.spec.ts +++ b/test/Api.spec.ts @@ -23,7 +23,7 @@ import {Api} from '../src/Api' describe('Create new instance for API', function () { it('should have methods', function () { const api = new Api({url: 'http://localhost'}) - should(api.get).be.a.Function() + should(api.get).not.be.a.Function() should(api.login).be.a.Function() should(api.logout).be.a.Function() should(api.create).be.a.Function() From a814b21fe6b3ad666d38b8f79139e58166dc1e24 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Mon, 20 Mar 2017 15:50:02 +0400 Subject: [PATCH 14/15] fix tests --- test/Api.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Api.spec.ts b/test/Api.spec.ts index 3983021d..36e72644 100644 --- a/test/Api.spec.ts +++ b/test/Api.spec.ts @@ -23,7 +23,7 @@ import {Api} from '../src/Api' describe('Create new instance for API', function () { it('should have methods', function () { const api = new Api({url: 'http://localhost'}) - should(api.get).not.be.a.Function() + should(api.get).be.a.Function() should(api.login).be.a.Function() should(api.logout).be.a.Function() should(api.create).be.a.Function() From ef64319ac25e4350f74f8273e6e87923a166bba0 Mon Sep 17 00:00:00 2001 From: Sassoun Derderian Date: Mon, 20 Mar 2017 16:06:06 +0400 Subject: [PATCH 15/15] saucelabs addon in matrix --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20b83708..0cc0261d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ node_js: - '6' - '4' -addons: - sauce_connect: true env: global: - secure: Zmndw3YPp7JUPHRWfzF6ieqwDqWs4GnKMqXNaPNCcY1D76rH2CGTe6YQHhvNEgIm5UItH39x306TMWjqZfCFUVpAks8AQEigADAMPbgqLg8JG4QVIb1sQiZPiVHJA5Ho6YNB4hqv3fp+D9DWRDIMiLYmWiRD8/hFaow/xkfMyiA= @@ -19,5 +17,7 @@ matrix: include: - node_js: '6' env: CI_MODE=saucelabs + addons: + sauce_connect: true after_success: codecov \ No newline at end of file