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

LabKey · Feb 20, 2024 · de100fe · de100fe
2 parents f93d33c + da03dae
commit de100fe
Show file tree

Hide file tree

Showing 27 changed files with 219 additions and 301 deletions.
diff --git a/data/api/EmbeddedQueryWebPart.html b/data/api/EmbeddedQueryWebPart.html
@@ -1,4 +1,5 @@
 <div id="queryTestDiv1"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
     +function(){
         new LABKEY.QueryWebPart({

diff --git a/data/api/buttonCustomizationCustomizer.html b/data/api/buttonCustomizationCustomizer.html
@@ -1,4 +1,5 @@
 <div id="queryTestDiv1"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
     LABKEY.requiresExt3ClientAPI(function() {
         var qwp1 = new LABKEY.QueryWebPart({

diff --git a/data/api/buttonCustomizationEcho.html b/data/api/buttonCustomizationEcho.html
@@ -1,4 +1,5 @@
 <div id="params"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
     var html = "";
     var parameters = LABKEY.ActionURL.getParameters();

diff --git a/data/api/executeSql.html b/data/api/executeSql.html
@@ -5,6 +5,7 @@
 <div><input type="button" value="Execute SQL" id="button_loadqwp"/></div>
 <div id="qwp-div">Query Web Part DIV</div>
 
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
     LABKEY.Utils.onReady(function() {
         document.getElementById('button_loadqwp')['onclick'] = loadQWP;

diff --git a/data/api/extIntegrationTest.html b/data/api/extIntegrationTest.html
@@ -1,4 +1,5 @@
 <div id="testDiv"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
     LABKEY.requiresExt4Sandbox(function() {
         var generateData = function(n, floor) {

diff --git a/data/api/filterTest.html b/data/api/filterTest.html
@@ -1,4 +1,5 @@
 <div id="17021"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 
     LABKEY.requiresExt3ClientAPI(function() {

diff --git a/data/api/folderTest.html b/data/api/folderTest.html
diff --git a/data/api/webdavTest.html b/data/api/webdavTest.html
@@ -1,4 +1,5 @@
 <div id="testDiv"></div>
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 LABKEY.requiresExt3ClientAPI(function(){
         var div = Ext.get('testDiv');

diff --git a/data/api/workbookAPITest.html b/data/api/workbookAPITest.html
@@ -4,6 +4,7 @@
 <div id='deleteWorkbookDiv'></div><br>
 <button id="runButton">RunAPITest</button>
 
+<!-- Used as HTML wiki source, so nonce is NOT required -->
 <script type="text/javascript">
 
 

diff --git a/data/studies/SpecimenCustomizeStudy.folder.zip b/data/studies/SpecimenCustomizeStudy.folder.zip
diff --git a/modules/editableModule/resources/views/webpart.html b/modules/editableModule/resources/views/webpart.html
@@ -1,5 +1,5 @@
 <p>This is a web part view in the simple test module.</p>
-<a id="testlink" href="<%=contextPath%>/project<%=containerPath%>/begin.view">begin</a>
+<a id="testlink" href="<%=contextPath%><%=containerPath%>/project-begin.view">begin</a>
 <script type="text/javascript" nonce="<%=scriptNonce%>">
     var webpart=<%=webpartContext%>;
 </script>
diff --git a/modules/simpletest/resources/views/testCustomLogin.html b/modules/simpletest/resources/views/testCustomLogin.html
@@ -8,7 +8,7 @@
         <label for="email">Email</label>
         <input id="email" name="email" type="text" class="input-block" tabindex="1" >
         <label for="password">
-            Password <a href="login-resetPassword.view?">(forgot password)</a>
+            Password <a href="login-resetPassword.view">(forgot password)</a>
         </label>
         <input id="password" name="password" type="password" class="input-block" tabindex="2" autofocus>
         <input type=checkbox name="remember" id="remember"  checked>
@@ -17,7 +17,7 @@
             <div class="auth-header auth-item">Terms of Use</div>
             <div class="toucontent auth-item termsOfUseContent"></div>
             <div class="auth-item">
-                <input type="checkbox" name="approvedTermsOfUse" id="approvedTermsOfUse" class="auth-item" unchecked>
+                <input type="checkbox" name="approvedTermsOfUse" id="approvedTermsOfUse" class="auth-item">
                 <label for="approvedTermsOfUse">I agree to these terms</label>
             </div>
         </div>

diff --git a/modules/simpletest/resources/views/testCustomLoginWithReturnUrl.html b/modules/simpletest/resources/views/testCustomLoginWithReturnUrl.html
@@ -9,7 +9,7 @@
         <label for="email">Email</label>
         <input id="email" name="email" type="text" class="input-block" tabindex="1" >
         <label for="password">
-            Password <a href="login-resetPassword.view?">(forgot password)</a>
+            Password <a href="login-resetPassword.view">(forgot password)</a>
         </label>
         <input id="password" name="password" type="password" class="input-block" tabindex="2" autofocus>
         <input type=checkbox name="remember" id="remember"  checked>
@@ -18,12 +18,12 @@
             <div class="auth-header auth-item">Terms of Use</div>
             <div class="toucontent auth-item termsOfUseContent"></div>
             <div class="auth-item">
-                <input type="checkbox" name="approvedTermsOfUse" id="approvedTermsOfUse" class="auth-item" unchecked>
+                <input type="checkbox" name="approvedTermsOfUse" id="approvedTermsOfUse" class="auth-item">
                 <label for="approvedTermsOfUse">I agree to these terms</label>
             </div>
         </div>
         <input type="hidden" name="termsOfUseType" id="termsOfUseType">
-        <input type="hidden" id="returnUrl" name="returnUrl" value="<%=contextPath%>/project/Shared/start.view">
+        <input type="hidden" id="returnUrl" name="returnUrl" value="<%=contextPath%>/Shared/project-start.view">
         <div class="auth-item auth-credentials-submit">
             <input type="submit" tab-index="-1" style="position: absolute; left: -9999px; width: 1px; height: 1px;" class="loginSubmitButton"/>
             <a class="labkey-button primary signin-btn"><span>Sign In</span></a>

diff --git a/src/org/labkey/test/components/ui/FilterStatusValue.java b/src/org/labkey/test/components/ui/FilterStatusValue.java
@@ -33,7 +33,7 @@ public WebDriver getDriver()
 
     public String getText()
     {
-        return elementCache().textSpan().getText();
+        return elementCache().textSpan.getText();
     }
 
     private boolean isActive()
@@ -52,16 +52,16 @@ public void remove()
         getWrapper().mouseOver(getComponentElement());
         getWrapper().mouseOver(elementCache().icon);
         WebDriverWrapper.waitFor(()-> isActive() && isClose(),
-                "the filter status item with text ["+getText()+"] did not become active", 500);
+                "The filter status item with text ["+getText()+"] did not become active.", 500);
         elementCache().icon.click();
 
-        // if the item you're dismissing is not the rightmost, it won't become stale; instead, its text will
+        // If the item you're dismissing is not the rightmost, it won't become stale; instead, its text will
         // be swapped out with the one to its right.  So, we check to see that either the text has changed or
-        // the item became stale.
-        WebDriverWrapper.waitFor(()->  {
-                return ExpectedConditions.stalenessOf(getComponentElement()).apply(getDriver())
-                        || !getText().equals(originalText);
-        }, "the value item ["+originalText+"] did not disappear", 1000);
+        // the item became stale. ExpectedConditions.textToBePresentInElement returns false if element is stale.
+        WebDriverWrapper.waitFor(()-> ExpectedConditions.not(
+                ExpectedConditions.textToBePresentInElement(elementCache().textSpan, originalText))
+                        .apply(getDriver())
+                , "The value item ["+originalText+"] did not disappear.", 1000);
     }
 
     /**
@@ -82,10 +82,7 @@ protected ElementCache newElementCache()
 
     protected class ElementCache extends Component<?>.ElementCache
     {
-        public WebElement textSpan()
-        {
-            return Locator.tag("span").findElement(getComponentElement());
-        }
+        public final WebElement textSpan = Locator.tag("span").refindWhenNeeded(getComponentElement());
 
         public final WebElement icon = Locator.tag("i").findWhenNeeded(getComponentElement());
     }

diff --git a/src/org/labkey/test/tests/AdminConsoleTest.java b/src/org/labkey/test/tests/AdminConsoleTest.java
@@ -68,7 +68,7 @@ public void testRibbonBar()
         waitForElement(Locator.xpath("//div[contains(text(), 'Cannot enable the ribbon message without providing a message to show')]"));
 
         String linkText = "and also click this...";
-        String html = "READ ME!!!  <a href='<%=contextPath%>/project/home/begin.view'>" + linkText + "</a>";
+        String html = "READ ME!!!  <a href='<%=contextPath%>" + "/home/project-begin.view'>" + linkText + "</a>";
 
         //only check if not already checked
         checkbox = Locator.checkboxByName("showRibbonMessage").findElement(getDriver());
@@ -84,7 +84,7 @@ public void testRibbonBar()
         Locator ribbonLink = Locator.tagWithClassContaining("div", "alert").append(Locator.linkContainingText("and also click this..."));
         assertElementPresent(ribbonLink);
         String href = ribbonLink.findElement(getDriver()).getAttribute("href");
-        String expected = WebTestHelper.getBaseURL() + "/project/home/begin.view";
+        String expected = WebTestHelper.getBaseURL() + "/home/project-begin.view";
         assertEquals("Incorrect URL", expected, href);
 
         goToHome();

diff --git a/src/org/labkey/test/tests/BaseTermsOfUseTest.java b/src/org/labkey/test/tests/BaseTermsOfUseTest.java
@@ -153,7 +153,6 @@ public List<String> getAssociatedModules()
 
     protected void goToProjectBegin(String projectName)
     {
-        beginAt("project/" + projectName + "/begin.view?");
+        beginAt(projectName + "/project-begin.view");
     }
-
 }
diff --git a/src/org/labkey/test/tests/ContainerContextTest.java b/src/org/labkey/test/tests/ContainerContextTest.java
@@ -263,7 +263,7 @@ public void testIssue15751() throws Exception
         insertJobIntoSubFolder(SUB_FOLDER_B);
 
         log("** Viewing pipeline status from project container. Sort by Description (report name) and include sub-folders");
-        beginAt("/pipeline-status/" + getProjectName() + "/showList.view?StatusFiles.sort=Description&StatusFiles.containerFilterName=CurrentAndSubfolders");
+        beginAt("/" + getProjectName() + "/pipeline-status-showList.view?StatusFiles.sort=Description&StatusFiles.containerFilterName=CurrentAndSubfolders");
 
         log("** Checking URLs go to correct container...");
         String href = getAttribute(Locator.tagWithText("a", "COMPLETE").index(0), "href");

diff --git a/src/org/labkey/test/tests/CrossSiteScriptingForDeleteTest.java b/src/org/labkey/test/tests/CrossSiteScriptingForDeleteTest.java
@@ -19,7 +19,7 @@ public class CrossSiteScriptingForDeleteTest extends BaseWebDriverTest
 {
     protected static final String PROJECT_NAME = "CrossSiteScriptingForDeleteTest";
     protected static final String REPORT_NAME = BaseWebDriverTest.INJECT_CHARS_1;
-    private static final String LINK_REPORT_URL = "/project/home/begin.view";
+    private static final String LINK_REPORT_URL = "/home/project-begin.view";
 
     @BeforeClass
     public static void initTest()

diff --git a/src/org/labkey/test/tests/FileAttachmentColumnTest.java b/src/org/labkey/test/tests/FileAttachmentColumnTest.java
@@ -100,7 +100,7 @@ private void doSetup()
 
     private void createList()
     {
-        beginAt("/project/" + getProjectName() +"/"+ FOLDER_NAME + "/begin.view?");
+        beginAt(getProjectName() + "/" + FOLDER_NAME + "/project-begin.view");
         clickTab("Portal");
 
         ListHelper listHelper = new ListHelper(getDriver());
@@ -130,7 +130,7 @@ private void createList()
 
     private void createSampleType()
     {
-        beginAt("/project/" + getProjectName() +"/"+ FOLDER_NAME + "/begin.view?");
+        beginAt(getProjectName() + "/" + FOLDER_NAME + "/project-begin.view");
         clickTab("Portal");
 
         PortalHelper portalHelper = new PortalHelper(getDriver());
@@ -160,7 +160,7 @@ private void createSampleType()
     @Before
     public void preTest()
     {
-        beginAt("/project/" + getProjectName() +"/"+ FOLDER_NAME + "/begin.view?");
+        beginAt(getProjectName() + "/" + FOLDER_NAME + "/project-begin.view");
     }
 
     @Override

diff --git a/src/org/labkey/test/tests/JUnitTest.java b/src/org/labkey/test/tests/JUnitTest.java
@@ -201,7 +201,7 @@ private static TestSuite _suite(Predicate<Map<String,Object>> accept, boolean sk
         CloseableHttpResponse response = null;
         try (CloseableHttpClient client = WebTestHelper.getHttpClient())
         {
-            final String url = WebTestHelper.getBaseURL() + "/junit-testlist.view?";
+            final String url = WebTestHelper.getBaseURL() + "/junit-testlist.view";
             HttpGet method = new HttpGet(url);
             try
             {

diff --git a/src/org/labkey/test/tests/NonStudyReportsTest.java b/src/org/labkey/test/tests/NonStudyReportsTest.java
@@ -56,7 +56,7 @@ public class NonStudyReportsTest extends ReportTest
     private static final String DISCUSSION_BODY_3 = "Editing a discussion response";
     private static final String LINK_REPORT1_NAME = "Link report 1" + BaseWebDriverTest.INJECT_CHARS_2;
     private static final String LINK_REPORT1_DESCRIPTION = "Link report 1" + BaseWebDriverTest.INJECT_CHARS_2;
-    private static final String LINK_REPORT1_URL = "/project/home/begin.view";
+    private static final String LINK_REPORT1_URL = "/home/project-begin.view";
     private static final String LINK_REPORT2_NAME = "Link report 2" + BaseWebDriverTest.INJECT_CHARS_2;
     private static final String LINK_REPORT2_DESCRIPTION = "This link report points links to an external page.";
     protected final PortalHelper portalHelper = new PortalHelper(this);

diff --git a/src/org/labkey/test/tests/SecurityTest.java b/src/org/labkey/test/tests/SecurityTest.java
@@ -167,23 +167,23 @@ public void testSteps() throws IOException
     protected void cantReachAdminToolFromUserAccount()
     {
         final String historyTabTitle = "History:";
-        final Set<String> unreachableUrls = new HashSet<>(Arrays.asList("/admin/showAdmin.view?", "/user/showUsers.view?",
-                "/security/group.view?group=Administrators", "/security/group.view?group=Developers",
-                "/user/showUsers.view?", "/security/project.view?returnUrl=%2Fuser%2FshowUsers.view%3F", "/admin/createFolder.view?",
-                "/analytics/begin.view?", "/login/configure.view?", "/admin/customizeEmail.view?", "/admin/filesSiteSettings.view?",
-                "/admin/projectSettings.view?", "/flow/flowAdmin.view?", "/admin/reorderFolders.view?", "/admin/customizeSite.view?",
-                "/core/configureReportsAndScripts.view?", "/audit/showAuditLog.view?", "/search/admin.view?",
-                "/ms2/showMS2Admin.view?", "/experiment-types/begin.view?", "/pipeline-status/showList.view?",
-                "/pipeline/setup.view?", "/ms2/showProteinAdmin.view?", "/admin/actions.view?", "/admin/caches.view?",
-                "/admin/dbChecker.view?", "/query/dataSourceAdmin.view?", "/admin/dumpHeap.view?", "/admin/environmentVariables.view?",
-                "/admin/memTracker.view?", "/admin/queries.view?", "/admin/resetErrorMark.view?", "/admin/showThreads.view?",
-                "/admin-sql/scripts.view?", "/admin/systemProperties.view?", "/admin/emailTest.view?", "/admin/showAllErrors.view?",
-                "/admin/showErrorsSinceMark.view?", "/admin/showPrimaryLog.view?",
+        final Set<String> unreachableUrls = new HashSet<>(Arrays.asList("/admin-showAdmin.view", "/user-showUsers.view",
+            "/security-group.view?group=Administrators", "/security-group.view?group=Developers",
+            "/user-showUsers.view", "/security-project.view?returnUrl=%2Fuser%2FshowUsers.view%3F", "/admin-createFolder.view",
+            "/analytics-begin.view", "/login-configure.view", "/admin-customizeEmail.view", "/admin-filesSiteSettings.view",
+            "/admin-projectSettings.view", "/flow-flowAdmin.view", "/admin-reorderFolders.view", "/admin-customizeSite.view",
+            "/core-configureReportsAndScripts.view", "/audit-showAuditLog.view", "/search-admin.view",
+            "/ms2-showMS2Admin.view", "/experiment-types-begin.view", "/pipeline-status-showList.view",
+            "/pipeline-setup.view", "/ms2-showProteinAdmin.view", "/admin-actions.view", "/admin-caches.view",
+            "/admin-dbChecker.view", "/query-dataSourceAdmin.view", "/admin-dumpHeap.view", "/admin-environmentVariables.view",
+            "/admin-memTracker.view", "/admin-queries.view", "/admin-resetErrorMark.view", "/admin-showThreads.view",
+            "/admin-sql-scripts.view", "/admin-systemProperties.view", "/admin-emailTest.view", "/admin-showAllErrors.view",
+            "/admin-showErrorsSinceMark.view", "/admin-showPrimaryLog.view",
 
         /* Management actions shouldn't be reachable by non-admins */
-                "/admin-missingValues.view", "/admin-manageFolders.view", "/admin-moduleProperties.view", "/admin-concepts.view",
-                "/search-searchSettings.view", "/admin-notifications.view", "/admin-exportFolder.view", "/admin-importFolder.view",
-                "/admin-fileRoots.view", "/admin-folderInformation.view"
+            "/admin-missingValues.view", "/admin-manageFolders.view", "/admin-moduleProperties.view", "/admin-concepts.view",
+            "/search-searchSettings.view", "/admin-notifications.view", "/admin-exportFolder.view", "/admin-importFolder.view",
+            "/admin-fileRoots.view", "/admin-folderInformation.view"
         ));
 
 
@@ -430,7 +430,7 @@ protected void checkGroupMembership(String userName, String groupName, int expec
     @LogMethod
     protected void tokenAuthenticationTest() throws IOException
     {
-        beginAt("/project/SecurityVerifyProject/begin.view?");
+        beginAt("/SecurityVerifyProject/project-begin.view");
         String homePageUrl = removeUrlParameters(getURL().toString());  // Absolute URL for redirect, get rid of '?'
         String relUrl = getCurrentRelativeURL();
         boolean newSchool = relUrl.contains("project-");