Merge branch 'i-like-robots-namespace-option' of https://github.com/i…

…-like-robots/jquery.dfp.js into i-like-robots-i-like-robots-namespace-option
davireis · Feb 28, 2014 · 8010a25 · 8010a25
2 parents 01cb0e1 + 358f045
commit 8010a25
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/jquery.dfp.js b/jquery.dfp.js
@@ -75,7 +75,8 @@
             refreshExisting: true,
             disablePublisherConsole: false,
             disableInitialLoad: false,
-            noFetch: false
+            noFetch: false,
+            namespace: undefined
         };
 
         if (typeof options.setUrlTargeting === 'undefined' || options.setUrlTargeting)
@@ -349,7 +350,7 @@
      */
     getName = function ($adUnit) {
 
-        return $adUnit.data('adunit') || $adUnit.attr('id');
+        return $adUnit.data('adunit') || dfpOptions.namespace || $adUnit.attr('id');
 
     },
 

diff --git a/jquery.dfp.min.js b/jquery.dfp.min.js
diff --git a/tests/spec/adUnitSpec.js b/tests/spec/adUnitSpec.js
@@ -50,4 +50,26 @@ describe('Ad units', function () {
 
     });
 
+    it("Google ad unit object get attached to the ad unit container (with namespace)", function () {
+        var namespace = 'my-long-namespace';
+
+        runs(function () {
+            $('body').append('<div class="adunit"></div>');
+            $.dfp({dfpID: 'xxxxxxx', namespace: namespace});
+        }, "Kick off loader");
+
+        waitsFor(function () {
+            if (typeof window.googletag.getVersion === 'function') {
+                return true;
+            } else {
+                return false;
+            }
+        }, "getVersion function to exist", 5000);
+
+        runs(function () {
+            expect($('.adunit').data('googleAdUnit').getName()).toEqual('/xxxxxxx/' + namespace);
+        });
+
+    });
+
 });