diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-07 23:49:16 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:51 +0100 |
| commit | 224c2addde2cd37daba354cd47a655891387dbe8 (patch) | |
| tree | c5cb4542bbf0157c431761b7bcb371fb4b12b30f /spec | |
| parent | dcec4c531f3268a7ae681bb7cc5d5b7217b4b33a (diff) | |
| download | gitlab-ce-224c2addde2cd37daba354cd47a655891387dbe8.tar.gz | |
No need to look up the notable separately in the ResolveService
The merge request will now always be there when the discussion was
resolved by creating a new issue.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/services/discussions/resolve_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/discussions/resolve_service_spec.rb b/spec/services/discussions/resolve_service_spec.rb index 5eb5b2b04d7..12c3cdf28c6 100644 --- a/spec/services/discussions/resolve_service_spec.rb +++ b/spec/services/discussions/resolve_service_spec.rb @@ -6,7 +6,7 @@ describe Discussions::ResolveService do let(:project) { merge_request.project } let(:merge_request) { discussion.noteable } let(:user) { create(:user) } - let(:service) { described_class.new(discussion.noteable.project, user) } + let(:service) { described_class.new(discussion.noteable.project, user, merge_request: merge_request) } before do project.team << [user, :master] |