diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 09:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 09:09:01 +0300 |
commit | fa7ac2663b53f61551b9db51f16d55fa4e5b74c3 (patch) | |
tree | 0cbf33baee16b10803c1d23ec9e0c06e238e43f5 /spec/services/concerns | |
parent | 4870899d6cec693b58acbef91636e1310160fa28 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/concerns')
-rw-r--r-- | spec/services/concerns/merge_requests/assigns_merge_params_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/concerns/merge_requests/assigns_merge_params_spec.rb b/spec/services/concerns/merge_requests/assigns_merge_params_spec.rb index 9cf7f354191..5b1e8fca31b 100644 --- a/spec/services/concerns/merge_requests/assigns_merge_params_spec.rb +++ b/spec/services/concerns/merge_requests/assigns_merge_params_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MergeRequests::AssignsMergeParams do +RSpec.describe MergeRequests::AssignsMergeParams do it 'raises an error when used from an instance that does not respond to #current_user' do define_class = -> { Class.new { include MergeRequests::AssignsMergeParams }.new } |