summaryrefslogtreecommitdiff
path: root/spec/controllers/admin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-16 06:09:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-16 06:09:50 +0000
commit819b5458e55523a1a03fdf16d021d2cc3479d402 (patch)
treed2ed6ae4ceb49de29127283f7026ee26161a6829 /spec/controllers/admin
parent83f397aaf4b871ea9c40758050d4796744d938e5 (diff)
downloadgitlab-ce-819b5458e55523a1a03fdf16d021d2cc3479d402.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/admin')
-rw-r--r--spec/controllers/admin/users_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 015c36c9335..2d5125c9d5e 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -146,7 +146,7 @@ RSpec.describe Admin::UsersController do
it 'sends the user a rejection email' do
expect_next_instance_of(NotificationService) do |notification|
- allow(notification).to receive(:user_admin_rejection).with(user.name, user.notification_email_or_default)
+ allow(notification).to receive(:user_admin_rejection).with(user.name, user.notification_email)
end
subject