From a1fddd2c99b443c1d281fe970b4bfeafa888e52f Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Wed, 27 Apr 2016 18:47:39 +0530 Subject: [PATCH] CRM-18454: webtest fixes CRM-18454: webtest fixes --- tests/phpunit/CiviTest/CiviSeleniumTestCase.php | 2 +- tests/phpunit/WebTest/Contribute/AddBatchesTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php index e2da3a3c16..c3ed08a975 100644 --- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php +++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php @@ -368,7 +368,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase { public function webtestGetValidCountryID() { static $_country_id; if (is_null($_country_id)) { - $_country_id = $this->webtestGetSetting('defaultContactCountry'); + $_country_id = Civi::settings()->get('defaultContactCountry'); } return $_country_id; } diff --git a/tests/phpunit/WebTest/Contribute/AddBatchesTest.php b/tests/phpunit/WebTest/Contribute/AddBatchesTest.php index 8a471ecbd4..95f126ac9d 100644 --- a/tests/phpunit/WebTest/Contribute/AddBatchesTest.php +++ b/tests/phpunit/WebTest/Contribute/AddBatchesTest.php @@ -280,7 +280,7 @@ class WebTest_Contribute_AddBatchesTest extends CiviSeleniumTestCase { $this->webtestVerifyTabularData($expected); $expectedSoft = array( 'Soft Credit To' => "{$data['soft_credit_first_name']} {$data['soft_credit_last_name']}", - 'Amount (Soft Credit Type)' => $data['soft_credit_amount'], + 'Amount (Soft Credit Type)' => "{$data['soft_credit_amount']}", 'Soft Credit Type' => $data['soft_credit_type'], ); foreach ($expectedSoft as $value) { @@ -316,7 +316,7 @@ class WebTest_Contribute_AddBatchesTest extends CiviSeleniumTestCase { $this->webtestVerifyTabularData($expected); $expectedSoft = array( 'Soft Credit To' => "{$data['soft_credit_first_name']} {$data['soft_credit_last_name']}", - 'Amount (Soft Credit Type)' => $data['soft_credit_amount'], + 'Amount (Soft Credit Type)' => "{$data['soft_credit_amount']}", 'Soft Credit Type' => $data['soft_credit_type'], ); foreach ($expectedSoft as $value) { -- 2.25.1