[Luis, Carlos] Refactored VASTClient ad validation to be able to chec…

…k in an Inline ad is supported
widespace-os · Feb 3, 2016 · 1bd48ce · 1bd48ce
1 parent 3f056f8
commit 1bd48ce
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/src/scripts/ads/vast/InLine.js b/src/scripts/ads/vast/InLine.js
@@ -42,4 +42,16 @@ function InLine(inlineJTree) {
   }
 }
 
+
+/**
+ * Returns true if the browser is able to play at least one of the creatives.
+ */
+InLine.prototype.isSupported = function(){
+  if(this.creatives.length === 0) {
+    return false;
+  }
+
+  return true;
+};
+
 module.exports = InLine;
diff --git a/src/scripts/ads/vast/VASTClient.js b/src/scripts/ads/vast/VASTClient.js
@@ -183,13 +183,15 @@ VASTClient.prototype._getVASTAd = function (adTagUrl, callback) {
       return new VASTError(errMsgPrefix + "nor wrapper nor inline elements found on the Ad", 101);
     }
 
-    if (inLine && inLine.creatives.length === 0) {
-      return new VASTError(errMsgPrefix + "missing creative in InLine element", 101);
+    if (inLine && !inLine.isSupported()) {
+      return new VASTError(errMsgPrefix + "could not find MediaFile that is supported by this video player", 403);
     }
 
     if (wrapper && !wrapper.VASTAdTagURI) {
       return new VASTError(errMsgPrefix + "missing 'VASTAdTagURI' in wrapper", 101);
     }
+
+    return null;
   }
 
   function requestVASTAd(adTagUrl, callback) {

diff --git a/test/ads/vast/Inline.spec.js b/test/ads/vast/Inline.spec.js
@@ -221,4 +221,17 @@ describe("InLine", function () {
       });
     });
   });
+
+  describe("isSupported", function(){
+    var inLine;
+
+    beforeEach(function(){
+      inLine = new InLine(xml.toJXONTree(inlineXML));
+    });
+
+    it("must return false if the inLine has no creatives", function(){
+      inLine.creatives.length = 0;
+      assert.isFalse(inLine.isSupported());
+    });
+  });
 });
diff --git a/test/ads/vast/VASTClient.spec.js b/test/ads/vast/VASTClient.spec.js
@@ -530,8 +530,8 @@ describe("VASTClient", function () {
           '<VAST version="2.0"><Ad id="secondAd"><InLine></InLine></Ad></VAST>');
         this.clock.tick();
 
-        assertError(callback, "on VASTClient.getVASTAd.validateAd, missing creative in InLine element", 101);
-        assertErrorTrack("on VASTClient.getVASTAd.validateAd, missing creative in InLine element", 101, ['firstAd', 'secondAd']);
+        assertError(callback, "on VASTClient.getVASTAd.validateAd, could not find MediaFile that is supported by this video player", 403);
+        assertErrorTrack("on VASTClient.getVASTAd.validateAd, could not find MediaFile that is supported by this video player", 403, ['firstAd', 'secondAd']);
       });
 
       it("must return a 101 error to the callback and track it if one of the ads in the chain is a wrapper with no VASTAdTagURI", function(){
@@ -589,8 +589,8 @@ describe("VASTClient", function () {
         requests[1].respond(200, {"Content-Type": "text"}, vastXML('<Ad id="adChain2"><InLine><Creatives></Creatives></InLine></Ad>'));
         this.clock.tick();
 
-        assertError(callback, "on VASTClient.getVASTAd.validateAd, missing creative in InLine element", 101);
-        assertErrorTrack("on VASTClient.getVASTAd.validateAd, missing creative in InLine element", 101, ['adChain2', 'adChain2']);
+        assertError(callback, "on VASTClient.getVASTAd.validateAd, could not find MediaFile that is supported by this video player", 403);
+        assertErrorTrack("on VASTClient.getVASTAd.validateAd, could not find MediaFile that is supported by this video player", 403, ['adChain2', 'adChain2']);
       });
 
       it("must not pass an error to the callback if one of the adChains in the VAST waterfall returned a valid ad", function(){