Fixed tests

marcelovani · Apr 19, 2017 · bd02e5a · bd02e5a
1 parent 4257154
commit bd02e5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/dfp.module b/dfp.module
@@ -697,7 +697,7 @@ function _dfp_js_global_settings() {
     $js = 'googletag.cmd.push(function() {' . "\n";
   }
   else {
-     $js .= '  googletag.pubads().enableSyncRendering();' . "\n";
+     $js = 'googletag.pubads().enableSyncRendering();' . "\n";
   }
   if (variable_get('dfp_single_request', 1)) {
     $js .= '  googletag.pubads().enableSingleRequest();' . "\n";

diff --git a/tests/dfp.test b/tests/dfp.test
@@ -464,6 +464,7 @@ class dfpGlobalsTest extends dfpBaseTest {
 
   function testGlobalSettingsOn() {
     $injected_js = $this->randomName(32);
+    $injected_js2 = $this->randomName(32);
     $target = array(
       'target' => $this->randomName(8),
       'value' => $this->randomName(8),
@@ -473,12 +474,14 @@ class dfpGlobalsTest extends dfpBaseTest {
     variable_set('dfp_single_request', '1');
     variable_set('dfp_collapse_empty_divs', '1');
     variable_set('dfp_injected_js', $injected_js);
+    variable_set('dfp_injected_js2', $injected_js2);
     variable_set('dfp_targeting', array($target));
     $this->drupalGet('/');
-    $this->assertRaw('googletag.pubads().enableAsyncRendering();', 'Asyncronous rendering is turned on.');
+    $this->assertRaw('googletag.cmd.push(function() {', 'Asyncronous rendering is turned on.');
     $this->assertRaw('googletag.pubads().enableSingleRequest();', 'Single request is turned on.');
     $this->assertRaw('googletag.pubads().collapseEmptyDivs();', 'Collapse empty divs is turned on.');
     $this->assertRaw($injected_js, 'Injected javascript correctly appears on the page.');
+    $this->assertRaw($injected_js2, 'Injected javascript 2 correctly appears on the page.');
     $this->assertRaw('googletag.pubads().setTargeting("' . $target['target'] . '", "' . $target['value'] . '");', 'Global targetting values appear correclty in javascript.');
   }
 
@@ -487,6 +490,7 @@ class dfpGlobalsTest extends dfpBaseTest {
     variable_set('dfp_single_request', '0');
     variable_set('dfp_collapse_empty_divs', '0');
     $this->drupalGet('/');
+    $this->assertRaw('googletag.pubads().enableSyncRendering();', 'Syncronous rendering is turned on.');
     $this->assertNoRaw('googletag.pubads().enableAsyncRendering();', 'Asyncronous rendering is turned off.');
     $this->assertNoRaw('googletag.pubads().enableSingleRequest();', 'Single request is turned off.');
     $this->assertNoRaw('googletag.pubads().collapseEmptyDivs();', 'Collapse empty divs is turned off.');