Merge pull request #4940 from mlutfy/crm15824

[civicrm-core.git] / tests / phpunit / WebTest / Event / EventWaitListTest.php

diff --git a/tests/phpunit/WebTest/Event/EventWaitListTest.php b/tests/phpunit/WebTest/Event/EventWaitListTest.php
index ad3a7a51334d1bb6e66974150d12975508e96704..fc8c3ce515df436cb4c800eb7938a32b7b4d34b5 100644 (file)
--- a/tests/phpunit/WebTest/Event/EventWaitListTest.php
+++ b/tests/phpunit/WebTest/Event/EventWaitListTest.php
@@ -33,12 +33,12 @@ class WebTest_Event_EventWaitListTest extends CiviSeleniumTestCase {
     parent::setUp();
   }
 
-  function testEventWaitList() {
+  public function testEventWaitList() {
     // Log in using webtestLogin() method
     $this->webtestLogin();
 
-    // We need a payment processor
-    $processorName = "Webtest Dummy" . substr(sha1(rand()), 0, 7);
+    // Use default payment processor
+    $processorName = 'Test Processor';
     $this->webtestAddPaymentProcessor($processorName);
 
     $this->openCiviPage("event/add", "reset=1&action=add");
@@ -79,6 +79,7 @@ class WebTest_Event_EventWaitListTest extends CiviSeleniumTestCase {
     $this->type("address_1_street_address", $streetAddress);
     $this->type("address_1_city", "San Francisco");
     $this->type("address_1_postal_code", "94117");
+    $this->select('address_1_country_id', 'United States');
     $this->select("address_1_state_province_id", "value=1004");
     $this->type("email_1_email", "info@civicrm.org");
 
@@ -158,7 +159,7 @@ class WebTest_Event_EventWaitListTest extends CiviSeleniumTestCase {
    * @param $eventTitle
    * @param $eventInfoStrings
    */
-  function _testVerifyEventInfo($eventTitle, $eventInfoStrings) {
+  public function _testVerifyEventInfo($eventTitle, $eventInfoStrings) {
     // verify event input on info page
     // start at Manage Events listing
     $this->openCiviPage("event/manage", "reset=1");
@@ -173,7 +174,7 @@ class WebTest_Event_EventWaitListTest extends CiviSeleniumTestCase {
    *
    * @return string
    */
-  function _testVerifyRegisterPage($registerStrings) {
+  public function _testVerifyRegisterPage($registerStrings) {
     // Go to Register page and check for intro text and fee levels
     $this->click("link=Register Now");
     $this->waitForElementPresent("_qf_Register_upload-bottom");
@@ -186,7 +187,7 @@ class WebTest_Event_EventWaitListTest extends CiviSeleniumTestCase {
    * @param int $numberRegistrations
    * @param bool $anonymous
    */
-  function _testOnlineRegistration($registerUrl, $numberRegistrations = 1, $anonymous = TRUE) {
+  public function _testOnlineRegistration($registerUrl, $numberRegistrations = 1, $anonymous = TRUE) {
     if ($anonymous) {
       $this->webtestLogout();
     }
@@ -240,4 +241,3 @@ class WebTest_Event_EventWaitListTest extends CiviSeleniumTestCase {
     }
   }
 }
-