Merge branch 'release25.9-SNAPSHOT' into 25.9_fb_variousLKSMTestFixes

Author: labkey-danield

src/org/labkey/test/WebDriverWrapper.java

@@ -2129,6 +2129,14 @@ public long doAndMaybeWaitForPageToLoad(int msWait, Supplier<Boolean> action)
         return loadTimer.elapsed().toMillis();
     }
 
+    public void doAndWaitForNewWindow(Runnable action)
+    {
+        Set<String> windows = getDriver().getWindowHandles();
+        action.run();
+        switchToWindow(windows.size());
+        waitForDocument();
+    }
+
     public long doAndWaitForWindow(Runnable action, String windowName)
     {
         String initialWindow = getDriver().getWindowHandle();

src/org/labkey/test/tests/DataRegionTest.java

@@ -17,19 +17,23 @@
 package org.labkey.test.tests;
 
 import org.apache.commons.lang3.tuple.Pair;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.categories.Daily;
 import org.labkey.test.categories.Data;
+import org.labkey.test.components.ChartTypeDialog;
 import org.labkey.test.params.FieldDefinition;
 import org.labkey.test.params.FieldDefinition.ColumnType;
 import org.labkey.test.util.DataRegionExportHelper;
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.EscapeUtil;
+import org.labkey.test.util.selenium.WebDriverUtils;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -141,12 +145,34 @@ public void testSteps() throws Exception
         clickAndWait(Locator.linkWithText(LIST_NAME));
         URL url = getURL();
         dataRegionTest(url, INJECT_CHARS_1);
-        dataRegionTest(url, INJECT_CHARS_2);
+        DataRegionTable dataRegionTable = dataRegionTest(url, INJECT_CHARS_2);
+        testOpenMenuItemInNewTab(dataRegionTable);
         exportLoggingTest();
 
         testQWPDemoPage();
     }
 
+    /**
+     * Regression coverage for Issue 53629: NavMenu doesn't open in new tab correctly
+     */
+    private void testOpenMenuItemInNewTab(DataRegionTable dataRegionTable)
+    {
+        WebElement createChartMenuItem = dataRegionTable
+                .getReportMenu()
+                .openMenuTo("Create Chart");
+        doAndWaitForNewWindow(() ->
+                new Actions(getDriver())
+                        .keyDown(WebDriverUtils.MODIFIER_KEY)
+                        .click(createChartMenuItem)
+                        .perform());
+        ChartTypeDialog chartTypeDialog = new ChartTypeDialog(getDriver());
+        Assertions.assertThat(chartTypeDialog.getColumnList())
+                .as("List should be pre-selected for chart")
+                .containsExactlyInAnyOrder(LIST_KEY_NAME, NAME_COLUMN.getName(), HEX_COLUMN.getName());
+        getDriver().close();
+        switchToMainWindow();
+    }
+
     @Override
     protected List<Pair<String, String>> getTabSignalsPairs()
     {
@@ -188,7 +214,7 @@ private void createList()
         _listHelper.uploadData(LIST_DATA);
     }
 
-    private void dataRegionTest(URL url, String dataRegionName) throws MalformedURLException
+    private DataRegionTable dataRegionTest(URL url, String dataRegionName) throws MalformedURLException
     {
         log("** Beginning test for dataRegionName: " + dataRegionName);
 
@@ -281,6 +307,8 @@ private void dataRegionTest(URL url, String dataRegionName) throws MalformedURLE
 
         table.rowSelector().showAll();
         assertEquals(15, table.getDataRowCount());
+
+        return table;
     }
 
     private void enableComplianceIfInstalled()

src/org/labkey/test/tests/DataViewsReportOrderingTest.java

@@ -25,6 +25,8 @@
 import org.labkey.test.TestTimeoutException;
 import org.labkey.test.categories.Daily;
 import org.labkey.test.components.ext4.Window;
+import org.labkey.test.pages.reports.ManageViewsPage;
+import org.labkey.test.pages.user.ShowUsersPage;
 import org.labkey.test.util.PortalHelper;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;
@@ -133,6 +135,15 @@ private String[] reverseReports(List<String> reportsOriginalOrder)
         return reverseReports;
     }
 
+    @Test
+    public void testRootFolderAccess()
+    {
+        // Regression for issue 53630
+        ShowUsersPage showUsersPage = goToSiteUsers();
+        ManageViewsPage mvp = showUsersPage.getUsersTable().openManageViews();
+        mvp.clickAddReport("R Report");
+    }
+
     @Override
     protected BrowserType bestBrowser()
     {

src/org/labkey/test/util/DataRegionTable.java

@@ -40,6 +40,7 @@
 import org.labkey.test.pages.ImportDataPage;
 import org.labkey.test.pages.TimeChartWizard;
 import org.labkey.test.pages.query.UpdateQueryRowPage;
+import org.labkey.test.pages.reports.ManageViewsPage;
 import org.labkey.test.params.FieldKey;
 import org.labkey.test.selenium.LazyWebElement;
 import org.labkey.test.selenium.RefindingWebElement;
@@ -166,6 +167,12 @@ public CustomizeView openCustomizeGrid()
         return getCustomizeView();
     }
 
+    public ManageViewsPage openManageViews()
+    {
+        getViewsMenu().clickSubMenu(false, "Manage Views");
+        return new ManageViewsPage(getDriver());
+    }
+
     protected DataRegionExportHelper getExportPanel()
     {
         if (_exportHelper == null)