diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-02-27 12:23:36 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 10:27:51 +0300 |
| commit | f86928953d2d79f40f10813a6e244c1da0779d16 (patch) | |
| tree | 7396889bce42589175ec3c2fa314fdf621ef73b1 /spec/services/issues/create_service_spec.rb | |
| parent | 51253b2dd0bb073d271ddcbd172f7c204d4639db (diff) | |
Always require MR-iid for resolving discussions
And deduplicate the finding of MR's & discussions. Now the searching
is done in the service, istead of the controller & the API.
Diffstat (limited to 'spec/services/issues/create_service_spec.rb')
| -rw-r--r-- | spec/services/issues/create_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb index 4a5780f257a..77a984df2d5 100644 --- a/spec/services/issues/create_service_spec.rb +++ b/spec/services/issues/create_service_spec.rb @@ -150,7 +150,7 @@ describe Issues::CreateService, services: true do end describe 'for a single discussion' do - let(:opts) { { discussion_to_resolve: discussion } } + let(:opts) { { discussion_to_resolve: discussion.id, merge_request_for_resolving_discussions: merge_request.iid } } it 'resolves the discussion' do described_class.new(project, user, opts).execute @@ -186,7 +186,7 @@ describe Issues::CreateService, services: true do end describe 'for a merge request' do - let(:opts) { { merge_request_for_resolving_discussions: merge_request } } + let(:opts) { { merge_request_for_resolving_discussions: merge_request.iid } } it 'resolves the discussion' do described_class.new(project, user, opts).execute |