Refreshing specific ad slots in a single request and unduplicated afterEachAdLoaded when $.dfp() has been called more than once

tests/SpecRunner.html

@@ -21,6 +21,7 @@
   <!-- include spec files here... -->
   <script type="text/javascript" src="spec/loadingPhaseSpec.js"></script>
   <script type="text/javascript" src="spec/adUnitSpec.js"></script>
+  <script type="text/javascript" src="spec/displayAdsSpec.js"></script>
   <script type="text/javascript" src="spec/TargetingSpec.js"></script>
   <script type="text/javascript" src="spec/categoryExclusionSpec.js"></script>
   <script type="text/javascript" src="spec/setLocationSpec.js"></script>

tests/spec/categoryExclusionSpec.js

@@ -132,6 +132,7 @@ describe('Category Exclusion', function () {
                 enableSingleRequest: function () {},
                 setTargeting: function () {},
                 collapseEmptyDivs: function () {},
+                addEventListener: function () {},
                 setCategoryExclusion: mock.setCategoryExclusion
             };
         };
@@ -172,6 +173,7 @@ describe('Category Exclusion', function () {
                 enableSingleRequest: function () {},
                 setTargeting: function () {},
                 collapseEmptyDivs: function () {},
+                addEventListener: function () {},
                 setCategoryExclusion: mock.setCategoryExclusion
             };
         };
@@ -211,6 +213,7 @@ describe('Category Exclusion', function () {
                 enableSingleRequest: function () {},
                 setTargeting: function () {},
                 collapseEmptyDivs: function () {},
+                addEventListener: function () {},
                 setCategoryExclusion: mock.setCategoryExclusion
             };
         };

tests/spec/displayAdsSpec.js

@@ -0,0 +1,50 @@
+describe('Display Ad units', function () {
+
+    var cleanup = function () {
+        $('.adunit').remove();
+        $('script[src*="gpt.js"]').remove();
+        window.googletag = undefined;
+    };
+    beforeEach(cleanup);
+    afterEach(cleanup);
+
+    it('Refresh ads in single request with disable init load', function (done) {
+        var mock = {};
+            mock.refresh = function (param) {
+        };
+
+        var dummyTag = {};
+        dummyTag.pubads = function () {
+            return {
+                enableSingleRequest: function () {},
+                setTargeting: function () {},
+                collapseEmptyDivs: function () {},
+                disableInitialLoad: function () {},
+                addEventListener: function () {},
+                refresh: mock.refresh
+            };
+        };
+
+        dummyTag.enableServices = function () {};
+
+        spyOn(dummyTag, 'enableServices').and.callThrough();
+        spyOn(mock, 'refresh').and.callThrough();
+
+        jQuery.dfp({
+            dfpID: 'xxxxxxxxx',
+            googletag: dummyTag,
+            disableInitialLoad: true
+        });
+
+        waitsForAndRuns(function () {
+            if (typeof window.googletag.getVersion === 'function') {
+                return true;
+            } else {
+                return false;
+            }
+        }, function () {
+            expect(mock.refresh).toHaveBeenCalled();
+            done();
+        }, 5000);
+    });
+});

tests/spec/loadingPhaseSpec.js

@@ -47,7 +47,7 @@ describe('Loading Phase', function () {
                 return false;
             }
         }, function () {
-            expect(window.googletag.getVersion()).toBeGreaterThan('23');
+            expect(window.googletag.getVersion()).toBeGreaterThan(23);
             done();
         }, 5000);
     });

tests/spec/targetingSpec.js

@@ -18,7 +18,8 @@ describe('Targeting', function () {
             return {
                 enableSingleRequest: function () {},
                 setTargeting: mock.setTargeting,
-                collapseEmptyDivs: function () {}
+                collapseEmptyDivs: function () {},
+                addEventListener: function () {}
             };
         };
 
@@ -56,7 +57,8 @@ describe('Targeting', function () {
             return {
                 enableSingleRequest: function () { },
                 setTargeting: mock.setTargeting,
-                collapseEmptyDivs: function () { }
+                collapseEmptyDivs: function () { },
+                addEventListener: function () { }
             };
         };
 
@@ -91,7 +93,8 @@ describe('Targeting', function () {
             return {
                 enableSingleRequest: function () {},
                 setTargeting: mock.setTargeting,
-                collapseEmptyDivs: function () {}
+                collapseEmptyDivs: function () {},
+                addEventListener: function () {}
             };
         };