fix specs
This commit is contained in:
parent
ef6a4240e5
commit
36bc2e9016
2 changed files with 8 additions and 19 deletions
|
@ -158,13 +158,14 @@ class Admin::UsersController < Admin::ApplicationController
|
|||
user.update_secondary_emails!
|
||||
end
|
||||
|
||||
if result[:status] == :success
|
||||
format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
|
||||
format.json { head :ok }
|
||||
else
|
||||
# restore username to keep form action url.
|
||||
format.html { redirect_back_or_admin_user(notice: result[:message]) }
|
||||
format.json { render json: result[:message], status: result[:status] }
|
||||
respond_to do |format|
|
||||
if result[:status] == :success
|
||||
format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
|
||||
format.json { head :ok }
|
||||
else
|
||||
format.html { redirect_back_or_admin_user(alert: result[:message]) }
|
||||
format.json { render json: result[:message], status: result[:status] }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1899,16 +1899,4 @@ describe User, models: true do
|
|||
user.invalidate_merge_request_cache_counts
|
||||
end
|
||||
end
|
||||
|
||||
describe 'audit changes' do
|
||||
let!(:user) { create(:user) }
|
||||
|
||||
it 'audits an email change' do
|
||||
expect { user.update!(email: 'test@example.com') }.to change { AuditEvent.count }.by(1)
|
||||
end
|
||||
|
||||
it 'audits a password change' do
|
||||
expect { user.update!(password: 'asdfasdf', password_confirmation: 'asdfasdf') }.to change { AuditEvent.count }.by(1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue