Skip to content
This repository was archived by the owner on Aug 14, 2019. It is now read-only.

Commit 5860fc4

Browse files
Try to enable IE9 and Edge again. (#63)
1 parent 881eef9 commit 5860fc4

File tree

1 file changed

+17
-21
lines changed

1 file changed

+17
-21
lines changed

karma.conf.ci.js

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,11 @@ var customLaunchers = {
3232
browserName: 'safari',
3333
version: '9.0'
3434
},
35-
// FIXME(ndhoule): Bad IE7/8 support in testing packages make these fail
36-
// sl_ie_7: {
37-
// base: 'SauceLabs',
38-
// browserName: 'internet explorer',
39-
// version: '7'
40-
// },
41-
// sl_ie_8: {
42-
// base: 'SauceLabs',
43-
// browserName: 'internet explorer',
44-
// version: '8'
45-
// },
46-
// sl_ie_9: {
47-
// base: 'SauceLabs',
48-
// browserName: 'internet explorer',
49-
// version: '9'
50-
// },
35+
sl_ie_9: {
36+
base: 'SauceLabs',
37+
browserName: 'internet explorer',
38+
version: '9'
39+
},
5140
sl_ie_10: {
5241
base: 'SauceLabs',
5342
browserName: 'internet explorer',
@@ -57,12 +46,11 @@ var customLaunchers = {
5746
base: 'SauceLabs',
5847
browserName: 'internet explorer',
5948
version: '11'
49+
},
50+
sl_edge_latest: {
51+
base: 'SauceLabs',
52+
browserName: 'microsoftedge'
6053
}
61-
// FIXME(peripheral1994): New builds have caused Edge14 and IE9 to fail incorrectly.
62-
// sl_edge_latest: {
63-
// base: 'SauceLabs',
64-
// browserName: 'microsoftedge'
65-
// }
6654
};
6755

6856
module.exports = function(config) {
@@ -75,6 +63,14 @@ module.exports = function(config) {
7563
config.set({
7664
browserDisconnectTolerance: 1,
7765

66+
/**
67+
* We add the Disconnect and Activity timeouts here to help IE9 and Edge. With this many tests, they end up
68+
* taking a long time to complete. This lets them run over all of their tests.
69+
*/
70+
browserDisconnectTimeout: 60000,
71+
72+
browserNoActivityTimeout: 60000,
73+
7874
singleRun: true,
7975

8076
reporters: ['progress', 'junit', 'coverage'],

0 commit comments

Comments
 (0)