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.

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

Jump to bottom

Don't allow admins to edit roster membership for other rosters #313

Merged
merged 15 commits into from
Sep 19, 2023
Merged

Don't allow admins to edit roster membership for other rosters #313

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
11bcb6c
rename to roster_ids
dirschn Sep 15, 2023
2572b63
remove parse_roster_ids
dirschn Sep 15, 2023
e1a0650
rename create user_params
dirschn Sep 15, 2023
bcfba52
use more typical params format for update
dirschn Sep 15, 2023
b3fa367
redesign roster choosing
dirschn Sep 15, 2023
85f0ef4
use custom checks for page consistency
dirschn Sep 15, 2023
b232a86
leftover oopsie
dirschn Sep 15, 2023
c034455
use user_params for create too
dirschn Sep 19, 2023
72d2795
show all rosters
dirschn Sep 19, 2023
98e33b7
no nested labels
dirschn Sep 19, 2023
d5ef6ad
haml-lint
dirschn Sep 19, 2023
f8cdb96
fix specs
dirschn Sep 19, 2023
87e7f7c
not that fancy
dirschn Sep 19, 2023
80669a3
append
dirschn Sep 19, 2023
cd56bda
rspec
dirschn Sep 19, 2023
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
11 changes: 9 additions & 2 deletions spec/controllers/users_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@
let(:attributes) { attributes_for :user }

let :submit do
post :create, params: { user: attributes, roster_id: roster.id }
post :create, params: {
user: attributes.merge({ roster_ids: [roster.id] }) do |k, o, n|
next unless k == :roster_ids

o.concat(n)
end,
roster_id: roster.id
werebus marked this conversation as resolved.
Show resolved Hide resolved
}
dirschn marked this conversation as resolved.
Show resolved Hide resolved
end

context 'when the current user is an admin in the roster' do
Expand Down Expand Up @@ -318,7 +325,7 @@

let(:new_roster) { create :roster }
let(:user) { roster_user(new_roster) }
let(:changes) { { phone: '+14135451451', rosters: [roster.id, new_roster.id] } }
let(:changes) { { phone: '+14135451451', roster_ids: [roster.id, new_roster.id] } }

context 'when the current user is an admin in the roster' do
before { when_current_user_is roster_admin(roster) }
Expand Down
2 changes: 1 addition & 1 deletion spec/factories/users.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
sequence(:spire) { |n| format('%[email protected]', n) }
sequence(:email) { |n| "user#{n}@umass.edu" }
sequence(:phone) { |n| format('+1413545%04d', n) }
rosters { [create(:roster)] }
roster_ids { [create(:roster).id] }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

using roster_ids now, not rosters

end
end
Loading