From 449d280da6b29bb79295399f178c42c2c003ad76 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Mon, 25 May 2026 13:18:05 -0700
Subject: [PATCH] Update CASServerTest to verify renew=true

---
 src/org/labkey/test/LabKeySiteWrapper.java | 17 +++++++++++------
 src/org/labkey/test/WebDriverWrapper.java  |  6 ++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/org/labkey/test/LabKeySiteWrapper.java b/src/org/labkey/test/LabKeySiteWrapper.java
index 112757f4c0..909cc11836 100644
--- a/src/org/labkey/test/LabKeySiteWrapper.java
+++ b/src/org/labkey/test/LabKeySiteWrapper.java
@@ -156,12 +156,7 @@ public void simpleSignIn()
         }
         else
         {
-            log("Signing in as " + PasswordUtil.getUsername());
-            assertElementPresent(Locator.tagWithName("form", "login"));
-            setFormElement(Locator.name("email"), PasswordUtil.getUsername());
-            setFormElement(Locator.name("password"), PasswordUtil.getPassword());
-            acceptTermsOfUse(null, false);
-            clickButton("Sign In", 0);
+            fillSignInFormAndSubmit();
 
             // verify we're signed in now
             if (!waitFor(() ->
@@ -202,6 +197,16 @@ else if (errors.contains("log in and approve the terms of use."))
         WebTestHelper.saveSession(PasswordUtil.getUsername(), getDriver());
     }
 
+    public void fillSignInFormAndSubmit()
+    {
+        log("Signing in as " + PasswordUtil.getUsername());
+        assertElementPresent(Locator.tagWithName("form", "login"));
+        setFormElement(Locator.name("email"), PasswordUtil.getUsername());
+        setFormElement(Locator.name("password"), PasswordUtil.getPassword());
+        acceptTermsOfUse(null, false);
+        clickButton("Sign In", 0);
+    }
+
     /**
      * Call the LogoutApi to sign out
      */
diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java
index 16eb43205f..d76747264b 100644
--- a/src/org/labkey/test/WebDriverWrapper.java
+++ b/src/org/labkey/test/WebDriverWrapper.java
@@ -1169,6 +1169,12 @@ public Connection createDefaultConnection(boolean reuseSession)
         return createDefaultConnection();
     }
 
+    // Exempt the provided URL from controller-first URL warnings and exceptions
+    public void allowControllerFirstUrl(String url)
+    {
+        _controllerFirstUrls.add(url);
+    }
+
     public long beginAt(String url)
     {
         return beginAt(url, defaultWaitForPage);