Merge remote-tracking branch 'origin/develop' into fb_moreAccessibility

Author: labkey-susanh

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
      */

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);
@@ -3991,15 +3997,6 @@ public boolean isChecked(Locator checkBoxLocator)
         return checkBoxLocator.findElement(getDriver()).isSelected();
     }
 
-    /**
-     * @deprecated Use {@link WebElement#isSelected()}
-     */
-    @Deprecated (since = "22.9")
-    public boolean isChecked(WebElement checkBox)
-    {
-        return checkBox.isSelected();
-    }
-
     /**
      * Try to select option by text or value.
      */