Skip to content

Test export/import of query properties #2671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Sep 4, 2025
Merged

Test export/import of query properties #2671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/org/labkey/test/BaseWebDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,14 +1705,14 @@ protected void setSelectedFields(String containerPath, String schema, String que
}

@LogMethod
private ExportFolderPage prepareForFolderExport(@Nullable String folderName, boolean exportSecurityGroups, boolean exportRoleAssignments, boolean includeSubfolders, boolean includeFiles, boolean exportETLDefination)
private ExportFolderPage prepareForFolderExport(@Nullable String folderName, boolean exportSecurityGroups, boolean exportRoleAssignments, boolean includeSubfolders, boolean includeFiles, boolean exportETLDefinition)
{
if (folderName != null)
clickFolder(folderName);
ExportFolderPage exportFolderPage = goToFolderManagement().goToExportTab();

if (exportETLDefination)
exportFolderPage.includeETLDefintions(exportETLDefination);
if (exportETLDefinition)
exportFolderPage.includeETLDefinitions(exportETLDefinition);

if (exportSecurityGroups)
exportFolderPage.includeSecurityGroups(exportSecurityGroups);
Expand Down Expand Up @@ -2283,12 +2283,11 @@ public SourceQueryPage editQuerySource(String schemaName, String queryName)
clickAndWait(Locator.linkContainingText("edit source"));
return new SourceQueryPage(getDriver());
}

public void editQueryProperties(String schemaName, String queryName)
{
selectQuery(schemaName, queryName);
Locator loc = Locator.tagWithText("a", "edit properties");
waitForElement(loc, WAIT_FOR_JAVASCRIPT);
clickAndWait(loc);
String url = WebTestHelper.buildRelativeUrl("query", getCurrentContainerPath(), "propertiesQuery", Map.of("schemaName", schemaName, "query.queryName", queryName));
beginAt(url);
}

public void createNewQuery(String schemaName)
Expand Down Expand Up @@ -2318,11 +2317,9 @@ protected void createQuery(String container, String name, String schemaName, Str
{
sourcePage.setMetadataXml(xml);
}
sourcePage.clickSave();
sourcePage.clickSave(); // This seems very slow... maybe clickSaveAndFinish() instead?
if (inheritable)
{
String queryURL = "query/" + container + "/begin.view?schemaName=" + schemaName;
beginAt(queryURL);
editQueryProperties(schemaName, name);
selectOptionByValue(Locator.name("inheritable"), "true");
clickButton("Save");
Expand Down
9 changes: 8 additions & 1 deletion src/org/labkey/test/pages/admin/ExportFolderPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public ExportFolderPage includeFiles(boolean checked)
return this;
}

public ExportFolderPage includeETLDefintions(boolean checked)
public ExportFolderPage includeETLDefinitions(boolean checked)
{
elementCache().etlDefinitionsCheckbox.set(checked);
return this;
Expand Down Expand Up @@ -171,6 +171,12 @@ public ExportFolderPage includeObject(String label, boolean include)
return this;
}

public ExportFolderPage clearAllObjects()
{
elementCache().clearAllObjects.click();
return this;
}

public void includePhiColumns(FieldDefinition.PhiSelectType exportPhiLevel)
{
if (NotPHI != exportPhiLevel)
Expand Down Expand Up @@ -281,6 +287,7 @@ public Checkbox exportItemCheckbox(String label)
);

public final WebElement exportBtn = Locator.linkWithSpan("Export").findWhenNeeded(getDriver());
public final WebElement clearAllObjects = Locator.linkWithSpan("Clear All Objects").findWhenNeeded(getDriver());
}

public enum ExportLocation
Expand Down