From 73e14ebac0bc235461e8fa0308e945c98f77bab3 Mon Sep 17 00:00:00 2001
From: Fang Bai <fang.bai@openx.com>
Date: Thu, 9 Nov 2017 16:38:58 -0800
Subject: [PATCH] Add mediaType adn vastUrl for video reponse

---
 modules/openxBidAdapter.js                |  9 +++-----
 test/spec/modules/openxBidAdapter_spec.js | 28 ++++++++---------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/modules/openxBidAdapter.js b/modules/openxBidAdapter.js
index 06729169807..6f81d0ede84 100644
--- a/modules/openxBidAdapter.js
+++ b/modules/openxBidAdapter.js
@@ -333,7 +333,7 @@ function generateVideoParameters(bid) {
 function createVideoBidResponses(response, {bid, startTime}) {
   let bidResponses = [];
 
-  if (response !== undefined && response.cache_key !== '' && response.pub_rev !== '') {
+  if (response !== undefined && response.vastUrl !== '' && response.pub_rev !== '') {
     let bidResponse = {};
     bidResponse.requestId = bid.bidId;
     bidResponse.bidderCode = BIDDER_CODE;
@@ -346,12 +346,9 @@ function createVideoBidResponses(response, {bid, startTime}) {
     bidResponse.width = response.width;
     bidResponse.height = response.height;
     bidResponse.creativeId = response.adid;
+    bidResponse.vastUrl = response.vastUrl;
+    bidResponse.mediaType = VIDEO;
 
-    bidResponse.openx = {
-      ff: response.cache_key,
-      oxcolo: response.per_colo_domain,
-      oxph: response.ph
-    };
     bidResponses.push(bidResponse);
   }
 
diff --git a/test/spec/modules/openxBidAdapter_spec.js b/test/spec/modules/openxBidAdapter_spec.js
index b0f7d79fb18..a03bebf9e0a 100644
--- a/test/spec/modules/openxBidAdapter_spec.js
+++ b/test/spec/modules/openxBidAdapter_spec.js
@@ -5,7 +5,7 @@ import { newBidder } from 'src/adapters/bidderFactory';
 const URLBASE = '/w/1.0/arj';
 const URLBASEVIDEO = '/v/1.0/avjp';
 
-describe.only('OpenxAdapter', () => {
+describe('OpenxAdapter', () => {
   const adapter = newBidder(spec);
 
   describe('inherited functions', () => {
@@ -169,9 +169,7 @@ describe.only('OpenxAdapter', () => {
         'unit': '12345678',
         'delDomain': 'test-del-domain',
         'video': {
-          'be': 'true',
           'url': 'abc.com',
-          'vtest': '1'
         }
       },
       'adUnitCode': 'adunit-code',
@@ -196,8 +194,6 @@ describe.only('OpenxAdapter', () => {
       expect(dataParams.auid).to.equal('12345678');
       expect(dataParams.url).to.exist;
       expect(dataParams.url).to.equal('abc.com');
-      expect(dataParams.vtest).to.exist;
-      expect(dataParams.vtest).to.equal('1');
     });
   });
 
@@ -301,9 +297,7 @@ describe.only('OpenxAdapter', () => {
         'unit': '12345678',
         'delDomain': 'test-del-domain',
         'video': {
-          'be': 'true',
           'url': 'abc.com',
-          'vtest': '1'
         }
       },
       'adUnitCode': 'adunit-code',
@@ -320,11 +314,12 @@ describe.only('OpenxAdapter', () => {
       payload: {'bid': bids[0], 'startTime': new Date()}
     };
     let bidResponse = {
-      'cache_key': 'test_cache_key',
       'pub_rev': '1',
-      'per_colo_domain': 'http://delivery-us-west-1.openx.net',
-      'ph': '7a3b9374-7986-4a41-a79d-034193518aee',
-      'adid': 5678,
+      'width': '640',
+      'height': '480',
+      'adid': '5678',
+      'vastUrl': 'http://testvast.com',
+      'pixels': 'http://testpixels.net'
     };
 
     it('should return correct bid response', () => {
@@ -335,12 +330,9 @@ describe.only('OpenxAdapter', () => {
           'cpm': 1,
           'width': '640',
           'height': '480',
-          'creativeId': 5678,
-          'openx': {
-            'ff': 'test_cache_key',
-            'oxcolo': 'http://delivery-us-west-1.openx.net',
-            'oxph': '7a3b9374-7986-4a41-a79d-034193518aee'
-          },
+          'mediaType': 'video',
+          'creativeId': '5678',
+          'vastUrl': 'http://testvast.com',
           'ttl': 300,
           'netRevenue': true,
           'currency': 'USD'
@@ -352,7 +344,7 @@ describe.only('OpenxAdapter', () => {
     });
 
     it('handles nobid responses', () => {
-      let bidResponse = {'cache_key': '', 'pub_rev': '', 'per_colo_domain': '', 'ph': ''};
+      let bidResponse = {'vastUrl': '', 'pub_rev': '', 'width': '', 'height': '', 'adid': '', 'pixels': ''};
       let result = spec.interpretResponse({body: bidResponse}, bidRequest);
       expect(result.length).to.equal(0);
     });