Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit e81eda2

Browse files
committed
chore(travis): update browsers to the latest version
Update the used browsers to the latest versions available
1 parent c66b4b6 commit e81eda2

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

karma-shared.conf.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ module.exports = function(config, specificOptions) {
3535
'SL_Chrome': {
3636
base: 'SauceLabs',
3737
browserName: 'chrome',
38-
version: '34'
38+
version: '39'
3939
},
4040
'SL_Firefox': {
4141
base: 'SauceLabs',
4242
browserName: 'firefox',
43-
version: '26'
43+
version: '31'
4444
},
4545
'SL_Safari': {
4646
base: 'SauceLabs',
4747
browserName: 'safari',
48-
platform: 'OS X 10.9',
49-
version: '7'
48+
platform: 'OS X 10.10',
49+
version: '8'
5050
},
5151
'SL_IE_9': {
5252
base: 'SauceLabs',
@@ -71,13 +71,13 @@ module.exports = function(config, specificOptions) {
7171
base: 'BrowserStack',
7272
browser: 'chrome',
7373
os: 'OS X',
74-
os_version: 'Mountain Lion'
74+
os_version: 'Yosemite'
7575
},
7676
'BS_Safari': {
7777
base: 'BrowserStack',
7878
browser: 'safari',
7979
os: 'OS X',
80-
os_version: 'Mountain Lion'
80+
os_version: 'Yosemite'
8181
},
8282
'BS_Firefox': {
8383
base: 'BrowserStack',

test/helpers/privateMocksSpec.js

+16-9
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,29 @@ describe('private mocks', function() {
99
var doc = $document[0];
1010
var count = doc.styleSheets.length;
1111
var stylesheet = createMockStyleSheet($document, $window);
12-
expect(doc.styleSheets.length).toBe(count + 1);
12+
var elm;
13+
runs(function() {
14+
expect(doc.styleSheets.length).toBe(count + 1);
1315

14-
angular.element(doc.body).append($rootElement);
16+
angular.element(doc.body).append($rootElement);
1517

16-
var elm = $compile('<div class="padded">...</div>')($rootScope);
17-
$rootElement.append(elm);
18+
elm = $compile('<div class="padded">...</div>')($rootScope);
19+
$rootElement.append(elm);
1820

19-
expect(getStyle(elm, 'paddingTop')).toBe('0px');
21+
expect(getStyle(elm, 'paddingTop')).toBe('0px');
2022

21-
stylesheet.addRule('.padded', 'padding-top:2px');
23+
stylesheet.addRule('.padded', 'padding-top:2px');
24+
});
2225

23-
expect(getStyle(elm, 'paddingTop')).toBe('2px');
26+
waitsFor(function() {
27+
return getStyle(elm, 'paddingTop') === '2px';
28+
});
2429

25-
stylesheet.destroy();
30+
runs(function() {
31+
stylesheet.destroy();
2632

27-
expect(getStyle(elm, 'paddingTop')).toBe('0px');
33+
expect(getStyle(elm, 'paddingTop')).toBe('0px');
34+
});
2835

2936
function getStyle(element, key) {
3037
var node = element[0];

0 commit comments

Comments
 (0)