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

chore(travis): update browsers to the latest version #10620

Closed
wants to merge 1 commit into from
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
12 changes: 6 additions & 6 deletions karma-shared.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ module.exports = function(config, specificOptions) {
'SL_Chrome': {
base: 'SauceLabs',
browserName: 'chrome',
version: '34'
version: '39'
},
'SL_Firefox': {
base: 'SauceLabs',
browserName: 'firefox',
version: '26'
version: '31'
},
'SL_Safari': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.9',
version: '7'
platform: 'OS X 10.10',
version: '8'
},
'SL_IE_9': {
base: 'SauceLabs',
Expand All @@ -71,13 +71,13 @@ module.exports = function(config, specificOptions) {
base: 'BrowserStack',
browser: 'chrome',
os: 'OS X',
os_version: 'Mountain Lion'
os_version: 'Yosemite'
},
'BS_Safari': {
base: 'BrowserStack',
browser: 'safari',
os: 'OS X',
os_version: 'Mountain Lion'
os_version: 'Yosemite'
},
'BS_Firefox': {
base: 'BrowserStack',
Expand Down
25 changes: 16 additions & 9 deletions test/helpers/privateMocksSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,29 @@ describe('private mocks', function() {
var doc = $document[0];
var count = doc.styleSheets.length;
var stylesheet = createMockStyleSheet($document, $window);
expect(doc.styleSheets.length).toBe(count + 1);
var elm;
runs(function() {
expect(doc.styleSheets.length).toBe(count + 1);

angular.element(doc.body).append($rootElement);
angular.element(doc.body).append($rootElement);

var elm = $compile('<div class="padded">...</div>')($rootScope);
$rootElement.append(elm);
elm = $compile('<div class="padded">...</div>')($rootScope);
$rootElement.append(elm);

expect(getStyle(elm, 'paddingTop')).toBe('0px');
expect(getStyle(elm, 'paddingTop')).toBe('0px');

stylesheet.addRule('.padded', 'padding-top:2px');
stylesheet.addRule('.padded', 'padding-top:2px');
});

expect(getStyle(elm, 'paddingTop')).toBe('2px');
waitsFor(function() {
return getStyle(elm, 'paddingTop') === '2px';
});

stylesheet.destroy();
runs(function() {
stylesheet.destroy();

expect(getStyle(elm, 'paddingTop')).toBe('0px');
expect(getStyle(elm, 'paddingTop')).toBe('0px');
});

function getStyle(element, key) {
var node = element[0];
Expand Down