Skip to content

Commit

Permalink
Merge pull request jashkenas#2763 from gonzalez/karma-sauncelabs-fix
Browse files Browse the repository at this point in the history
updating addEventListener to support older browsers
  • Loading branch information
jashkenas authored Jun 5, 2018
2 parents 1dfec11 + 2e57316 commit c0e8fef
Show file tree
Hide file tree
Showing 6 changed files with 1,486 additions and 1,044 deletions.
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ node_js:
- "6.14.1"
- "8.11.1"
- "9.11.1"
# matrix:
# include:
# - node_js: "4.0"
# env: BROWSER=true
matrix:
include:
- node_js: "4.0"
env: BROWSER=true
before_install:
# - npm install -g npm@2.6
# - npm install -g karma-cli
- npm install -g npm@2.6
- npm install -g karma-cli
before_script:
# - npm install karma-sauce-launcher
# - export DISPLAY=:99.0
# - sh -e /etc/init.d/xvfb start
- npm install karma-sauce-launcher
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
script:
- npm test
# - "[ $BROWSER == false ] || npm run test-browser"
# - "[ $BROWSER == false ] || karma start karma.conf-sauce.js"
- "[ $BROWSER == false ] || npm run test-browser"
- "[ $BROWSER == false ] || karma start karma.conf-sauce.js"
notifications:
email: false
env:
Expand Down
22 changes: 9 additions & 13 deletions karma.conf-sauce.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,21 @@ var sauceBrowsers = _.reduce([
['chrome', '31'],
['chrome', '26'],

['microsoftedge', '20.10240', 'Windows 10'],
['internet explorer', '11', 'Windows 10'],
// ['microsoftedge', 'latest', 'Windows 10'],
// ['internet explorer', '11', 'Windows 10'],
['internet explorer', '10', 'Windows 8'],
['internet explorer', '9', 'Windows 7'],
// Currently disabled due to karma-sauce issues

// Currently disabled due to karma-sauce issues
// ['internet explorer', '8'],
// ['internet explorer', '7'],
// ['internet explorer', '6'],

['opera', '12'],
['opera', '11'],

['android', '5'],
['android', '4.4'],
['android', '4.3'],
['android', '4.0'],

//['android', 'latest']

['safari', '8.0', 'OS X 10.10'],
['safari', '7'],
['safari', '6'],
['safari', '5']

], function(memo, platform) {
// internet explorer -> ie
var label = platform[0].split(' ');
Expand All @@ -60,6 +54,8 @@ module.exports = function(config) {
basePath: '',
frameworks: ['qunit'],
singleRun: true,
browserDisconnectTolerance: 5,
browserNoActivityTimeout: 240000,

// list of files / patterns to load in the browser
files: [
Expand Down
Loading

0 comments on commit c0e8fef

Please sign in to comment.