X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FEvent%2FAddPricesetTest.php;h=beda27b79ba702fdad487fa0216313cc0321e311;hb=1dcce95b87283a35acffbdce4c9390a1c2a45a03;hp=4043f06345b474d0c122b09da52600365c8b7b1b;hpb=6f8bb3dabf85e92975bd8cefe125b5c610841399;p=civicrm-core.git diff --git a/tests/phpunit/WebTest/Event/AddPricesetTest.php b/tests/phpunit/WebTest/Event/AddPricesetTest.php index 4043f06345..beda27b79b 100644 --- a/tests/phpunit/WebTest/Event/AddPricesetTest.php +++ b/tests/phpunit/WebTest/Event/AddPricesetTest.php @@ -1,9 +1,9 @@ clickLink('_qf_Field_next_new-bottom', '_qf_Field_next-bottom'); + $this->clickLink('_qf_Field_next_new-bottom', '_qf_Field_next-bottom', FALSE); $this->waitForText('crm-notification-container', "Price Field '" . $label . "' has been saved."); } } @@ -193,7 +193,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { $this->openCiviPage('admin/price', 'reset=1'); // Use the price set id ($sid) to pick the correct row - $this->clickLink("//*[@id='price_set-{$sid}']/td[4]/span[1]/a[2]", '_qf_Preview_cancel-bottom'); + $this->clickLink("//*[@id='price_set-{$sid}']/td[4]/span[1]/a[2]", '_qf_Preview_cancel-bottom', FALSE); // Check for expected price set field strings if ($this->isElementPresent("xpath=//*[@class ='select2-chosen']")) { @@ -538,7 +538,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { $this->_testVerifyPriceSet($validateStrings, $sid); $this->openCiviPage('event/add', 'reset=1&action=add', '_qf_EventInfo_upload-bottom'); - + $this->waitForElementPresent("_qf_EventInfo_upload-bottom"); $eventTitle = 'My Conference - ' . substr(sha1(rand()), 0, 7); $email = 'Smith' . substr(sha1(rand()), 0, 7) . '@example.com'; $eventDescription = 'Here is a description for this conference.'; @@ -619,9 +619,9 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { // Is status message correct? $this->waitForText("crm-notification-container", "Event registration for $displayName has been added"); - $this->waitForElementPresent("xpath=//form[@id='Search']/table/tbody/tr[1]/td[8]/span/a[text()='View']"); + $this->waitForElementPresent("xpath=//form[@id='Search']/table/tbody/tr[1]/td[8]/span//a[text()='View']"); //click through to the participant view screen - $this->click("xpath=//form[@id='Search']/table/tbody/tr[1]/td[8]/span/a[text()='View']"); + $this->click("xpath=//form[@id='Search']/table/tbody/tr[1]/td[8]/span//a[text()='View']"); $this->waitForElementPresent('_qf_ParticipantView_cancel-bottom'); $this->webtestVerifyTabularData( @@ -636,7 +636,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { $this->verifyText("xpath=//table/tbody/tr/td[text()='Fees']/following-sibling::td/table/tbody/tr[2]/td", preg_quote('$ 2,705.00')); $expectedLineItems = array( 2 => array( - 1 => 'Full Conference', + 1 => 'Full Conference ', 2 => '5', 3 => '$ 525.00', 4 => '$ 2,625.00', @@ -647,13 +647,13 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { 4 => '$ 50.00', ), 4 => array( - 1 => 'Evening Sessions - First Night', + 1 => 'Evening Sessions - First Night ', 2 => '1', 3 => '$ 15.00', 4 => '$ 15.00', ), 5 => array( - 1 => 'Evening Sessions - Second Night', + 1 => 'Evening Sessions - Second Night ', 2 => '1', 3 => '$ 15.00', 4 => '$ 15.00', @@ -662,7 +662,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { $this->_checkLineItems($expectedLineItems); // check contribution record as well // click through to the contribution view screen - $this->click("xpath=//*[@id='ParticipantView']/div[2]/table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='View']"); + $this->click("xpath=//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span//a[text()='View']"); $this->waitForElementPresent('_qf_ContributionView_cancel-bottom'); $this->webtestVerifyTabularData( @@ -681,7 +681,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { $this->openCiviPage('admin/price/field', "reset=1&action=browse&sid={$sid}", 'newPriceField'); $this->click("xpath=//table[@id='options']/tbody/tr[3]/td[8]/a[text()='Edit Price Options']"); $this->waitForElementPresent("xpath=//span[contains(text(), 'Done')]"); - $this->click("xpath=//tr/td/div[text()='First Night']/../following-sibling::td[8]/span/a[text()='Edit Option']"); + $this->click("xpath=//table[@id='options']/tbody/tr/td/div[text()='First Night']/../following-sibling::td[8]/span//a[text()='Edit Option']"); $this->waitForElementPresent("_qf_Option_cancel"); $this->type('label', 'First Night Edited'); $this->click('_qf_Option_next'); @@ -689,8 +689,9 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase { $this->openCiviPage('event/search', "reset=1", '_qf_Search_refresh'); $this->select2('participant_fee_id', 'First Night Edited'); - $this->clickLink('_qf_Search_refresh'); - $this->clickLink("xpath=//div[@id='participantSearch']//table//tbody/tr[1]/td[11]/span/a[text()='View']", "xpath=//span[contains(text(), 'Done')]", FALSE); + $this->click('_qf_Search_refresh'); + $this->waitForAjaxContent(); + $this->clickLink("xpath=//form[@class='CRM_Event_Form_Search crm-search-form']//div[3]/div/div[2]//table//tbody/tr[1]/td[11]/span//a[text()='View']", "xpath=//span[contains(text(), 'Done')]", FALSE); $expectedLineItems[4][1] = 'Evening Sessions - First Night Edited'; $this->_checkLineItems($expectedLineItems); }