Hack to ensure proper cache clearing during testAjaxCustomGroupLoad

diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index 2993bf30b25765f747ec24aaedce67aa8c4e1343..f6a105f3b4ac4a26fa21967e67a1043d5c59617a 100644 (file)
--- 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']);