From 0acbf9954955a94f9373ea65cc38536689d8bac4 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 14 Apr 2015 13:27:08 -0400
Subject: [PATCH] Fix unit tests for Cloudflare support

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 test/classes/PMA_Footer_test.php  |  2 +-
 test/classes/PMA_Scripts_test.php | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php
index 0f64889e73..85aece7d00 100644
--- a/test/classes/PMA_Footer_test.php
+++ b/test/classes/PMA_Footer_test.php
@@ -224,7 +224,7 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
     {
         $footer = new PMA_Footer();
         $this->assertContains(
-            '<script type="text/javascript">',
+            '<script data-cfasync="false" type="text/javascript">',
             $footer->getScripts()->getDisplay()
         );
     }
diff --git a/test/classes/PMA_Scripts_test.php b/test/classes/PMA_Scripts_test.php
index 3acaae4234..49af79bc2f 100644
--- a/test/classes/PMA_Scripts_test.php
+++ b/test/classes/PMA_Scripts_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Tests for Script.class.php
  *
@@ -78,7 +79,8 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
     public function testIncludeFile()
     {
         $this->assertEquals(
-            '<script type="text/javascript" src="js/get_scripts.js.php?'
+            '<script data-cfasync="false" type="text/javascript" '
+            . 'src="js/get_scripts.js.php?'
             . 'scripts%5B%5D=common.js"></script>',
             $this->_callPrivateFunction(
                 '_includeFiles',
@@ -107,8 +109,10 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
         $this->object->addEvent('onClick', 'doSomething');
 
         $this->assertRegExp(
-            '@<script type="text/javascript" src="js/get_scripts.js.php\\?'
-            . 'scripts%5B%5D=common.js"></script><script type="text/'
+            '@<script data-cfasync="false" type="text/javascript" '
+            . 'src="js/get_scripts.js.php\\?'
+            . 'scripts%5B%5D=common.js"></script>'
+            . '<script data-cfasync="false" type="text/'
             . 'javascript">// <!\\[CDATA\\[' . "\n"
             . 'AJAX.scriptHandler.add\\("common.js",1\\);' . "\n"
             . '\\$\\(function\\(\\) \\{AJAX.fireOnload\\("common.js"\\);\\}\\);'
@@ -130,7 +134,7 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
         $this->object->addCode('alert(\'CodeAdded\');');
 
         $this->assertEquals(
-            '<script type="text/javascript">// <![CDATA[
+            '<script data-cfasync="false" type="text/javascript">// <![CDATA[
 alert(\'CodeAdded\');
 AJAX.scriptHandler;
 $(function() {});