From 1d4d99e9f50b6795d11466ce6c1550a6b504fa4e Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Thu, 8 May 2014 20:02:18 +0530 Subject: [PATCH] Web Test Fix --- .../WebTest/Activity/StandaloneAddTest.php | 11 +++++-- .../Admin/Form/ScheduleReminderTest.php | 2 +- .../phpunit/WebTest/Campaign/ActivityTest.php | 6 ++-- .../Campaign/CampaignDescriptionTest.php | 4 +-- .../phpunit/WebTest/Campaign/MailingTest.php | 4 +-- .../WebTest/Campaign/MembershipTest.php | 4 +-- .../Campaign/OfflineEventRegistrationTest.php | 8 ++--- .../Campaign/OnlineContributionTest.php | 4 +-- .../Campaign/OnlineEventRegistrationTest.php | 4 +-- tests/phpunit/WebTest/Campaign/PledgeTest.php | 4 +-- .../AddContactsToEventAdvancedSearchTest.php | 2 +- .../WebTest/Contact/ContactTagTest.php | 33 +++++++++---------- .../WebTest/Contact/CustomDataAddTest.php | 6 ++-- .../WebTest/Contact/RelationshipAddTest.php | 4 +-- .../WebTest/Event/AddParticipationTest.php | 8 ++--- .../phpunit/WebTest/Import/CustomDataTest.php | 6 ++-- 16 files changed, 59 insertions(+), 51 deletions(-) diff --git a/tests/phpunit/WebTest/Activity/StandaloneAddTest.php b/tests/phpunit/WebTest/Activity/StandaloneAddTest.php index 8f4abbed94..4592e3bab8 100644 --- a/tests/phpunit/WebTest/Activity/StandaloneAddTest.php +++ b/tests/phpunit/WebTest/Activity/StandaloneAddTest.php @@ -137,7 +137,7 @@ class WebTest_Activity_StandaloneAddTest extends CiviSeleniumTestCase { $this->click("xpath=id('Search')/div[3]/div/div[2]/table/tbody/tr[3]/td[9]/span/a[text()='View']"); $this->waitForElementPresent("_qf_Activity_cancel-bottom"); - $this->webtestVerifyTabularData( + $this->VerifyTabularData( array( 'Subject' => $subject, 'Location' => $location, @@ -151,7 +151,7 @@ class WebTest_Activity_StandaloneAddTest extends CiviSeleniumTestCase { "/label" ); - $this->webtestVerifyTabularData( + $this->VerifyTabularData( array( 'With Contact' => "Anderson, {$firstName1}", 'Assigned To' => "Summerson, {$firstName2}", @@ -171,4 +171,11 @@ class WebTest_Activity_StandaloneAddTest extends CiviSeleniumTestCase { $pageUrl = array('url' => 'activity', 'args' => 'reset=1&action=add&context=standalone'); $this->customFieldSetLoadOnTheFlyCheck($customSets, $pageUrl); } + + function VerifyTabularData($expected, $xpathPrefix = NULL) { + foreach ($expected as $label => $value) { + $this->waitForElementPresent("xpath=//table/tbody/tr/td{$xpathPrefix}[text()='{$label}']/../following-sibling::td/span"); + $this->verifyText("xpath=//table/tbody/tr/td{$xpathPrefix}[text()='{$label}']/../following-sibling::td/span", preg_quote($value), 'In line ' . __LINE__); + } + } } diff --git a/tests/phpunit/WebTest/Admin/Form/ScheduleReminderTest.php b/tests/phpunit/WebTest/Admin/Form/ScheduleReminderTest.php index 7f74a6f788..05cf4ea415 100644 --- a/tests/phpunit/WebTest/Admin/Form/ScheduleReminderTest.php +++ b/tests/phpunit/WebTest/Admin/Form/ScheduleReminderTest.php @@ -61,7 +61,7 @@ class WebTest_Admin_Form_ScheduleReminderTest extends CiviSeleniumTestCase { $this->click('_qf_ScheduleReminders_next-bottom'); $this->waitForPageToLoad($this->getTimeoutMsec()); - $this->click("//div[@id='reminder']//div[@class='dataTables_wrapper']/table/tbody//tr/td[1][text()='{$title}']/../td[7]/span/a[text()='Edit']"); + $this->click("//div[@id='reminder']//div[@id='option11_wrapper']/table/tbody//tr/td[1][text()='{$title}']/../td[7]/span/a[text()='Edit']"); $this->waitForElementPresent('_qf_ScheduleReminders_cancel-bottom'); $this->assertEquals($title, $this->getValue('id=title')); diff --git a/tests/phpunit/WebTest/Campaign/ActivityTest.php b/tests/phpunit/WebTest/Campaign/ActivityTest.php index 2e72da2952..bfc97b3be7 100644 --- a/tests/phpunit/WebTest/Campaign/ActivityTest.php +++ b/tests/phpunit/WebTest/Campaign/ActivityTest.php @@ -104,8 +104,8 @@ class WebTest_Campaign_ActivityTest extends CiviSeleniumTestCase { $this->waitForText('crm-notification-container', "Campaign $title"); - $this->waitForElementPresent("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); - $id = (int) $this->getText("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $this->waitForElementPresent("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $id = (int) $this->getText("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); $this->activityAddTest($campaignTitle, $id); } @@ -196,7 +196,7 @@ class WebTest_Campaign_ActivityTest extends CiviSeleniumTestCase { $this->waitForElementPresent('_qf_Activity_cancel-bottom'); // verify Activity created - $this->verifyText("xpath=id('Activity')/div[2]/table[1]/tbody/tr[5]/td[2]", preg_quote($campaignTitle)); + $this->verifyText("xpath=id('Activity')/div[2]/table[1]/tbody/tr[5]/td[2]/span", preg_quote($campaignTitle)); } } diff --git a/tests/phpunit/WebTest/Campaign/CampaignDescriptionTest.php b/tests/phpunit/WebTest/Campaign/CampaignDescriptionTest.php index 1f96638008..0cdf093799 100644 --- a/tests/phpunit/WebTest/Campaign/CampaignDescriptionTest.php +++ b/tests/phpunit/WebTest/Campaign/CampaignDescriptionTest.php @@ -73,8 +73,8 @@ class WebTest_Campaign_CampaignDescriptionTest extends CiviSeleniumTestCase { $this->waitForText('crm-notification-container', "Campaign $title"); //Opening Edit Page of the created Campaign - $this->waitForElementPresent("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody//tr/td[text()='{$campaignTitle}']/../td[13]/span/a[text()='Edit']"); - $this->clickLink("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody//tr/td[text()='{$campaignTitle}']/../td[13]/span/a[text()='Edit']", "//textarea[@id='description']"); + $this->waitForElementPresent("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody//tr/td[text()='{$campaignTitle}']/../td[13]/span/a[text()='Edit']"); + $this->clickLink("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody//tr/td[text()='{$campaignTitle}']/../td[13]/span/a[text()='Edit']", "//textarea[@id='description']"); $fetchedVaue = $this->getValue('description'); $this->assertEquals($campaignDescription, $fetchedVaue); } diff --git a/tests/phpunit/WebTest/Campaign/MailingTest.php b/tests/phpunit/WebTest/Campaign/MailingTest.php index 0eccf9c20a..61f151caac 100644 --- a/tests/phpunit/WebTest/Campaign/MailingTest.php +++ b/tests/phpunit/WebTest/Campaign/MailingTest.php @@ -93,8 +93,8 @@ class WebTest_Campaign_MailingTest extends CiviSeleniumTestCase { $this->waitForText('crm-notification-container', "Campaign $title"); - $this->waitForElementPresent("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); - $id = (int) $this->getText("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $this->waitForElementPresent("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $id = (int) $this->getText("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); $this->mailingAddTest($groupName, $campaignTitle, $id); } diff --git a/tests/phpunit/WebTest/Campaign/MembershipTest.php b/tests/phpunit/WebTest/Campaign/MembershipTest.php index 19962f8ddc..ade5f690b6 100644 --- a/tests/phpunit/WebTest/Campaign/MembershipTest.php +++ b/tests/phpunit/WebTest/Campaign/MembershipTest.php @@ -102,8 +102,8 @@ class WebTest_Campaign_MembershipTest extends CiviSeleniumTestCase { $this->waitForText('crm-notification-container', "Campaign $title"); - $this->waitForElementPresent("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); - $id = (int) $this->getText("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $this->waitForElementPresent("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $id = (int) $this->getText("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); $this->memberAddTest($campaignTitle, $id); } diff --git a/tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php b/tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php index aa35659302..0d551a6ef8 100644 --- a/tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php +++ b/tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php @@ -111,8 +111,8 @@ class WebTest_Campaign_OfflineEventRegistrationTest extends CiviSeleniumTestCase "Status message didn't show up after saving campaign!" ); - $this->waitForElementPresent("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); - $id = (int) $this->getText("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $this->waitForElementPresent("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $id = (int) $this->getText("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); $this->offlineParticipantAddTest($campaignTitle, $id); } @@ -148,7 +148,7 @@ class WebTest_Campaign_OfflineEventRegistrationTest extends CiviSeleniumTestCase $this->select2("event_id", $eventName); // Select role - $this->click("role_id[2]"); + $this->multiselect2("role_id", array('Volunteer')); // Choose Registration Date. // Using helper webtestFillDate function. @@ -188,7 +188,7 @@ class WebTest_Campaign_OfflineEventRegistrationTest extends CiviSeleniumTestCase $this->waitForPageToLoad($this->getTimeoutMsec()); // Is status message correct? - $this->assertTrue($this->isTextPresent("Event registration for $displayName has been added"), "Status message didn't show up after saving!"); + $this->waitForText("crm-notification-container", "Event registration for $displayName has been added", "Status message didn't show up after saving!"); $this->waitForElementPresent("xpath=//*[@id='Search']//table//tbody/tr[1]/td[8]/span/a[text()='View']"); //click through to the participant view screen diff --git a/tests/phpunit/WebTest/Campaign/OnlineContributionTest.php b/tests/phpunit/WebTest/Campaign/OnlineContributionTest.php index fda0add2fa..68fcf9af6e 100644 --- a/tests/phpunit/WebTest/Campaign/OnlineContributionTest.php +++ b/tests/phpunit/WebTest/Campaign/OnlineContributionTest.php @@ -107,8 +107,8 @@ class WebTest_Campaign_OnlineContributionTest extends CiviSeleniumTestCase { $this->waitForText('crm-notification-container', "Campaign $title"); - $this->waitForElementPresent("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); - $id = (int) $this->getText("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $this->waitForElementPresent("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $id = (int) $this->getText("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); $this->onlineContributionAddTest($campaignTitle, $id); } diff --git a/tests/phpunit/WebTest/Campaign/OnlineEventRegistrationTest.php b/tests/phpunit/WebTest/Campaign/OnlineEventRegistrationTest.php index 49038e71f9..21123077a9 100644 --- a/tests/phpunit/WebTest/Campaign/OnlineEventRegistrationTest.php +++ b/tests/phpunit/WebTest/Campaign/OnlineEventRegistrationTest.php @@ -104,8 +104,8 @@ class WebTest_Campaign_OnlineEventRegistrationTest extends CiviSeleniumTestCase $this->waitForText('crm-notification-container', "Campaign $title"); - $this->waitForElementPresent("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); - $id = (int) $this->getText("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $this->waitForElementPresent("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $id = (int) $this->getText("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); $this->onlineParticipantAddTest($campaignTitle, $id); } diff --git a/tests/phpunit/WebTest/Campaign/PledgeTest.php b/tests/phpunit/WebTest/Campaign/PledgeTest.php index 9770701b6b..fe10a1b002 100644 --- a/tests/phpunit/WebTest/Campaign/PledgeTest.php +++ b/tests/phpunit/WebTest/Campaign/PledgeTest.php @@ -110,8 +110,8 @@ class WebTest_Campaign_PledgeTest extends CiviSeleniumTestCase { "Status message didn't show up after saving campaign!" ); - $this->waitForElementPresent("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); - $id = (int) $this->getText("//div[@id='campaignList']/div[@class='dataTables_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $this->waitForElementPresent("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); + $id = (int) $this->getText("//div[@id='campaignList']/div[@id='campaigns_wrapper']/table/tbody/tr/td[text()='{$campaignTitle}']/../td[1]"); $this->pledgeAddTest($campaignTitle, $id); } diff --git a/tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php b/tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php index 0018a3be73..5ee3ffce71 100644 --- a/tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php +++ b/tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php @@ -50,7 +50,7 @@ class WebTest_Contact_AddContactsToEventAdvancedSearchTest extends CiviSeleniumT $this->select2('event_id', "Rain-forest Cup Youth Soccer Tournament"); // Select role - $this->click('role_id[2]'); + $this->multiselect2('role_id', array('Volunteer')); // Select participant status $this->select('status_id', 'value=1'); diff --git a/tests/phpunit/WebTest/Contact/ContactTagTest.php b/tests/phpunit/WebTest/Contact/ContactTagTest.php index a9c0d4e5af..b686fb6bd2 100644 --- a/tests/phpunit/WebTest/Contact/ContactTagTest.php +++ b/tests/phpunit/WebTest/Contact/ContactTagTest.php @@ -112,30 +112,29 @@ class WebTest_Contact_ContactTagTest extends CiviSeleniumTestCase { $this->waitForElementPresent("css=div#tagtree"); //add Tagset to contact - $this->click("//div[@id='Tag']/div[2]/div[1]/span/ul/li[1]/input"); - $this->type("//div[@id='Tag']/div[2]/div[1]/span/ul/li[1]/input", 'tagset1'); - $this->typeKeys("//div[@id='Tag']/div[2]/div[1]/span/ul/li[1]/input", 'tagset1'); + $this->click("xpath=//div[@id='Tag']/div[2]/div/div/ul/li/input"); + $this->keyDown("xpath=//div[@id='Tag']/div[2]/div/div/ul/li/input", " "); + $this->type("xpath=//div[@id='Tag']/div[2]/div/div/ul/li/input", 'tagset1'); + $this->typeKeys("xpath=//div[@id='Tag']/div[2]/div/div/ul/li/input", 'tagset1'); // ...waiting for drop down with results to show up... - $this->waitForElementPresent("css=div.token-input-dropdown-facebook"); - $this->waitForElementPresent("css=li.token-input-dropdown-item2-facebook"); + $this->waitForElementPresent("xpath=//div[@class='select2-result-label']"); // ...need to use mouseDownAt on first result (which is a li element), click does not work - $this->mouseDownAt("css=li.token-input-dropdown-item2-facebook"); - - //$this->waitForElementPresent("//div[@id='Tag']/div[3]/div[1]/ul/li[1]/span"); - $this->click("//div[@id='Tag']/div[2]/div[1]/span/ul/li[2]/input"); - $this->type("//div[@id='Tag']/div[2]/div[1]/span/ul/li[2]/input", 'tagset2'); - $this->typeKeys("//div[@id='Tag']/div[2]/div[1]/span/ul/li[2]/input", 'tagset2'); + $this->clickAt("xpath=//div[@class='select2-result-label']"); + sleep(2); + $this->waitForElementPresent("//div[@id='Tag']/div[2]/div/div/ul/li/div[text()='tagset1']"); + $this->click("xpath=//div[@id='Tag']/div[2]/div/div/ul/li[2]/input"); + $this->keyDown("xpath=//div[@id='Tag']/div[2]/div/div/ul/li[2]/input", " "); + $this->type("xpath=//div[@id='Tag']/div[2]/div/div/ul/li[2]/input", 'tagset2'); + $this->typeKeys("xpath=//div[@id='Tag']/div[2]/div/div/ul/li[2]/input", 'tagset2'); // ...waiting for drop down with results to show up... - $this->waitForElementPresent("css=div.token-input-dropdown-facebook"); - $this->waitForElementPresent("css=li.token-input-dropdown-item2-facebook"); + $this->waitForElementPresent("xpath=//div[@class='select2-result-label']"); // ...need to use mouseDownAt on first result (which is a li element), click does not work - $this->mouseDownAt("css=li.token-input-dropdown-item2-facebook"); + $this->clickAt("xpath=//div[@class='select2-result-label']"); - $this->click("//div[@id='Tag']/div[2]/div[1]/span/ul/li"); // Type search name in autocomplete. $this->click("css=input#sort_name_navigation"); @@ -143,10 +142,10 @@ class WebTest_Contact_ContactTagTest extends CiviSeleniumTestCase { $this->typeKeys("css=input#sort_name_navigation", $firstName); // Wait for result list. - $this->waitForElementPresent("//*[@id='ui-id-1']/li[1]/a"); + $this->waitForElementPresent("css=ul.ui-autocomplete li"); // Visit contact summary page. - $this->click("//*[@id='ui-id-1']/li[1]/a"); + $this->click("css=ul.ui-autocomplete li"); $this->waitForPageToLoad($this->getTimeoutMsec()); $this->waitForText('tags', "tagset1, tagset2"); } diff --git a/tests/phpunit/WebTest/Contact/CustomDataAddTest.php b/tests/phpunit/WebTest/Contact/CustomDataAddTest.php index 4fd21bf65f..69846c14ea 100644 --- a/tests/phpunit/WebTest/Contact/CustomDataAddTest.php +++ b/tests/phpunit/WebTest/Contact/CustomDataAddTest.php @@ -322,9 +322,9 @@ class WebTest_Contact_CustomDataAddTest extends CiviSeleniumTestCase { $this->click("css=#tab_log a"); //check the changed log - $this->waitForElementPresent("xpath=//div[@id='changeLog']/div[2]/div/form/div[2]/table/tbody/tr[1]/td[4]/a[contains(text(), '$firstName $lastName')]"); - $this->waitForElementPresent("xpath=//div[@id='changeLog']/div[2]/div/form/div[2]/table/tbody/tr[1]/td/a[2]"); - $this->click("xpath=//div[@id='changeLog']/div[2]/div/form/div[2]/table/tbody/tr[1]/td/a[2]"); + $this->waitForElementPresent("xpath=//div[@id='changeLog']/div[2]/form/div[2]/table/tbody/tr[1]/td[4]/a[contains(text(), '$firstName $lastName')]"); + $this->waitForElementPresent("xpath=//div[@id='changeLog']/div[2]/form/div[2]/table/tbody/tr[1]/td/a[2]"); + $this->click("xpath=//div[@id='changeLog']/div[2]/form/div[2]/table/tbody/tr[1]/td/a[2]"); $this->waitForPageToLoad($this->getTimeoutMsec()); $this->assertTrue($this->isElementPresent("xpath=//form[@id='LoggingDetail']/div[2]/table/tbody/tr/td[2][contains(text(), '$value')]")); $this->assertTrue($this->isElementPresent("xpath=//form[@id='LoggingDetail']/div[2]/table/tbody/tr/td[3][contains(text(), '$value1')]")); diff --git a/tests/phpunit/WebTest/Contact/RelationshipAddTest.php b/tests/phpunit/WebTest/Contact/RelationshipAddTest.php index 92b28bbb67..f907c05498 100644 --- a/tests/phpunit/WebTest/Contact/RelationshipAddTest.php +++ b/tests/phpunit/WebTest/Contact/RelationshipAddTest.php @@ -187,7 +187,7 @@ class WebTest_Contact_RelationshipAddTest extends CiviSeleniumTestCase { //test for individual contact and household subtype contact //relationship - $typeb = "Household" . CRM_Core_DAO::VALUE_SEPARATOR . $householdSubtypeName; + $typeb = "Household__". $householdSubtypeName; //create a relationship type between different contact types $params = array( @@ -206,7 +206,7 @@ class WebTest_Contact_RelationshipAddTest extends CiviSeleniumTestCase { $this->select('contact_types_b', "value={$params['contact_type_b']}"); $this->type('description', $params['description']); - $params['contact_type_b'] = preg_replace('/' . CRM_Core_DAO::VALUE_SEPARATOR . '/', ' - ', $params['contact_type_b']); + $params['contact_type_b'] = preg_replace('/__/', ' - ', $params['contact_type_b']); //save the data. $this->click('_qf_RelationshipType_next-bottom'); diff --git a/tests/phpunit/WebTest/Event/AddParticipationTest.php b/tests/phpunit/WebTest/Event/AddParticipationTest.php index db5390566f..f9a696218d 100644 --- a/tests/phpunit/WebTest/Event/AddParticipationTest.php +++ b/tests/phpunit/WebTest/Event/AddParticipationTest.php @@ -245,10 +245,10 @@ class WebTest_Event_AddParticipationTest extends CiviSeleniumTestCase { // Select roles $this->multiselect2('role_id', array('Volunteer', 'Host')); - $this->waitForElementPresent("xpath=//*[@id='2_chk']//div[@class='custom-group custom-group-$customGroupTitle crm-accordion-wrapper collapsed']"); - $this->click("xpath=//*[@id='2_chk']/div[@class='custom-group custom-group-$customGroupTitle crm-accordion-wrapper collapsed']//div[1]"); - $this->click("xpath=//*[@id='2_chk']/div[@class='custom-group custom-group-$customGroupTitle crm-accordion-wrapper']//div[2]//table//tbody//tr[2]//td[2]//table//tbody//tr[1]//td[1]//label"); - $this->click("xpath=//*[@id='2_chk']/div[@class='custom-group custom-group-$customGroupTitle crm-accordion-wrapper']//div[2]//table//tbody//tr[4]//td[2]//table//tbody//tr[1]//td[1]//label"); + $this->waitForElementPresent("xpath=//div[@class='crm-customData-block']//div[@class='custom-group custom-group-$customGroupTitle crm-accordion-wrapper collapsed']"); + $this->click("xpath=//div[@class='crm-customData-block']//div[@class='custom-group custom-group-$customGroupTitle crm-accordion-wrapper collapsed']//div[1]"); + $this->click("xpath=//div[@class='crm-customData-block']//div[@class='custom-group custom-group-$customGroupTitle crm-accordion-wrapper']//div[2]//table//tbody//tr[2]//td[2]//table//tbody//tr[1]//td[1]//label"); + $this->click("xpath=//div[@class='crm-customData-block']//sdiv[@class='custom-group custom-group-$customGroupTitle crm-accordion-wrapper']//div[2]//table//tbody//tr[4]//td[2]//table//tbody//tr[1]//td[1]//label"); // Choose Registration Date. // Using helper webtestFillDate function. diff --git a/tests/phpunit/WebTest/Import/CustomDataTest.php b/tests/phpunit/WebTest/Import/CustomDataTest.php index 9b04abe640..680b1192db 100644 --- a/tests/phpunit/WebTest/Import/CustomDataTest.php +++ b/tests/phpunit/WebTest/Import/CustomDataTest.php @@ -232,6 +232,7 @@ class WebTest_Import_CustomDataTest extends ImportCiviSeleniumTestCase { //Is custom field created $this->waitForText("crm-notification-container", "Custom field '$radioFieldLabel' has been saved."); + $this->waitForElementPresent("xpath=//div[@id='field_page']//table/tbody//tr/td/span[text()='$radioFieldLabel']/parent::td/parent::tr/td[8]/span/a"); $radioFieldId = explode('&id=', $this->getAttribute("xpath=//div[@id='field_page']//table/tbody//tr/td/span[text()='$radioFieldLabel']/../../td[8]/span/a@href")); $radioFieldId = $radioFieldId[1]; @@ -270,7 +271,8 @@ class WebTest_Import_CustomDataTest extends ImportCiviSeleniumTestCase { $this->click('_qf_Field_next-bottom'); $this->waitForElementPresent('newCustomField'); $this->waitForText("crm-notification-container", "Custom field '{$multiSelectLabel}' has been saved."); - $multiSelectFieldId = explode('&id=', $this->getAttribute("xpath=//div[@id='field_page']//table/tbody//tr/td/span[text()='$multiSelectLabel']/../../td[8]/span/a@href")); + $this->waitForElementPresent("xpath=//div[@id='field_page']//table/tbody//tr/td/span[text()='$multiSelectLabel']/parent::td/parent::tr/"); + $multiSelectFieldId = explode('&id=', $this->getAttribute("xpath=//div[@id='field_page']//table/tbody//tr/td/span[text()='$multiSelectLabel']/parent::td/parent::tr/td[8]/span/a@href")); $multiSelectFieldId = $multiSelectFieldId[1]; // create another custom field - contact reference @@ -295,7 +297,7 @@ class WebTest_Import_CustomDataTest extends ImportCiviSeleniumTestCase { $this->waitForElementPresent('newCustomField'); $this->waitForText("crm-notification-container", "Custom field '{$contactReferenceLabel}' has been saved."); - $contactReferenceFieldId = explode('&id=', $this->getAttribute("xpath=//div[@id='field_page']//table/tbody//tr/td/span[text()='$contactReferenceLabel']/../../td[8]/span/a@href")); + $contactReferenceFieldId = explode('&id=', $this->getAttribute("xpath=//div[@id='field_page']//table/tbody//tr/td/span[text()='$contactReferenceLabel']/parent::td/parent::tr/td[8]/span/a@href")); $contactReferenceFieldId = $contactReferenceFieldId[1]; $customDataParams = array( -- 2.25.1