Upgrade old chrome to 45 (#5938)

ampproject · Nov 1, 2016 · 401c180 · 401c180
1 parent e5501a3
commit 401c180
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build-system/config.js b/build-system/config.js
@@ -89,7 +89,7 @@ var karma = {
     browsers: [
       'SL_Chrome_android',
       'SL_Chrome_latest',
-      'SL_Chrome_37',
+      'SL_Chrome_45',
       'SL_Firefox_latest',
       'SL_Safari_8',
       'SL_Safari_9',

diff --git a/build-system/tasks/runtime-test.js b/build-system/tasks/runtime-test.js
@@ -50,7 +50,7 @@ function getConfig() {
     }
     const c = extend(obj, karmaConfig.saucelabs);
     if (argv.oldchrome) {
-      c.browsers = ['SL_Chrome_37']
+      c.browsers = ['SL_Chrome_45'];
     }
   }
 

diff --git a/extensions/amp-a4a/0.1/test/test-amp-a4a.js b/extensions/amp-a4a/0.1/test/test-amp-a4a.js
@@ -730,7 +730,7 @@ describe('amp-a4a', () => {
         const doc = fixture.doc;
         const a4aElement = createA4aElement(doc);
         const a4a = new AmpA4A(a4aElement);
-        a4a.adUrl_ = 'http://foo.com';
+        a4a.adUrl_ = 'https://nowhere.org';
         a4a.maybeRenderAmpAd_ = function() { return Promise.resolve(false); };
         return a4a.maybeRenderAmpAd_().then(rendered => {
           // Force vsync system to run all queued tasks, so that DOM mutations
@@ -747,7 +747,7 @@ describe('amp-a4a', () => {
             expect(a4aElement.children.length).to.equal(1);
             const iframe = a4aElement.children[0];
             expect(iframe.tagName).to.equal('IFRAME');
-            expect(iframe.src.indexOf('http://foo.com')).to.equal(0);
+            expect(iframe.src.indexOf('https://nowhere.org')).to.equal(0);
             expect(iframe.style.visibility).to.equal('');
           });
         });

diff --git a/karma.conf.js b/karma.conf.js
@@ -89,10 +89,10 @@ module.exports = function(config) {
         base: 'SauceLabs',
         browserName: 'chrome',
       },
-      SL_Chrome_37: {
+      SL_Chrome_45: {
         base: 'SauceLabs',
         browserName: 'chrome',
-        version: 37,
+        version: '45',
       },
       SL_iOS_9_1: {
         base: 'SauceLabs',

diff --git a/testing/iframe.js b/testing/iframe.js
@@ -136,7 +136,7 @@ export function createFixtureIframe(fixture, initialIframeHeight, opt_beforeLoad
       };
       let timeout = setTimeout(function() {
         reject(new Error('Timeout waiting for elements to start loading.'));
-      }, 1000);
+      }, 2000);
       // Declare the test ready to run when the document was fully parsed.
       window.afterLoad = function() {
         resolve({