Merge branch 'master' into DATA-23357

Author: SuperIzya

modules/videoModule/index.js

@@ -187,12 +187,12 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
   }
 
   function auctionEnd(auctionResult) {
-    auctionResult.adUnits.forEach(adUnit => {
-      if (adUnit.video) {
-        renderWinningBid(adUnit);
-      }
-    });
     pbEvents.off(EVENTS.AUCTION_END, auctionEnd);
+    return Promise.all(
+      auctionResult.adUnits
+        .filter(au => au.video)
+        .map(renderWinningBid)
+    )
   }
 
   function getAdServerConfig(adUnitVideoConfig) {
@@ -212,6 +212,7 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
 
     const adServerConfig = getAdServerConfig(videoConfig);
     const winningBid = getWinningBid(adUnitCode);
+    if (!winningBid) return;
 
     const options = { adUnitCode };
 

test/spec/modules/videoModule/pbVideo_spec.js

@@ -246,12 +246,13 @@ describe('Prebid Video', function () {
         }
       }
     };
-    const auctionResults = { adUnits: [ expectedAdUnit, {} ] };
+    let auctionResults;
 
     beforeEach(() => {
       gamSubmoduleMock.getAdTagUrl.resetHistory();
       videoCoreMock.setAdTagUrl.resetHistory();
       adQueueCoordinatorMock.queueAd.resetHistory();
+      auctionResults = { adUnits: [ expectedAdUnit, {} ] };
     });
 
     let beforeBidRequestCallback;
@@ -278,6 +279,20 @@ describe('Prebid Video', function () {
       expect(gamSubmoduleMock.getAdTagUrl.getCall(0).args[1]).is.equal(expectedAdTag);
     });
 
+    it('should not choke when there are no bids', () => {
+      const pbGlobal = Object.assign({}, pbGlobalMock, {
+        requestBids,
+        getHighestCpmBids: () => []
+      });
+      auctionResults.adUnits[1].video = {divId: 'other-div'};
+      pbVideoFactory(null, getConfig, pbGlobal, pbEvents);
+      beforeBidRequestCallback(() => {}, {});
+      return auctionEndCallback(auctionResults)
+        .then(() => {
+          sinon.assert.notCalled(gamSubmoduleMock.getAdTagUrl);
+        });
+    })
+
     it('should load ad tag when ad server returns ad tag', function () {
       const expectedAdTag = 'resulting ad tag';
       const gamSubmoduleFactory = () => ({