Fix flaky amp-ad-3p-impl preconnect test (ampproject#9011)

* Fix flaky amp-ad-3p-impl preconnect test * fix stupid sinon * Fix babel-helper stub
spotxchange · May 3, 2017 · acd61c5 · acd61c5
1 parent 9afed66
commit acd61c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js b/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js
@@ -179,10 +179,8 @@ describe('amp-ad-3p-impl', () => {
     });
   });
 
-  // TODO(#8965) unskip test
   describe('preconnectCallback', () => {
-    it.configure().skipOldChrome()
-    .run('should add preconnect and prefech to DOM header', () => {
+    it('should add preconnect and prefech to DOM header', () => {
       ad3p.buildCallback();
       ad3p.preconnectCallback();
       return whenFirstVisible.then(() => {

diff --git a/testing/test-helper.js b/testing/test-helper.js
@@ -18,13 +18,12 @@ import {xhrServiceForTesting} from '../src/service/xhr-impl';
 import {getService, getServiceForDoc} from '../src/service';
 
 export function stubService(sandbox, win, serviceId, method) {
-  const stub = sandbox.stub();
-  getService(win, serviceId, () => {
-    const service = {};
-    service[method] = stub;
-    return service;
+  const service = getService(win, serviceId, () => {
+    return {
+      [method]: () => {},
+    };
   });
-  return stub;
+  return sandbox.stub(service, method);
 }
 
 export function stubServiceForDoc(sandbox, ampdoc, serviceId, method) {

diff --git a/third_party/babel/custom-babel-helpers.js b/third_party/babel/custom-babel-helpers.js
@@ -92,5 +92,6 @@
 
   babelHelpers.defineProperty = function(obj, key, value) {
       obj[key] = value;
+      return obj;
   };
 })(typeof global === "undefined" ? self : global);