Skip to content

Don't leave test on CDS page as non-primary user #682

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-tchad merged 4 commits into from
Jan 28, 2025
Merged

Don't leave test on CDS page as non-primary user #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c51b34
Fix error during ensureSignedInAsPrimaryTestUser
labkey-tchad Jan 24, 2025
5f51cb3
Dump threads after schema browser fails to load
labkey-tchad Jan 24, 2025
ad364b4
Remove debug code
labkey-tchad Jan 27, 2025
40b3969
Remove deprecated reference
labkey-tchad Jan 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
3 changes: 2 additions & 1 deletion test/src/org/labkey/test/tests/cds/CDSLoginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
public class CDSLoginTest extends CDSReadOnlyTest
{
private static final String CDS_LOGIN_TESTUSER = "user_passwordtest@cds.test";
private final CDSHelper cds = new CDSHelper(this);

@Before
public void preTest()
Expand Down Expand Up @@ -154,6 +153,8 @@ public void testPasswordStrength()
changePasswordDialog.setReEnterPassword(strongPwd);
changePasswordDialog.submit();
waitFor(() -> getCurrentUser().equals(CDS_LOGIN_TESTUSER), "login failed for " + CDS_LOGIN_TESTUSER, defaultWaitForPage);

goToHome(); // 'ensureSignedInAsPrimaryTestUser' can be interrupted by CDS session timeout page
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public List<String> getAssociatedModules()
@BeforeClass
public static void doSetup() throws Exception
{
CDSReadOnlyTest initTest = (CDSReadOnlyTest)getCurrentTest();
CDSReadOnlyTest initTest = getCurrentTest();
if (initTest.needsSetup())
{
CDSInitializer _initializer = new CDSInitializer(initTest);
Expand Down
3 changes: 2 additions & 1 deletion test/src/org/labkey/test/util/cds/CDSHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.labkey.test.pages.cds.GroupDetailsPage;
import org.labkey.test.pages.cds.LearnGrid;
import org.labkey.test.pages.cds.LearnGrid.LearnTab;
import org.labkey.test.pages.reports.ScriptReportPage.StandardReportOption;
import org.labkey.test.util.ApiPermissionsHelper;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
Expand Down Expand Up @@ -2048,7 +2049,7 @@ public int createReport(RReportHelper rReportHelper, String queryUrl, @Nullable
_test.setCodeEditorValue("script-report-editor", reportScript);

if (shareReport)
rReportHelper.selectOption(RReportHelper.ReportOption.shareReport);
rReportHelper.selectOption(StandardReportOption.shareReport);

_test.waitForElement(Locator.tagWithText("span", "Save"));
rReportHelper.saveReport(reportName);
Expand Down