Skip to content

Commit c0e8fef

Browse files
authored
Merge pull request #2763 from gonzalez/karma-sauncelabs-fix
updating addEventListener to support older browsers
2 parents 1dfec11 + 2e57316 commit c0e8fef

File tree

6 files changed

+1486
-1044
lines changed

6 files changed

+1486
-1044
lines changed

.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ node_js:
55
- "6.14.1"
66
- "8.11.1"
77
- "9.11.1"
8-
# matrix:
9-
# include:
10-
# - node_js: "4.0"
11-
# env: BROWSER=true
8+
matrix:
9+
include:
10+
- node_js: "4.0"
11+
env: BROWSER=true
1212
before_install:
13-
# - npm install -g [email protected]
14-
# - npm install -g karma-cli
13+
- npm install -g [email protected]
14+
- npm install -g karma-cli
1515
before_script:
16-
# - npm install karma-sauce-launcher
17-
# - export DISPLAY=:99.0
18-
# - sh -e /etc/init.d/xvfb start
16+
- npm install karma-sauce-launcher
17+
- export DISPLAY=:99.0
18+
- sh -e /etc/init.d/xvfb start
1919
script:
2020
- npm test
21-
# - "[ $BROWSER == false ] || npm run test-browser"
22-
# - "[ $BROWSER == false ] || karma start karma.conf-sauce.js"
21+
- "[ $BROWSER == false ] || npm run test-browser"
22+
- "[ $BROWSER == false ] || karma start karma.conf-sauce.js"
2323
notifications:
2424
email: false
2525
env:

karma.conf-sauce.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,21 @@ var sauceBrowsers = _.reduce([
1313
['chrome', '31'],
1414
['chrome', '26'],
1515

16-
['microsoftedge', '20.10240', 'Windows 10'],
17-
['internet explorer', '11', 'Windows 10'],
16+
// ['microsoftedge', 'latest', 'Windows 10'],
17+
// ['internet explorer', '11', 'Windows 10'],
1818
['internet explorer', '10', 'Windows 8'],
1919
['internet explorer', '9', 'Windows 7'],
20-
// Currently disabled due to karma-sauce issues
20+
21+
// Currently disabled due to karma-sauce issues
2122
// ['internet explorer', '8'],
2223
// ['internet explorer', '7'],
2324
// ['internet explorer', '6'],
2425

25-
['opera', '12'],
26-
['opera', '11'],
27-
28-
['android', '5'],
29-
['android', '4.4'],
30-
['android', '4.3'],
31-
['android', '4.0'],
32-
26+
//['android', 'latest']
27+
3328
['safari', '8.0', 'OS X 10.10'],
3429
['safari', '7'],
35-
['safari', '6'],
36-
['safari', '5']
30+
3731
], function(memo, platform) {
3832
// internet explorer -> ie
3933
var label = platform[0].split(' ');
@@ -60,6 +54,8 @@ module.exports = function(config) {
6054
basePath: '',
6155
frameworks: ['qunit'],
6256
singleRun: true,
57+
browserDisconnectTolerance: 5,
58+
browserNoActivityTimeout: 240000,
6359

6460
// list of files / patterns to load in the browser
6561
files: [

0 commit comments

Comments
 (0)