Merge branch 'develop' into fb_52417_linkedSchemaStackOverflow

LabKey · Feb 27, 2025 · 573e658 · 573e658
2 parents ff28e3b + 9c1061d
commit 573e658
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 31 deletions.
diff --git a/src/org/labkey/test/categories/SignalData.java b/src/org/labkey/test/categories/SignalData.java
diff --git a/src/org/labkey/test/pages/core/admin/ShowAdminPage.java b/src/org/labkey/test/pages/core/admin/ShowAdminPage.java
@@ -85,7 +85,7 @@ public void clickAnalyticsSettings()
         clickAndWait(elementCache().analyticsSettingsLink);
     }
 
-    public void clickExternalRedirectHosts()
+    public void clickAllowedExternalRedirectHosts()
     {
         goToSettingsSection();
         clickAndWait(elementCache().externalRedirectHostLink);
@@ -273,7 +273,7 @@ protected class ElementCache extends LabKeyPage.ElementCache
         protected WebElement sectionActiveUsers = Locator.linkWithText("Active Users").findWhenNeeded(this);
 
         protected WebElement analyticsSettingsLink = Locator.linkWithText("analytics settings").findWhenNeeded(this);
-        protected WebElement externalRedirectHostLink = Locator.linkWithText("external redirect hosts").findElement(this);
+        protected WebElement externalRedirectHostLink = Locator.linkWithText("allowed external redirect hosts").findElement(this);
         protected WebElement auditLogLink = Locator.linkWithText("audit log").findWhenNeeded(this);
         protected WebElement auditLogMaintenanceLink = Locator.linkWithText("Audit Log Maintenance").findWhenNeeded(this);
         protected WebElement authenticationLink = Locator.linkWithText("authentication").findWhenNeeded(this);

diff --git a/src/org/labkey/test/tests/AdminConsoleTest.java b/src/org/labkey/test/tests/AdminConsoleTest.java
@@ -253,7 +253,7 @@ public void testAppAdminRole()
     public void testConfigureReturnURL()
     {
         String host = "google.com";
-        goToAdminConsole().clickExternalRedirectHosts();
+        goToAdminConsole().clickAllowedExternalRedirectHosts();
 
         log("Verifying host cannot be blank ");
         clickButton("Save");

diff --git a/src/org/labkey/test/tests/DataViewsPermissionsTest.java b/src/org/labkey/test/tests/DataViewsPermissionsTest.java
@@ -31,8 +31,8 @@
 @BaseWebDriverTest.ClassTimeout(minutes = 10)
 public class DataViewsPermissionsTest extends StudyBaseTest
 {
-    public static final String AUTHOR_USER = "author@dataviews.test";
-    public static final String EDITOR_USER = "editor@dataviews.test";
+    public static final String AUTHOR_USER = "dvp_author@dataviews.test";
+    public static final String EDITOR_USER = "dvp_editor@dataviews.test";
     private final PortalHelper portalHelper = new PortalHelper(this);
 
     @Override
@@ -121,15 +121,15 @@ protected void doCreateSteps()
         clickFolder(getFolderName());
         click(Locator.tag("a").withAttributeContaining("href", "editDataViews"));
         openEditPanel("Report 2");
-        _ext4Helper.selectComboBoxItem("Author","author");
+        _ext4Helper.selectComboBoxItem("Author", _userHelper.getDisplayNameForEmail(AUTHOR_USER));
         _ext4Helper.checkCheckbox("Shared");
         sleep(1000);
         _ext4Helper.clickWindowButton("Report 2","Save",0,0);
         _ext4Helper.waitForMaskToDisappear();
         clickFolder(getFolderName());
         click(Locator.tag("a").withAttributeContaining("href", "editDataViews"));
         openEditPanel("Report 3");
-        _ext4Helper.selectComboBoxItem("Author","editor");
+        _ext4Helper.selectComboBoxItem("Author", _userHelper.getDisplayNameForEmail(EDITOR_USER));
         _ext4Helper.checkCheckbox("Shared");
         sleep(1000);
         _ext4Helper.clickWindowButton("Report 3","Save",0,0);

diff --git a/src/org/labkey/test/tests/core/security/TroubleshooterRoleTest.java b/src/org/labkey/test/tests/core/security/TroubleshooterRoleTest.java
@@ -122,7 +122,7 @@ protected void verifySitePermissionSetting(boolean canSave)
                 isElementPresent(Locator.tagWithText("span","Save")));
 
         log("Verify permissions for External Redirect Hosts");
-        goToAdminConsole().goToSettingsSection().clickExternalRedirectHosts();
+        goToAdminConsole().goToSettingsSection().clickAllowedExternalRedirectHosts();
         checker().verifyEquals("Incorrect access for External Redirect Hosts", canSave,
                 isElementPresent(Locator.tagWithText("span","Save")));