From 87f534f96fcdde81067cefc65a7caf97be5fdf26 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 22 Sep 2014 11:52:11 -0400
Subject: [PATCH] Webtest possible fix or customFieldSetLoadOnTheFlyCheck

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

diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index 967dd3d3a9..9d85057f89 100644
--- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
+++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
@@ -2078,14 +2078,15 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
     //add the custom set
     $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 *::testAjaxCustomGroupLoad
+    // FIXME: Hack to ensure caches are properly cleared
     if (TRUE) {
       $userName = $this->loggedInAs;
       $this->webtestLogout();
       $this->webtestLogin($userName);
     }
 
+    $this->openCiviPage($pageUrl['url'], $pageUrl['args']);
+    // Open the page again just to make sure caches are cleared
     $this->openCiviPage($pageUrl['url'], $pageUrl['args']);
     foreach($return as $values) {
       foreach ($values as $entityType => $customData) {
-- 
2.25.1