diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-07 10:13:07 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-07 10:13:07 +0000 |
commit | 96e2ff69acb31028865b4582758bf1dab51c4332 (patch) | |
tree | bf939c8879ff4ae442e911ecbcb67819fd8a822e /spec/services | |
parent | 4b086b74509500998bdc28a82871aa2c9003a194 (diff) | |
parent | 9994a5c12d6d68ffbfbd70fe210b53422dd78f4a (diff) | |
download | gitlab-ce-96e2ff69acb31028865b4582758bf1dab51c4332.tar.gz |
Merge branch '58297-remove-extraneous-gitaly-calls-from-md-rendering' into 'master'
Remove extraneous DiffNote#supports_suggestion? calls
See merge request gitlab-org/gitlab-ce!29027
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/preview_markdown_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/services/suggestions/create_service_spec.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/services/preview_markdown_service_spec.rb b/spec/services/preview_markdown_service_spec.rb index f7261cd7125..d25e9958831 100644 --- a/spec/services/preview_markdown_service_spec.rb +++ b/spec/services/preview_markdown_service_spec.rb @@ -56,7 +56,9 @@ describe PreviewMarkdownService do expect(Gitlab::Diff::SuggestionsParser) .to receive(:parse) - .with(text, position: position, project: merge_request.project) + .with(text, position: position, + project: merge_request.project, + supports_suggestion: true) .and_call_original result = service.execute diff --git a/spec/services/suggestions/create_service_spec.rb b/spec/services/suggestions/create_service_spec.rb index ccd44e615a8..d95f9e3349b 100644 --- a/spec/services/suggestions/create_service_spec.rb +++ b/spec/services/suggestions/create_service_spec.rb @@ -96,7 +96,7 @@ describe Suggestions::CreateService do it 'creates no suggestion when diff file is not found' do expect_next_instance_of(DiffNote) do |diff_note| - expect(diff_note).to receive(:latest_diff_file).twice { nil } + expect(diff_note).to receive(:latest_diff_file).once { nil } end expect { subject.execute }.not_to change(Suggestion, :count) |