From 62e1beb7a7c49fd0c1f77297640bfc0d67d9ffc3 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 17 Dec 2025 12:29:01 -0800 Subject: [PATCH] Make `Component.waitForReady` cooperate with refinding components --- src/org/labkey/test/components/Component.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/Component.java b/src/org/labkey/test/components/Component.java index 386ed6f99a..11a1b5057d 100644 --- a/src/org/labkey/test/components/Component.java +++ b/src/org/labkey/test/components/Component.java @@ -73,7 +73,12 @@ protected EC elementCache() _elementCache = Objects.requireNonNull(newElementCache()); waitForReady(); - Objects.requireNonNull(_elementCache, "waitForReady() cleared the element cache"); + if (_elementCache == null) + { + // waitForReady triggered a cache clear -- either explicitly or due to a refind. + // It succeeded, so it should be safe to get a fresh `newElementCache` + _elementCache = Objects.requireNonNull(newElementCache()); + } } return _elementCache; }