Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions lib/action_account.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ def log_text
user_reinstated: 'User has been reinstated and the user has been emailed',
user_already_suspended: 'User has already been suspended',
user_is_not_suspended: 'User is not suspended',
user_already_reinstated: 'User has already been reinstated',
}
end
end
Expand Down Expand Up @@ -108,6 +109,8 @@ def perform_user_action(args:, config:, action:)
if user.suspended?
user.reinstate!
log_texts << log_text[:user_reinstated]
elsif user.reinstated?
log_texts << (log_text[:user_already_reinstated] + " (at #{user.reinstated_at})")
else
log_texts << log_text[:user_is_not_suspended]
end
Expand Down
15 changes: 15 additions & 0 deletions spec/lib/action_account_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,21 @@
expect(result.subtask).to eq('reinstate-user')
expect(result.uuids).to match_array([user.uuid, suspended_user.uuid])
end

context 'with a reinstated user' do
let(:user) { create(:user, :reinstated) }
let(:args) { [user.uuid] }

it 'gives a helpful error if the user has been reinstated' do
message = "User has already been reinstated (at #{user.reinstated_at})"
expect(result.table).to match_array(
[
['uuid', 'status', 'reason'],
[user.uuid, message, 'INV1234'],
],
)
end
end
end
end

Expand Down