From 1788aac562b27b85af4ab9c4013654ff6647e1f6 Mon Sep 17 00:00:00 2001
From: Sudha Bisht <sudha.bisht@webaccessglobal.com>
Date: Tue, 17 Nov 2015 18:57:46 +0530
Subject: [PATCH] WebtestFix

---
 tests/phpunit/WebTest/Event/AddEventTest.php               | 2 +-
 tests/phpunit/WebTest/Event/ParticipantSearchTest.php      | 4 ++--
 tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/WebTest/Event/AddEventTest.php b/tests/phpunit/WebTest/Event/AddEventTest.php
index 674358f561..d8c997bd10 100644
--- a/tests/phpunit/WebTest/Event/AddEventTest.php
+++ b/tests/phpunit/WebTest/Event/AddEventTest.php
@@ -1034,6 +1034,7 @@ WHERE ceft.entity_id = %1 AND ceft.entity_table = 'civicrm_contribution'";
     //Login with TestUser1
     $this->webtestLogin($TestUser1, 'Test12345');
     $this->openCiviPage("event/manage", "reset=1");
+    $this->click("xpath=//div[@id='event_status_id']/div[@class='dataTables_wrapper no-footer']/table/tbody//tr/td/a[contains(text(), '{$eventName}')]/../..//td/div/span/ul/li/a");
     $this->_testAddReminder($eventName);
     $this->webtestLogout();
 
@@ -1057,7 +1058,6 @@ WHERE ceft.entity_id = %1 AND ceft.entity_table = 'civicrm_contribution'";
       "edit-{$roleId[5]}-access-civievent",
     );
     $this->changePermissions($permissions);
-
     //Create TestUser2
     $this->open($this->sboxPath . "admin/people/create");
     $this->waitForElementPresent("edit-submit");
diff --git a/tests/phpunit/WebTest/Event/ParticipantSearchTest.php b/tests/phpunit/WebTest/Event/ParticipantSearchTest.php
index ac8bc476a3..2deb02e557 100644
--- a/tests/phpunit/WebTest/Event/ParticipantSearchTest.php
+++ b/tests/phpunit/WebTest/Event/ParticipantSearchTest.php
@@ -192,14 +192,14 @@ class WebTest_Event_ParticipantSearchTest extends CiviSeleniumTestCase {
     // note since this is generated data
     // we are not sure if someone has this selection, so
     // we are not testing for an empty record set
-    $stringsToCheck = array("Soup Selection = Chicken Combo");
+    $stringsToCheck = array("Soup Selection In Chicken Combo");
 
     $this->_checkStrings($stringsToCheck);
 
     $this->select("css=select[data-crm-custom='Food_Preference:Soup_Selection']", 'Salmon Stew');
     $this->clickLink("_qf_Search_refresh");
 
-    $stringsToCheck = array("Soup Selection = Salmon Stew");
+    $stringsToCheck = array("Soup Selection In Salmon Stew");
 
     $this->_checkStrings($stringsToCheck);
   }
diff --git a/tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php b/tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php
index 2265e9864b..9fbd4ce843 100644
--- a/tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php
+++ b/tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php
@@ -399,8 +399,7 @@ class WebTest_Member_OnlineMembershipRenewTest extends CiviSeleniumTestCase {
     $this->select('duration_unit', 'label=year');
     $this->select('period_type', 'value=rolling');
 
-    $this->removeSelection('relationship_type_id', 'label=- select -');
-    $this->addSelection('relationship_type_id', 'label=Employer of');
+    $this->select2('relationship_type_id', 'Employer of', TRUE);
 
     $this->click('_qf_MembershipType_upload-bottom');
     $this->waitForElementPresent('link=Add Membership Type');
-- 
2.25.1