projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4198 from sunilpawar/CRM-15332
[civicrm-core.git]
/
tests
/
phpunit
/
WebTest
/
Grant
/
CustomFieldsetTest.php
diff --git
a/tests/phpunit/WebTest/Grant/CustomFieldsetTest.php
b/tests/phpunit/WebTest/Grant/CustomFieldsetTest.php
index 72bc65069d001e3bf5ca8bdc571f07f9ef86b0df..a31208d653fe17c6fbdac0738922b4bbb4f9f934 100644
(file)
--- a/
tests/phpunit/WebTest/Grant/CustomFieldsetTest.php
+++ b/
tests/phpunit/WebTest/Grant/CustomFieldsetTest.php
@@
-70,23
+70,20
@@
class WebTest_Grant_CustomFieldsetTest extends CiviSeleniumTestCase {
$this->select('id=extends_0', 'label=Grants');
$this->addSelection('id=extends_1', "label=$grantType");
$this->click('id=collapse_display');
$this->select('id=extends_0', 'label=Grants');
$this->addSelection('id=extends_1', "label=$grantType");
$this->click('id=collapse_display');
- $this->click('id=_qf_Group_next-bottom');
- $this->waitForElementPresent('_qf_Field_next-bottom');
+ $this->clickLink('id=_qf_Group_next-bottom');
$this->waitForText('crm-notification-container', "Your custom field set '$grantFieldSet' has been added.");
$this->waitForText('crm-notification-container', "Your custom field set '$grantFieldSet' has been added.");
+ $this->waitForElementPresent('_qf_Field_done-bottom');
// Add field to fieldset
$grantField = 'GrantField' . $rand;
$this->type('id=label', $grantField);
$this->select('id=data_type_0', 'label=Money');
// Add field to fieldset
$grantField = 'GrantField' . $rand;
$this->type('id=label', $grantField);
$this->select('id=data_type_0', 'label=Money');
- $this->click('id=_qf_Field_next-bottom');
- $this->waitForPageToLoad($this->getTimeoutMsec());
+ $this->click('id=_qf_Field_done-bottom');
$this->waitForText('crm-notification-container', "Custom field '$grantField' has been saved.");
// Create new Grant
$this->openCiviPage('grant/add', 'reset=1&action=add&context=standalone', '_qf_Grant_upload-bottom');
$this->waitForText('crm-notification-container', "Custom field '$grantField' has been saved.");
// Create new Grant
$this->openCiviPage('grant/add', 'reset=1&action=add&context=standalone', '_qf_Grant_upload-bottom');
- $firstName = 'First' . $rand;
- $lastName = 'Last' . $rand;
- $this->webtestNewDialogContact($firstName, $lastName);
+ $contact = $this->createDialogContact();
$this->select('id=status_id', 'label=Approved for Payment');
$this->select('id=grant_type_id', "label=$grantType");
$this->waitForTextPresent($grantField);
$this->select('id=status_id', 'label=Approved for Payment');
$this->select('id=grant_type_id', "label=$grantType");
$this->waitForTextPresent($grantField);
@@
-101,7
+98,7
@@
class WebTest_Grant_CustomFieldsetTest extends CiviSeleniumTestCase {
// verify tabular data for grant view
$this->webtestVerifyTabularData(array(
// verify tabular data for grant view
$this->webtestVerifyTabularData(array(
- 'Name' =>
"$firstName $lastName"
,
+ 'Name' =>
$contact['display_name']
,
'Grant Status' => 'Approved',
'Grant Type' => $grantType,
$grantField => '$ 99.99',
'Grant Status' => 'Approved',
'Grant Type' => $grantType,
$grantField => '$ 99.99',