Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions ehr/test/src/org/labkey/test/tests/ehr/AbstractEHRTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import static org.labkey.test.WebTestHelper.buildURL;
import static org.labkey.test.util.PermissionsHelper.READER_ROLE;

@BaseWebDriverTest.ClassTimeout(minutes = 60)
abstract public class AbstractEHRTest extends BaseWebDriverTest implements AdvancedSqlTest
Expand Down Expand Up @@ -689,7 +690,7 @@ protected void createUsersandPermissions()
_permissionsHelper.uncheckInheritedPermissions();

_permissionsHelper.setPermissions(DATA_ADMIN.getGroup(), "EHR Data Entry");
_permissionsHelper.setPermissions(DATA_ADMIN.getGroup(),"Folder Administrator");
_permissionsHelper.setPermissions(DATA_ADMIN.getGroup(),PermissionsHelper.FOLDER_ADMIN_ROLE);
_permissionsHelper.setPermissions(REQUESTER.getGroup(), "EHR Data Entry");
_permissionsHelper.setPermissions(BASIC_SUBMITTER.getGroup(), "EHR Data Entry");
_permissionsHelper.setPermissions(FULL_SUBMITTER.getGroup(), "EHR Data Entry");
Expand All @@ -699,10 +700,10 @@ protected void createUsersandPermissions()

_permissionsHelper.setPermissions(REQUESTER.getGroup(), "EHR Requestor");
_permissionsHelper.setPermissions(REQUEST_ADMIN.getGroup(), "EHR Request Admin");
_permissionsHelper.setPermissions(PATHOLOGY_REPORT.getGroup(), "Reader");
_permissionsHelper.setPermissions(NON_PATHOLOGY_REPORT.getGroup(), "Reader");
_permissionsHelper.setPermissions(PATHOLOGY_REPORT.getGroup(), READER_ROLE);
_permissionsHelper.setPermissions(NON_PATHOLOGY_REPORT.getGroup(), READER_ROLE);
_permissionsHelper.setPermissions(INVESTIGATOR.getGroup(), "EHR Requestor");
_permissionsHelper.setPermissions(INVESTIGATOR_PRINCIPAL.getGroup(), "Reader");
_permissionsHelper.setPermissions(INVESTIGATOR_PRINCIPAL.getGroup(), READER_ROLE);

//this is slow, so dont set passwords unless subclasses need it
if (doSetUserPasswords())
Expand Down