From aaa2116b01e92cc45fa23acea75428720e7e0bcc Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 18 Oct 2014 21:59:33 +0530 Subject: [PATCH] Fix some of the failing tests Signed-off-by: Madhura Jayaratne --- test/bootstrap-dist.php | 5 +++-- .../plugin/auth/PMA_AuthenticationCookie_test.php | 15 --------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index 4e74a52351..3fbf682582 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -43,11 +43,12 @@ foreach ($test_defaults as $varname => $defvalue) { } } -// Initialize PMA_VERSION variable +require_once 'libraries/String.class.php'; require_once 'libraries/core.lib.php'; -$GLOBALS['PMA_String'] = $PMA_String; +$GLOBALS['PMA_String'] = new PMA_String(); require_once 'libraries/Config.class.php'; $CFG = new PMA_Config(); +// Initialize PMA_VERSION variable define('PMA_VERSION', $CFG->get('PMA_VERSION')); unset($CFG); diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index dc6ea29c50..0e247bd709 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -393,21 +393,6 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $result ); - $this->assertContains( - '$("#recaptcha_reload_btn").addClass("disableAjax");', - $result - ); - - $this->assertContains( - '$("#recaptcha_switch_audio_btn").addClass("disableAjax");', - $result - ); - - $this->assertContains( - '$("#recaptcha_switch_img_btn").addClass("disableAjax");', - $result - ); - $attrInstance->setValue($restoreInstance); }