X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FContact%2FAddTest.php;h=17daa2834e7367dc5f3339ad9096b4294af268b2;hb=c24be2289c776d9ee74980d0db74996804bd0eff;hp=729698a6bc0a42cb448903e91d0edaf3f5d55282;hpb=e7f7aef7265627c99d27b5e9cecdfe5d3e50f7de;p=civicrm-core.git diff --git a/tests/phpunit/WebTest/Contact/AddTest.php b/tests/phpunit/WebTest/Contact/AddTest.php index 729698a6bc..17daa2834e 100644 --- a/tests/phpunit/WebTest/Contact/AddTest.php +++ b/tests/phpunit/WebTest/Contact/AddTest.php @@ -35,7 +35,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase { parent::setUp(); } - function testIndividualAdd() { + public function testIndividualAdd() { $this->webtestLogin(); $groupName = $this->WebtestAddGroup(); @@ -171,7 +171,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase { $this->waitForText('crm-notification-container', "Contact Saved"); } - function testHouseholdAdd() { + public function testHouseholdAdd() { $this->webtestLogin(); $groupName = $this->WebtestAddGroup(); @@ -203,7 +203,9 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase { $this->select("phone_1_phone_type_id", "value=" . $this->webtestGetFirstValueForOptionGroup('phone_type')); //fill in IM - $this->assertElementContainsText('im_1_provider_id', "Yahoo MSN AIM GTalk Jabber Skype"); + foreach (array('Yahoo', 'MSN', 'AIM', 'GTalk', 'Jabber', 'Skype') as $option) { + $this->assertSelectHasOption('im_1_provider_id', $option); + } $this->type("im_1_name", "testSkype"); $this->select("im_1_location_type_id", "value=3"); $this->select("im_1_provider_id", "value=6"); @@ -280,7 +282,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase { $this->waitForText('crm-notification-container', "Contact Saved"); } - function testOrganizationAdd() { + public function testOrganizationAdd() { $this->webtestLogin(); $groupName = $this->WebtestAddGroup(); @@ -384,7 +386,7 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase { $this->waitForText('crm-notification-container', "Contact Saved"); } - function testIndividualAddWithSharedAddress() { + public function testIndividualAddWithSharedAddress() { $this->webtestLogin(); $this->openCiviPage('contact/add', "reset=1&ct=Individual"); @@ -407,7 +409,6 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase { //create new current employer $currentEmployer = substr(sha1(rand()), 0, 7) . "Web Access"; - //fill in email $this->type("email_1_email", substr(sha1(rand()), 0, 7) . "john@gmail.com"); @@ -502,4 +503,3 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase { $this->assertElementContainsText('DataTables_Table_0', 'Household Member of'); } } -