From dc49991135464d8dd1ddafd6717faa4f4d7501c1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 20 Sep 2014 21:00:56 -0400
Subject: [PATCH] Hack to ensure proper cache clearing during
 testAjaxCustomGroupLoad

---
 tests/phpunit/CiviTest/CiviSeleniumTestCase.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index 2993bf30b2..f6a105f3b4 100644
--- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
+++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
@@ -2082,10 +2082,11 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
     $return = $this->addCustomGroupField($customSets);
 
     // Hack to ensure caches are properly cleared
-    // FIXME: This shouldn't be necessary, try to find root of the problem with WebTest_Event_AddParticipationTest::testAjaxCustomGroupLoad
-    if ($beforeTriggering === TRUE) {
+    // FIXME: This shouldn't be necessary, try to find root of the problem with *::testAjaxCustomGroupLoad
+    if (TRUE) {
+      $userName = $this->loggedInAs;
       $this->webtestLogout();
-      $this->webtestLogin();
+      $this->webtestLogin($userName);
     }
 
     $this->openCiviPage($pageUrl['url'], $pageUrl['args']);
-- 
2.25.1