From fcd8033d5378756df1c708c8b155e8199102a5cf Mon Sep 17 00:00:00 2001 From: Ravish Nair Date: Fri, 30 Aug 2013 16:41:33 +0530 Subject: [PATCH] -- webtest fix --- tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php | 2 +- tests/phpunit/WebTest/Import/ActivityTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php b/tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php index 0a3dcdca62..7f6387ef3a 100644 --- a/tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php +++ b/tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php @@ -110,7 +110,7 @@ class WebTest_Generic_GeneralClickAroundTest extends CiviSeleniumTestCase { // Contributions → Dashboard $this->click("css=ul#civicrm-menu li.crm-Contributions"); $this->click("css=ul#civicrm-menu li.crm-Contributions li.crm-Dashboard a"); - $this->waitForPageToLoad($this->getTimeoutMsec()); + $this->waitForElementPresent('chart_type'); $this->assertTextPresent("Contribution Summary"); $this->assertTextPresent("Select Year (for monthly breakdown)"); diff --git a/tests/phpunit/WebTest/Import/ActivityTest.php b/tests/phpunit/WebTest/Import/ActivityTest.php index 44e5a35a61..3a8f02c765 100644 --- a/tests/phpunit/WebTest/Import/ActivityTest.php +++ b/tests/phpunit/WebTest/Import/ActivityTest.php @@ -38,7 +38,7 @@ class WebTest_Import_ActivityTest extends ImportCiviSeleniumTestCase { // Get sample import data. list($headers, $rows) = $this->_activityCSVData(); $fieldMapper = array( - 'mapper[0][0]' => 'target_contact_id', + 'mapper[0][0]' => 'contact_id', 'mapper[1][0]' => 'activity_label', 'mapper[2][0]' => 'activity_subject', 'mapper[3][0]' => 'activity_date_time', -- 2.25.1