Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions karma-js.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function(config) {
'node_modules/zone.js/dist/zone-microtask.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/jasmine-patch.js',

// Including systemjs because it defines `__eval`, which produces correct stack traces.
'modules/angular2/src/test_lib/shims_for_IE.js',
'node_modules/systemjs/dist/system.src.js',
Expand All @@ -39,7 +39,7 @@ module.exports = function(config) {
recordVideo: false,
recordScreenshots: false,
options: {
'selenium-version': '2.45.0',
'selenium-version': '2.47.1',
'command-timeout': 600,
'idle-timeout': 600,
'max-duration': 5400
Expand Down
12 changes: 9 additions & 3 deletions sauce.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,15 @@ var customLaunchers = {
'SL_IE11': {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 8.1',
platform: 'Windows 10',
version: '11'
},
'SL_MSEDGE12': {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no vendor in other browser names, I'd just say "SL_EDGE12" for consistency.

base: 'SauceLabs',
browserName: 'microsoftedge',
platform: 'Windows 10',
version: '20.10240'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd hold off with merging that until Sauce updates its Edge version number or it will start breaking after the fact.

@jdalton Do you know when they plan to do it? I contacted BrowserStack & they switched to "12.0".

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd hold off with merging that until Sauce updates its Edge version number or it will start breaking after the fact.

Sauce has been pretty good about not breaking folks with similar changes in the past, the existing '20.10240' is specific enough to avoid conflict for future versions too so I imagine they'll just alias it to '12'.

Do you know when they plan to do it?

I don't have an eta from them.
They've created an internal ticket with the request to change the version for MS Edge.

I contacted BrowserStack & they switched to "12.0".

Yap :D

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the existing '20.10240' is specific enough to avoid conflict for future versions too so I imagine they'll just alias it to '12'.

I don't fully know the Sauce Labs API as I mostly use BrowserStack but can you not pass just a major version, i.e. here 20? If you can then it will get in conflict with a future EdgeHTML 20 version, won't it?

OTH, the build number will be greater then so if they won't use the major only but continue to provide the build number, 20.SOMETHING_LARGE should be preferred to 20.10240 when you just specify 20.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm we'll see.

},
'SL_ANDROID4.1': {
base: 'SauceLabs',
browserName: 'android',
Expand Down Expand Up @@ -111,7 +117,7 @@ var customLaunchers = {

var aliases = {
'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'SauceLabs';}),
'DESKTOP': ['SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_SAFARI7', 'SL_SAFARI8'],
'DESKTOP': ['SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_MSEDGE12', 'SL_SAFARI7', 'SL_SAFARI8'],
'MOBILE': ['SL_ANDROID4.0', 'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5.1', 'SL_IOS7', 'SL_IOS8'],
'ANDROID': ['SL_ANDROID4.0', 'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5.1'],
'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'],
Expand All @@ -120,7 +126,7 @@ var aliases = {
'BETA': ['SL_CHROMEBETA', 'SL_FIREFOXBETA'],
'DEV': ['SL_CHROMEDEV', 'SL_FIREFOXDEV'],
'CI': ['SL_CHROME', 'SL_ANDROID5.1', 'SL_SAFARI7', 'SL_SAFARI8', 'SL_IOS7', 'SL_IOS8', 'SL_FIREFOX',
'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4']
'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_MSEDGE12', 'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4']
};

module.exports = {
Expand Down