From e81eda287a218b6c9e185b511b409d3ba33cbde2 Mon Sep 17 00:00:00 2001
From: Lucas Galfaso <lgalfaso@gmail.com>
Date: Fri, 2 Jan 2015 16:28:45 +0100
Subject: [PATCH] chore(travis): update browsers to the latest version

Update the used browsers to the latest versions available
---
 karma-shared.conf.js             | 12 ++++++------
 test/helpers/privateMocksSpec.js | 25 ++++++++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/karma-shared.conf.js b/karma-shared.conf.js
index 522cdc86693f..1f0fe672284e 100644
--- a/karma-shared.conf.js
+++ b/karma-shared.conf.js
@@ -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',
@@ -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',
diff --git a/test/helpers/privateMocksSpec.js b/test/helpers/privateMocksSpec.js
index 6d86ecb81c2a..dd4b19f636d4 100644
--- a/test/helpers/privateMocksSpec.js
+++ b/test/helpers/privateMocksSpec.js
@@ -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];