Merge pull request #7181 from eileenmcnaughton/CRM-17335-2

[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 94dd6f5c3be45788be244ee1a23f321e2500d63a..a9685f47d00ebd31b7acec6e0a4eab8d1bf7c675 100644 (file)
--- a/tests/phpunit/WebTest/Event/EventWaitListTest.php
+++ b/tests/phpunit/WebTest/Event/EventWaitListTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -79,7 +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_country_id', 'UNITED STATES');
     $this->select("address_1_state_province_id", "value=1004");
     $this->type("email_1_email", "info@civicrm.org");
 
@@ -93,7 +93,8 @@ class WebTest_Event_EventWaitListTest extends CiviSeleniumTestCase {
     $this->click("link=Fees");
     $this->waitForElementPresent("_qf_Fee_upload-bottom");
     $this->click("CIVICRM_QFID_1_is_monetary");
-    $this->click("xpath=//tr[@class='crm-event-manage-fee-form-block-payment_processor']/td[2]/label[text()='$processorName']");
+    $this->select2('payment_processor', $processorName, TRUE);
+
 
     $this->select("financial_type_id", "Donation");
     $this->type("label_1", "Member");
@@ -124,7 +125,7 @@ class WebTest_Event_EventWaitListTest extends CiviSeleniumTestCase {
       $this->assertChecked("is_multiple_registrations");
     }
 
-    $this->click('intro_text-plain');
+    $this->click('intro_text');
     $this->fillRichTextField("intro_text", $registerIntro);
 
     // enable confirmation email