From 64a7dd03fca7f3012698cd9bd8c8e0f4b3b6941a Mon Sep 17 00:00:00 2001 From: Trey Chadick Date: Tue, 23 Jan 2024 13:39:44 -0800 Subject: [PATCH] Remove unnecessary leading slash when deleting container (#1806) --- .../tests/core/security/GetReadableContainersAPITest.java | 6 +++--- src/org/labkey/test/util/APIContainerHelper.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/labkey/test/tests/core/security/GetReadableContainersAPITest.java b/src/org/labkey/test/tests/core/security/GetReadableContainersAPITest.java index 59018784dc..c3ebebd47b 100644 --- a/src/org/labkey/test/tests/core/security/GetReadableContainersAPITest.java +++ b/src/org/labkey/test/tests/core/security/GetReadableContainersAPITest.java @@ -23,7 +23,7 @@ @Category({Daily.class}) public class GetReadableContainersAPITest extends BaseWebDriverTest { - private static final String PROJECT_PREFIX = "GetReadableContainersAPITest"; + private static final String PROJECT_PREFIX = "/GetReadableContainersAPITest"; private static final String READABLE_PROJECT = PROJECT_PREFIX + " Readable"; private static final String UNREADABLE_PROJECT = PROJECT_PREFIX + " Unreadable"; private static final String USER = "reader@containersapi.test"; @@ -190,7 +190,7 @@ private String getPathToFolder(boolean projectReadable, boolean... foldersReadab private Set getReadableContainers(Boolean includeSubfolders, Integer depth, Object container) { List response = executeGetReadableContainers(includeSubfolders, depth, container, List.class); - return response.stream().filter(path -> path.startsWith("/" + PROJECT_PREFIX)).collect(Collectors.toSet()); + return response.stream().filter(path -> path.startsWith(PROJECT_PREFIX)).collect(Collectors.toSet()); } private List> getReadableContainersErrors(Boolean includeSubfolders, Integer depth, Object container) @@ -214,7 +214,7 @@ private T executeGetReadableContainers(Boolean includeSubfolders, Integer de if (depth != null) config.put("depth", depth); if (container != null) - config.put("container", "/" + container); + config.put("container", container); String script = "var config = arguments[0];\n" + "config.success = callback;\n" + diff --git a/src/org/labkey/test/util/APIContainerHelper.java b/src/org/labkey/test/util/APIContainerHelper.java index dce63e831d..676e4b4cc9 100644 --- a/src/org/labkey/test/util/APIContainerHelper.java +++ b/src/org/labkey/test/util/APIContainerHelper.java @@ -126,7 +126,7 @@ else if (parentPath.equals("/")) @Override protected void doDeleteProject(String projectName, boolean failIfNotFound, int wait) throws TestTimeoutException { - deleteContainer("/" + projectName, failIfNotFound, wait); + deleteContainer(projectName, failIfNotFound, wait); } @Override