Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: karma-runner/karma-sauce-launcher
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1af7432ab4b8ad1fe6e95612c1046e4d195134ff
Choose a base ref
...
head repository: karma-runner/karma-sauce-launcher
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 18420c8b8f3c9a3276b4c81c12eea3c910169c0c
Choose a head ref

Commits on Aug 15, 2016

  1. Copy the full SHA
    3fe1c75 View commit details

Commits on Oct 24, 2016

  1. Copy the full SHA
    79b688c View commit details

Commits on Aug 22, 2017

  1. Copy the full SHA
    e792677 View commit details
  2. feat(config): add proxy option

    mattkubej authored and dignifiedquire committed Aug 22, 2017
    Copy the full SHA
    bae758a View commit details
  3. Copy the full SHA
    bae326f View commit details
  4. docs(readme): add hint to platform configurator

    Adds an Android example, also.
    axe312ger authored and dignifiedquire committed Aug 22, 2017
    Copy the full SHA
    0219065 View commit details
  5. feat(config): allow SE traffic to be sent via Sauce Connect's Relay

    Tests with Sauce Connect have two connections to Sauce Labs, a
    tunnel from Sauce Connect client to host, and Selenium commands themselves which are sent independently.
    
    Sauce Connect is able to relay Selenium commands through the established tunnel, which helps obviate proxy and other issues with Selenium traffic.
    
    This change adds config values `connectLocationForSERelay` and
    `connectPortForSERelay` which allow users to make Karma send Selenium
    commands through a Sauce Connect instance at that host and port.
    DylanLacey authored and dignifiedquire committed Aug 22, 2017
    Copy the full SHA
    0ac67d4 View commit details
  6. Copy the full SHA
    0362ad5 View commit details
  7. Copy the full SHA
    f607303 View commit details
  8. Copy the full SHA
    79c70c2 View commit details
  9. Copy the full SHA
    a21fbd9 View commit details
  10. Copy the full SHA
    f783f63 View commit details
  11. chore: release v1.2.0

    dignifiedquire committed Aug 22, 2017
    Copy the full SHA
    004d61d View commit details

Commits on Aug 22, 2018

  1. chore(deps): Support node 6,8,10

    BREAKING CHANGE:
      Drop support for node < 6
    johnjbarton authored Aug 22, 2018
    Copy the full SHA
    2ef4585 View commit details

Commits on Dec 5, 2018

  1. Switch launcher to selenium-webdriver (#156)

    * Make it easier to review changes
    
    * Switch launcher to selenium-webdriver
    
    * Switches `wd` to `selenium-webdriver`
    * Removes hearbeat in favor of automatic `selenium-webdriver` timeout
    * Converts everything to TypeScript
    * Simplifies config parsing
    
    * Pass proxy to Saucelabs API
    devversion authored and vikerman committed Dec 5, 2018
    Copy the full SHA
    6525ddd View commit details

Commits on Dec 11, 2018

  1. chore: release v2.0.0

    vikerman committed Dec 11, 2018
    Copy the full SHA
    7c35282 View commit details

Commits on Dec 12, 2018

  1. Copy the full SHA
    6a9768d View commit details
  2. chore: release v2.0.1

    vikerman committed Dec 12, 2018
    Copy the full SHA
    f0e35a7 View commit details
  3. Copy the full SHA
    dcda7b5 View commit details
  4. chore: release v2.0.2

    vikerman committed Dec 12, 2018
    1
    Copy the full SHA
    39c0d61 View commit details

Commits on Feb 13, 2020

  1. Copy the full SHA
    74eea92 View commit details
  2. Copy the full SHA
    376b471 View commit details
  3. Copy the full SHA
    fe44b8e View commit details

Commits on Feb 15, 2020

  1. Merge pull request #169 from karma-runner/add_heartbeat

    added heartbeat functionality
    wswebcreation authored Feb 15, 2020
    Copy the full SHA
    ef24b75 View commit details

Commits on Feb 19, 2020

  1. Update Sauce Logo in docs.

    Giovanni Rago committed Feb 19, 2020
    Copy the full SHA
    326bfc6 View commit details
  2. Merge pull request #175 from ragog/update_sauce_logo

    Update Sauce Logo in docs.
    wswebcreation authored Feb 19, 2020
    Copy the full SHA
    d6d133a View commit details

Commits on Feb 20, 2020

  1. Copy the full SHA
    73a6f00 View commit details

Commits on Feb 26, 2020

  1. Copy the full SHA
    c3506f3 View commit details
  2. Copy the full SHA
    31f9b36 View commit details
  3. Copy the full SHA
    d8a1f75 View commit details
  4. Copy the full SHA
    25cf905 View commit details
  5. Copy the full SHA
    8701bc8 View commit details
  6. Copy the full SHA
    33ee36a View commit details
  7. Copy the full SHA
    0bc8c40 View commit details
  8. Copy the full SHA
    0d3e060 View commit details
  9. Copy the full SHA
    681ec2f View commit details

Commits on Mar 9, 2020

  1. Merge pull request #181 from karma-runner/rcebulko-commitlint

    chore(lint): add commitlint config and dependencies
    rcebulko authored Mar 9, 2020
    Copy the full SHA
    d70f4d2 View commit details
  2. Copy the full SHA
    15aa334 View commit details
  3. Copy the full SHA
    de51b81 View commit details
  4. Copy the full SHA
    2a4f1bc View commit details
  5. Merge pull request #182 from karma-runner/rcebulko-release

    chore(release): Enable semantic-release on karma-sauce-launcher
    rcebulko authored Mar 9, 2020
    Copy the full SHA
    37313fa View commit details
  6. Copy the full SHA
    a7f3203 View commit details

Commits on Mar 10, 2020

  1. Merge pull request #184 from karma-runner/rcebulko-stable

    chore(semantic-release): update node version check in travis
    rcebulko authored Mar 10, 2020
    Copy the full SHA
    869b7fd View commit details
  2. chore(release): 2.0.0 [skip ci]

    # [2.0.0](v1.2.0...v2.0.0) (2020-03-10)
    
    ### chore
    
    * **deps:** Support node 6,8,10  ([2ef4585](2ef4585))
    
    ### BREAKING CHANGES
    
    * **deps:**   Drop support for node < 6
    semantic-release-bot committed Mar 10, 2020
    Copy the full SHA
    6b29f29 View commit details
  3. Copy the full SHA
    17c5073 View commit details

Commits on Mar 17, 2020

  1. chore(node): drop support for Node 8 (#186)

    * chore(node): drop support for Node 8
    
    * chore(node): clean up Travis config
    
    * chore(node): allow Node 10
    rcebulko authored Mar 17, 2020
    Copy the full SHA
    d79e9d1 View commit details
  2. chore(release): add npm publish config to semantic-release (#188)

    * chore(release): add devDependencies on semantic release and plugins
    
    * chore: add npm plugin for semantic release and publish config
    rcebulko authored Mar 17, 2020
    Copy the full SHA
    a5dc780 View commit details
  3. chore(release): force-trigger a semantic release (#189)

    BREAKING CHANGE:
      Drop support for Node <10.
    rcebulko authored Mar 17, 2020
    Copy the full SHA
    64217e4 View commit details
  4. chore(release): 4.0.0 [skip ci]

    # [4.0.0](v3.0.0...v4.0.0) (2020-03-17)
    
    ### chore
    
    * **release:** force-trigger a semantic release ([#189](#189)) ([64217e4](64217e4))
    
    ### BREAKING CHANGES
    
    * **release:**   Drop support for Node <10.
    semantic-release-bot committed Mar 17, 2020
    Copy the full SHA
    09e1288 View commit details

Commits on Mar 30, 2020

  1. Copy the full SHA
    d4f7649 View commit details
3 changes: 0 additions & 3 deletions .eslintrc

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
sauce_connect.log
npm-debug.log
dist/
4 changes: 1 addition & 3 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
.*
Gruntfile.coffee
CONTRIBUTING.md
node_modules
sauce_connect.log
npm-debug.log
26 changes: 14 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
sudo: false
language: node_js
node_js:
- '4.0'
- '0.12'
- '0.10'
before_install:
- npm i -g npm
- npm config set loglevel warn
before_script:
- npm install -g grunt-cli
- rm -rf node_modules/karma-sauce-launcher
- cd node_modules && ln -nsf ../ karma-sauce-launcher && cd ../
script:
- grunt
- "10.19.0"
- stable

cache:
yarn: true
notifications:
email: false

script: yarn run-example
after_success:
# run automated release process with semantic-release
- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_EVENT_TYPE" == "push" && "$TRAVIS_NODE_VERSION" == "stable" ]]; then
npm run build;
semantic-release;
fi;

env:
global:
- secure: TFSCNKxxG4gWmLwX7Wlz61sdev46If0tmg9y3GZZXI/WSvcbSsVOj1k5nAhvlfOK7MMgTBC+bLCKuHlhhY7H3ZDbxKW/NaSNk4vNfWjrT7k7OQmmMi93PBXSdwLlQOBWPzyd7ZEZmUV8fBI3IWEORaUcDEPjKE5gSPtiaxynPLQ=
104 changes: 104 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,107 @@
## [4.1.5](https://github.com/karma-runner/karma-sauce-launcher/compare/v4.1.4...v4.1.5) (2020-05-26)


### Bug Fixes

* Update sauce lib ([#207](https://github.com/karma-runner/karma-sauce-launcher/issues/207)) ([7e75e17](https://github.com/karma-runner/karma-sauce-launcher/commit/7e75e171d695e07af2c4c2e207a5dc579abcfb4e))

## [4.1.4](https://github.com/karma-runner/karma-sauce-launcher/compare/v4.1.3...v4.1.4) (2020-04-28)


### Bug Fixes

* remove heartbeat function ([#205](https://github.com/karma-runner/karma-sauce-launcher/issues/205)) ([10e93cc](https://github.com/karma-runner/karma-sauce-launcher/commit/10e93cc5f9787c275db8c72f159dea65690b77f1))

## [4.1.3](https://github.com/karma-runner/karma-sauce-launcher/compare/v4.1.2...v4.1.3) (2020-04-13)


### Bug Fixes

* **release:** Replace calls to renamed `.title()` with `.getTitle()` ([b1c589b](https://github.com/karma-runner/karma-sauce-launcher/commit/b1c589ba3640e0f9d8a23a2f2eba0e56271e7826))

## [4.1.2](https://github.com/karma-runner/karma-sauce-launcher/compare/v4.1.1...v4.1.2) (2020-03-30)


### Bug Fixes

* no need to copy package.json to dist ([#196](https://github.com/karma-runner/karma-sauce-launcher/issues/196)) ([65210f2](https://github.com/karma-runner/karma-sauce-launcher/commit/65210f29e6dfa103b4c008b0146f3ec525e68958))

## [4.1.1](https://github.com/karma-runner/karma-sauce-launcher/compare/v4.1.0...v4.1.1) (2020-03-30)


### Bug Fixes

* add files field to package.json ([#194](https://github.com/karma-runner/karma-sauce-launcher/issues/194)) ([f99a0e1](https://github.com/karma-runner/karma-sauce-launcher/commit/f99a0e15a1ce3b0a12258e0ff5e981b8f81928a0))

# [4.1.0](https://github.com/karma-runner/karma-sauce-launcher/compare/v4.0.0...v4.1.0) (2020-03-30)


### Features

* **release:** add build step to semantic-release in Travis ([#192](https://github.com/karma-runner/karma-sauce-launcher/issues/192)) ([d4f7649](https://github.com/karma-runner/karma-sauce-launcher/commit/d4f7649b2ca418c00ab867e0173e9289a7245c35))

# [4.0.0](https://github.com/karma-runner/karma-sauce-launcher/compare/v3.0.0...v4.0.0) (2020-03-17)


### chore

* **release:** force-trigger a semantic release ([#189](https://github.com/karma-runner/karma-sauce-launcher/issues/189)) ([64217e4](https://github.com/karma-runner/karma-sauce-launcher/commit/64217e4e5989dd8d241e5cfdcd5c9e02300315fe))


### BREAKING CHANGES

* **release:** Drop support for Node <10.

# [2.0.0](https://github.com/karma-runner/karma-sauce-launcher/compare/v1.2.0...v2.0.0) (2020-03-10)


### chore

* **deps:** Support node 6,8,10 ([2ef4585](https://github.com/karma-runner/karma-sauce-launcher/commit/2ef45850f59e98ff60921351983df7a8a2e93e08))


### BREAKING CHANGES

* **deps:** Drop support for node < 6

<a name="2.0.2"></a>
# [2.0.2](https://github.com/karma-runner/karma-sauce-launcher/compare/v2.0.1...v2.0.2) (2018-12-12)

### Bug Fixes

* Fix misplaced try/catch not catching kill errors ([dcda7b5](https://github.com/karma-runner/karma-sauce-launcher/commit/dcda7b5))


<a name="2.0.1"></a>
# [2.0.1](https://github.com/karma-runner/karma-sauce-launcher/compare/v2.0.0...v2.0.1) (2018-12-12)

### Bug Fixes

* Allow reconnecting if Saucelabs terminated session ([6a9768da](https://github.com/karma-runner/karma-sauce-launcher/commit/6a9768da))


<a name="2.0.0"></a>
# [2.0.0](https://github.com/karma-runner/karma-sauce-launcher/compare/v1.2.0...v2.0.0) (2018-12-11)

### Features

* **BREAKING** Switch launcher to selenium-webdriver ([6525ddd4](https://github.com/karma-runner/karma-sauce-launcher/commit/6525ddd4))


<a name="1.2.0"></a>
# [1.2.0](https://github.com/karma-runner/karma-sauce-launcher/compare/v1.1.0...v1.2.0) (2017-08-22)


### Features

* **config:** add proxy option ([bae758a](https://github.com/karma-runner/karma-sauce-launcher/commit/bae758a))
* **config:** allow SE traffic to be sent via Sauce Connect's Relay ([0ac67d4](https://github.com/karma-runner/karma-sauce-launcher/commit/0ac67d4))
* **config:** pass parentTunnel to selenium ([bae326f](https://github.com/karma-runner/karma-sauce-launcher/commit/bae326f))
* **deps:** upgrade sauce connect ([e792677](https://github.com/karma-runner/karma-sauce-launcher/commit/e792677))
* **launcher:** expose commandTimeout, idleTimeout, maxDuration options ([3fe1c75](https://github.com/karma-runner/karma-sauce-launcher/commit/3fe1c75)), closes [#62](https://github.com/karma-runner/karma-sauce-launcher/issues/62)



<a name="1.1.0"></a>
# [1.1.0](https://github.com/karma-runner/karma-sauce-launcher/compare/v1.0.0...v1.1.0) (2016-10-24)

2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Please see the [Contributing to Karma] guide for information on contributing to this project.

[Contributing to Karma]: https://github.com/karma-runner/karma/blob/master/CONTRIBUTING.md

We use [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) to maintain standardized commit messages. To see how it works, please check out the [@commitlint/config-conventional](https://www.npmjs.com/package/@commitlint/config-conventional) package documentation.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
48 changes: 35 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# karma-sauce-launcher

[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/karma-runner/karma-sauce-launcher)
[![npm version](https://img.shields.io/npm/v/karma-sauce-launcher.svg?style=flat-square)](https://www.npmjs.com/package/karma-sauce-launcher) [![npm downloads](https://img.shields.io/npm/dm/karma-sauce-launcher.svg?style=flat-square)](https://www.npmjs.com/package/karma-sauce-launcher)
[![npm version](https://img.shields.io/npm/v/karma-sauce-launcher.svg?style=flat-square)](https://www.npmjs.com/package/karma-sauce-launcher) [![npm downloads](https://img.shields.io/npm/dm/karma-sauce-launcher.svg?style=flat-square)](https://www.npmjs.com/package/karma-sauce-launcher)
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)

[![Build Status](https://img.shields.io/travis/karma-runner/karma-sauce-launcher/master.svg?style=flat-square)](https://travis-ci.org/karma-runner/karma-sauce-launcher) [![Dependency Status](https://img.shields.io/david/karma-runner/karma-sauce-launcher.svg?style=flat-square)](https://david-dm.org/karma-runner/karma-sauce-launcher) [![devDependency Status](https://img.shields.io/david/dev/karma-runner/karma-sauce-launcher.svg?style=flat-square)](https://david-dm.org/karma-runner/karma-sauce-launcher#info=devDependencies)

@@ -23,6 +24,8 @@ npm install karma-sauce-launcher --save-dev

This launcher is typically used in CI to run your unit tests across many browsers and platforms on Sauce Labs. However, you can also use it locally to debug tests in browsers not available on your machine. It is expected that you are already familiar with Karma when configuring this launcher, so if you are new to Karma, head over to the [Karma website](http://karma-runner.github.io/).

The [Sauce Labs platform configurator](https://wiki.saucelabs.com/display/DOCS/Platform+Configurator/#/) can help to find the correct configuration for your desired test platform.

### Adding karma-sauce-launcher to an existing Karma config

To configure this launcher, you need to add two properties to your top-level Karma config, `sauceLabs` and `customLaunchers`, set the `browsers` array to use Sauce Labs browsers, and add the `sauceLabs` reporter.
@@ -56,6 +59,14 @@ module.exports = function(config) {
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
},
sl_android: {
base: 'SauceLabs',
browserName: 'Browser',
platform: 'Android',
version: '4.4',
deviceName: 'Samsung Galaxy S3 Emulator',
deviceOrientation: 'portrait'
}
}

@@ -94,6 +105,21 @@ Default: `process.env.SAUCE_ACCESS_KEY`

Your Sauce Labs access key which you will see on your [account page](https://saucelabs.com/account).

### region
Type: `String`

Detect datacenter to run tests in. Can be either `eu` or `us`.

### headless
Type: `Boolean`

If set to `true` tests are being run on Sauce Labs headless platform on `us-east-1`. This option will be ignored if `region` is set.

### proxy
Type: `String`

Proxy for connecting to Sauce REST API, which is used to communicate job updates of pass/fail.

### startConnect
Type: `Boolean`
Default: `true`
@@ -159,14 +185,14 @@ Type: `String`
Default: `null`

Control who can view job details. Available visibility levels are documented on
the [SauceLabs website](https://docs.saucelabs.com/reference/test-configuration/#job-visibility).
the [SauceLabs website](https://wiki.saucelabs.com/display/DOCS/Test+Configuration+Options#TestConfigurationOptions-JobVisibility).

### customData
Type: `Object`
Default: `{}`

Send arbitrary data alongside your tests. See
the [SauceLabs documentation](https://docs.saucelabs.com/reference/test-configuration/#recording-custom-data)
the [SauceLabs documentation](https://wiki.saucelabs.com/display/DOCS/Test+Configuration+Options#TestConfigurationOptions-CustomData)
for more details.


@@ -188,26 +214,22 @@ Required: `true`

Name of the browser.

### version
### browserVersion
Type: `String`
Default: Latest browser version for all browsers except Chrome which defaults to `'27'`
Default: Latest browser version for all browsers except Chrome

Version of the browser to use.

### platform
### platformName
Type: `String`
Default: `'Linux'` for Firefox/Chrome, `'Windows 7'` for IE/Safari

Name of platform to run browser on.

### deviceOrientation
Type: `String`
Default: `'portrait'`

Accepted values: `'portrait' || 'landscape'`
### `sauce:options`

Set this string if your unit tests need to run on a particular mobile device orientation for Android Browser or iOS Safari.
Specific Sauce Labs capability [options](https://wiki.saucelabs.com/display/DOCS/Test+Configuration+Options).

## Behind the scenes

This launcher uses Sauce Connect in the background. If you are interested in security or want to see the system requirements, head over to the [documentation](https://wiki.saucelabs.com/display/DOCS/Setting+Up+Sauce+Connect#app-switcher).
This launcher uses Sauce Connect in the background. If you are interested in security or want to see the system requirements, head over to the [documentation](https://wiki.saucelabs.com/display/DOCS/Getting+Started+with+Sauce+Connect+Proxy).
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = {extends: ['@commitlint/config-conventional']};
15 changes: 6 additions & 9 deletions examples/karma.conf-ci.js
Original file line number Diff line number Diff line change
@@ -6,25 +6,23 @@ module.exports = function (config) {

// Browsers to run on Sauce Labs
// Check out https://saucelabs.com/platforms for all browser/OS combos
var customLaunchers = {
const customLaunchers = {
sl_chrome: {
base: 'SauceLabs',
browserName: 'chrome',
platform: 'Windows 7',
version: '35'
version: 'latest'
},
sl_firefox: {
base: 'SauceLabs',
browserName: 'firefox',
version: '30'
version: 'latest'
},
sl_ie_11: {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
version: 'latest'
}
}
};

config.set({
basePath: '',
@@ -40,7 +38,6 @@ module.exports = function (config) {
testName: 'Karma and Sauce Labs demo',
recordScreenshots: false,
connectOptions: {
port: 5757,
logfile: 'sauce_connect.log'
},
public: 'public'
@@ -51,4 +48,4 @@ module.exports = function (config) {
browsers: Object.keys(customLaunchers),
singleRun: true
})
}
};
8 changes: 0 additions & 8 deletions examples/test/.eslintrc

This file was deleted.

Loading