From 77abaa32f11b96346eff15bfda1a5f60b9521eaf Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 1 Dec 2015 10:49:00 -0500 Subject: [PATCH] Fix unit tests Signed-off-by: Marc Delisle --- test/libraries/rte/PMA_TRI_getEditorForm_test.php | 3 +++ test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php | 1 + 2 files changed, 4 insertions(+) diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php index c159c28ec2..622fb4699d 100644 --- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php +++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php @@ -50,6 +50,7 @@ class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase public function testGetEditorFormAdd($data, $matcher) { $GLOBALS['is_ajax_request'] = false; + $GLOBALS['server'] = 1; PMA_TRI_setGlobals(); $this->assertContains( $matcher, @@ -124,6 +125,7 @@ class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase public function testGetEditorFormEdit($data, $matcher) { $GLOBALS['is_ajax_request'] = false; + $GLOBALS['server'] = 1; PMA_TRI_setGlobals(); $this->assertContains( $matcher, @@ -197,6 +199,7 @@ class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase public function testGetEditorFormAjax($data, $matcher) { $GLOBALS['is_ajax_request'] = true; + $GLOBALS['server'] = 1; PMA_TRI_setGlobals(); $this->assertContains( $matcher, diff --git a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php index 77b3de3c0b..2a1979cd71 100644 --- a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php @@ -71,6 +71,7 @@ class PMA_TRI_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase $_REQUEST['item_event'] = $event; $_REQUEST['item_table'] = $table; $_REQUEST['item_definition'] = $definition; + $GLOBALS['server'] = 1; $this->assertEquals($query, PMA_TRI_getQueryFromRequest()); $this->assertEquals($num_err, count($errors));