Skip to content
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.

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

[BI-1692] - Change role names #142

Merged
merged 3 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ The implemented scenarios assume the following data is set up on BI:
**Users**
| Name | Email | System Role |
| ------ | ------ | ------ |
| Christian | christian@mailinator.com | admin |
| Christian | christian@mailinator.com | System Administrator |
| Cucumber Breeder | cucumberbreeder@mailinator.com | |
| Cucumber Member | cucumbermember@mailinator.com| |
| TrailMix Breeder | trailmix@mailinator.com | |

**Programs**
| Name | Species | Users (role) |
| ------ | ------ | ------ |
| Snacks | Grape | Cucumber Breeder (breeder) <br> Cucumber Member (member) <br> Christian (breeder) |
| Trail Mix | Grape | Cucumber Breeder (member) <br> TrailMix Breeder (breeder) <br> Christian (breeder) |
| Snacks | Grape | Cucumber Breeder (Program Administrator) <br> Cucumber Member (Read Only) <br> Christian (Program Administrator) |
| Trail Mix | Grape | Cucumber Breeder (Read Only) <br> TrailMix Breeder (Program Administrator) <br> Christian (Program Administrator) |

**Automated Database Setup**

Expand Down
14 changes: 7 additions & 7 deletions populate-taf-data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ VALUES
('0000-0002-7046-0251', 'TrailMix Breeder', 'trailmix@mailinator.com', by_user_id, by_user_id, true);

INSERT INTO system_user_role (bi_user_id, system_role_id, created_by, updated_by)
SELECT bi_user.id, system_role.id, by_user_id, by_user_id FROM bi_user JOIN system_role ON bi_user.name = 'Christian' and system_role.domain = 'admin';
SELECT bi_user.id, system_role.id, by_user_id, by_user_id FROM bi_user JOIN system_role ON bi_user.name = 'Christian' and system_role.domain = 'System Administrator';

--Create program germplasm sequences
create sequence tmtest_germplasm_sequence;
Expand All @@ -49,27 +49,27 @@ SELECT id, by_user_id, by_user_id FROM program WHERE name = 'Snacks';

--Add Users To Programs
INSERT INTO program_user_role (program_id, user_id, role_id, created_by, updated_by, active)
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Cucumber Breeder' and role.domain = 'breeder'
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Cucumber Breeder' and role.domain = 'Program Administrator'
JOIN program ON program.name = 'Snacks';

INSERT INTO program_user_role (program_id, user_id, role_id, created_by, updated_by, active)
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Cucumber Breeder' and role.domain = 'member'
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Cucumber Breeder' and role.domain = 'Read Only'
JOIN program ON program.name = 'Trail Mix';

INSERT INTO program_user_role (program_id, user_id, role_id, created_by, updated_by, active)
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Cucumber Member' and role.domain = 'member'
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Cucumber Member' and role.domain = 'Read Only'
JOIN program ON program.name = 'Snacks';

INSERT INTO program_user_role (program_id, user_id, role_id, created_by, updated_by, active)
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'TrailMix Breeder' and role.domain = 'breeder'
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'TrailMix Breeder' and role.domain = 'Program Administrator'
JOIN program ON program.name = 'Trail Mix';

INSERT INTO program_user_role (program_id, user_id, role_id, created_by, updated_by, active)
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Christian' and role.domain = 'breeder'
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Christian' and role.domain = 'Program Administrator'
JOIN program ON program.name = 'Snacks';

INSERT INTO program_user_role (program_id, user_id, role_id, created_by, updated_by, active)
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Christian' and role.domain = 'breeder'
SELECT program.id, bi_user.id, role.id, by_user_id, by_user_id, true FROM bi_user JOIN role ON bi_user.name = 'Christian' and role.domain = 'Program Administrator'
JOIN program ON program.name = 'Trail Mix';

INSERT INTO program_enabled_breeding_methods(breeding_method_id, program_id, created_by, created_at, updated_by, updated_at)
Expand Down
6 changes: 3 additions & 3 deletions src/features/BreedingMethods.feature
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Feature: Breeding Methods
When user clicks 'New User' button
When user sets "Christian" in Name field of User
When user sets "christian@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
And user pause for "5" seconds
And user selects "Breeding Methods" tab
Expand Down Expand Up @@ -82,13 +82,13 @@ Feature: Breeding Methods
When user clicks 'New User' button
When user sets "Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
And user pause for "5" seconds
When user clicks 'New User' button
When user sets "Breeder" in Name field of User
When user sets "cucumbermember@mailinator.com" in Email field of User
When user sets "member" in Role dropdown of User
When user sets "Read Only" in Role dropdown of User
When user click 'Save' button in User
And user pause for "5" seconds
When user close the Notification
Expand Down
2 changes: 1 addition & 1 deletion src/features/Configuration.feature
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Feature: Configuration
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down
10 changes: 5 additions & 5 deletions src/features/ExperimentsImport.feature
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Feature: Experiments & Observations
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down Expand Up @@ -74,7 +74,7 @@ Feature: Experiments & Observations
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down Expand Up @@ -126,7 +126,7 @@ Feature: Experiments & Observations
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down Expand Up @@ -177,7 +177,7 @@ Feature: Experiments & Observations
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down Expand Up @@ -230,7 +230,7 @@ Feature: Experiments & Observations
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down
2 changes: 1 addition & 1 deletion src/features/GermplasmImportTable.feature
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Feature: Germplasm Import Table
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down
2 changes: 1 addition & 1 deletion src/features/GermplasmSort.feature
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Feature: Germplasm Sort Test
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down
4 changes: 2 additions & 2 deletions src/features/GermplasmTable.feature
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Feature: Germplasm table loading message
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down Expand Up @@ -77,7 +77,7 @@ Feature: Germplasm table loading message
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down
6 changes: 3 additions & 3 deletions src/features/LoginByRoleAdminTests.feature
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Feature: Logging with Sys Administration
Background: Required Setup
Given user logs in as "sysad"
And user selects "System Administration" on program-selection page
And user can see "Cucumber Breeder" has been added to "Snacks" as a breeder
And user can see "Cucumber Breeder" has been added to "Trail Mix" as a member
And user can see "TrailMix Breeder" has been added to "Trail Mix" as a breeder
And user can see "Cucumber Breeder" has been added to "Snacks" as a Program Administrator
And user can see "Cucumber Breeder" has been added to "Trail Mix" as a Read Only
And user can see "TrailMix Breeder" has been added to "Trail Mix" as a Program Administrator
And user can see "Snacks" as a program

@BI-817
Expand Down
14 changes: 7 additions & 7 deletions src/features/LoginByRoleMemberTests.feature
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Feature: Logging with Member
Feature: Logging with Read Only

@BI-822
Scenario: Logging in as a member of one program
Scenario: Logging in as a Read Only of one program
Given user logs in as "Cucumber Member"
When user selects "Snacks" on program-selection page
Then user can see Welcome page of program
Expand All @@ -15,7 +15,7 @@ Feature: Logging with Member
And user can see "Program Administration" in navigation

@BI-823
Scenario: Logging in as a breeder of one program
Scenario: Logging in as a Read Only of one program
Given user logs in as "Cucumber Member"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this an issue in the description of the test?

When user selects "Snacks" on program-selection page
Then user can see Welcome page of program
Expand All @@ -28,14 +28,14 @@ Feature: Logging with Member
And user can see "Program Administration" in navigation

@BI-845
Scenario: Logging in as a breeder of one program
Scenario: Logging in as a Read Only of one program
Given user logs in as "Cucumber Member"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this was just a labeling issue of the scenario like the last one

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I figured I might as well fix the labels since I was changing them anyway.

When user selects "Snacks" on program-selection page
When user selects "Ontology" in navigation
Then user can not see "Import Ontology" in navigation

@BI-887
Scenario: No Admin role, Program Member - Program User Management
Scenario: No System Admin role, Program Read Only - Program User Management
Given user logs in as "Cucumber Member"
When user selects "Snacks" on program-selection page
And user selects "Program Administration" in navigation
Expand All @@ -47,7 +47,7 @@ Feature: Logging with Member
#To ensure there is at least one location in list of locations in Snacks
#Scenario will still pass with no locations, but won't test the lack of Edit and Deactivate links
@BI-915
Scenario: Program Location Management page - member - SETUP
Scenario: Program Location Management page - Read Only - SETUP
Given user logs in as "Cucumber Breeder"
When user selects "Snacks" on program-selection page
When user selects "Program Administration" in navigation
Expand All @@ -60,7 +60,7 @@ Feature: Logging with Member
| Location* |

@BI-915
Scenario: Program Location Management page - member
Scenario: Program Location Management page - Read Only
Given user logs in as "Cucumber Member"
When user selects "Snacks" on program-selection page
And user selects "Program Administration" in navigation
Expand Down
2 changes: 1 addition & 1 deletion src/features/OntologyImportPreview.feature
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Feature: Ontology Import Preview
When user clicks 'New User' button
When user sets "Cucumber Breeder" in Name field of User
When user sets "cucumberbreeder@mailinator.com" in Email field of User
When user sets "breeder" in Role dropdown of User
When user sets "Program Administrator" in Role dropdown of User
When user click 'Save' button in User
When user pause for "10" seconds
When user close notification pop-up
Expand Down
2 changes: 1 addition & 1 deletion src/features/SmokeTests.feature
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Feature: Smoke Tests (11)

Examples:
| Name | Email | Role |
| Test * | test*@mailinator.com | breeder |
| Test * | test*@mailinator.com | Program Administrator |

@BI-806
Scenario: Check Users page
Expand Down
28 changes: 14 additions & 14 deletions src/features/UserManagementBreeder.feature
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Feature: Breeder User Management
And user selects New User button
And user sets "Tester Breeder" in Name field
And user sets "testnewuser@mail.com" in Email field
And user sets "breeder" in Role dropdown
And user sets "Program Administrator" in Role dropdown
And user selects Cancel button
Then user does not see new user form
And user does not see a new user in Users list
Expand All @@ -121,7 +121,7 @@ Feature: Breeder User Management
And user selects "Users" tab
When user creates a new user
| Name | Email | Role |
| Test * | test*@mailinator.com | breeder |
| Test * | test*@mailinator.com | Program Administrator |
Then user can see a new user is added in User

@BI-894
Expand All @@ -133,7 +133,7 @@ Feature: Breeder User Management
And user selects New User button
And user sets "Tester Breeder" in Name field
And user sets "testnewuser" in Email field
And user sets "breeder" in Role dropdown
And user sets "Program Administrator" in Role dropdown
And user selects Save button
Then user can see banner appears with an error message "Fix Invalid Fields"
Then user can see 'Email must be in email format' below the Email field
Expand All @@ -147,7 +147,7 @@ Feature: Breeder User Management
When user selects New User button
And user sets "TestNewUser" in Name field
And user sets "cucumberbreeder@mailinator.com" in Email field
And user sets "breeder" in Role dropdown
And user sets "Program Administrator" in Role dropdown
And user selects Save button
Then user can see banner appears with an error message "Error creating user, a user with this email already exists"
Then user can see new user form
Expand All @@ -160,9 +160,9 @@ Feature: Breeder User Management
And user selects "Users" tab
When user creates a new user
| Name | Email | Role |
| Test * | test*@mailinator.com | breeder |
| Test * | test*@mailinator.com | Program Administrator |
And user clicks Edit of a user
Then user can see "breeder" in the the Role dropdown
Then user can see "Program Administrator" in the the Role dropdown
Then user can see Save button
Then user can see Cancel button

Expand All @@ -174,7 +174,7 @@ Feature: Breeder User Management
And user selects "Users" tab
When user creates a new user
| Name | Email | Role |
| Test * | test*@mailinator.com | breeder |
| Test * | test*@mailinator.com | Program Administrator |
And user clicks Edit of a user
And user selects Cancel button
Then user can see user is in users list
Expand All @@ -187,10 +187,10 @@ Feature: Breeder User Management
And user selects "Users" tab
When user creates a new user
| Name | Email | Role |
| Test * | test*@mailinator.com | breeder |
| Test * | test*@mailinator.com | Program Administrator |
And user edits a user
| Role |
| member |
| Read Only |
Then user can see user is in users list

@BI-900
Expand All @@ -201,7 +201,7 @@ Feature: Breeder User Management
And user selects "Users" tab
And user creates a new user
| Name | Email | Role |
| User* | test*@mailinator.com | breeder |
| User* | test*@mailinator.com | Program Administrator |
When user selects Deactivate of user
Then user can see "Deactivate" in modal box header
Then user can see "<NameToDeactivate>" in modal box header
Expand All @@ -223,7 +223,7 @@ Feature: Breeder User Management
And user selects "Users" tab
And user creates a new user
| Name | Email | Role |
| Test * | test*@mailinator.com | breeder |
| Test * | test*@mailinator.com | Program Administrator |
When user selects Deactivate of user
And user can see 'Cancel' button
And user selects "Cancel" button
Expand All @@ -237,7 +237,7 @@ Feature: Breeder User Management
And user selects "Users" tab
And user creates a new user
| Name | Email | Role |
| Test * | test*@mailinator.com | breeder |
| Test * | test*@mailinator.com | Program Administrator |
When user selects Deactivate of user
And user selects modal Yes, archive button
Then user can not see user is in users list
Expand All @@ -249,11 +249,11 @@ Feature: Breeder User Management
And user selects "Program Administration" in navigation
And user selects "Users" tab
When user selects "Edit" of Name "Christian"
When user selects "member" in Role dropdown
When user selects "Read Only" in Role dropdown
When user selects "Save" button
Then user can see banner contains "Success"
When user selects "Edit" of Name "Christian"
When user selects "breeder" in Role dropdown
When user selects "Program Administrator" in Role dropdown
When user selects "Save" button
Then user can see banner contains "Success"

Expand Down
Loading
Loading