Skip to content

Issue 52485: App admins can't edit shorturls #2515

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-jeckels merged 2 commits into from
Jun 27, 2025
Merged

Issue 52485: App admins can't edit shorturls #2515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a70b6e
Issue 52485: App admins can't edit shorturls
labkey-jeckels Jun 25, 2025
05d1b5a
Merge branch 'develop' into fb_52485_shortUrls
labkey-jeckels Jun 27, 2025
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
31 changes: 24 additions & 7 deletions src/org/labkey/test/tests/core/admin/ShortUrlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.junit.experimental.categories.Category;
import org.labkey.remoteapi.Connection;
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.WebTestHelper;
import org.labkey.test.categories.Daily;
import org.labkey.test.pages.admin.ShortUrlAdminPage;
Expand Down Expand Up @@ -186,20 +187,36 @@ public void testShortUrlPermissions()
adminPage.submitShortUrl(shortUrl_a, targetUrl2);

// Issue #52485 "App admins can create and edit shorturls but can't view them" (but now they can!)
verifyShortUrlsInGrid(shortUrl_a, targetUrl2, shortUrl_b);
verifyShortUrlsInGrid(Map.of(shortUrl_a, targetUrl2, shortUrl_b, targetUrl2));

// Edit an existing row, setting it back to the original target
DataRegionTable table = new DataRegionTable("ShortURL", getDriver());
table.setFilter("ShortURL", "Equals", shortUrl_a);
table.clickEditRow(0);
setFormElement(Locator.name("fullURL"), targetUrl1);
clickButton("Update");

// Issue #52485 "App admins can create and edit shorturls but can't view them" (but now they can!)
verifyShortUrlsInGrid(Map.of(shortUrl_a, targetUrl1, shortUrl_b, targetUrl2));

// Delete an existing row
table = new DataRegionTable("ShortURL", getDriver());
table.setFilter("ShortURL", "Equals", shortUrl_a);
table.checkCheckbox(0);
table.deleteSelectedRows();
assertTextNotPresent(targetUrl1);
});

verifyShortUrlsInGrid(shortUrl_a, targetUrl2, shortUrl_b);
// Double-verify the single entry to reuse the same validation method
verifyShortUrlsInGrid(Map.of(shortUrl_b, targetUrl2));
}

private void verifyShortUrlsInGrid(String shortUrl_a, String targetUrl2, String shortUrl_b)
/** Map of short URL to target URLs to expect */
private void verifyShortUrlsInGrid(Map<String, String> urlMap)
{
Assertions.assertThat(ShortUrlAdminPage.beginAt(this).getUrlsFromGrid())
.as("short URLs")
.containsAllEntriesOf(Map.of(
shortUrl_a, targetUrl2,
shortUrl_b, targetUrl2
));
.containsAllEntriesOf(urlMap);
}

private String nextUrlKey()
Expand Down