From affec3ced2d85697d9a21d83e811285b030705f2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 13 Jul 2022 12:09:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/serializers/diffs_entity_spec.rb | 1 + spec/serializers/diffs_metadata_entity_spec.rb | 1 + spec/serializers/paginated_diff_entity_spec.rb | 1 + 3 files changed, 3 insertions(+) (limited to 'spec/serializers') diff --git a/spec/serializers/diffs_entity_spec.rb b/spec/serializers/diffs_entity_spec.rb index aef7d3732f8..72777bde30c 100644 --- a/spec/serializers/diffs_entity_spec.rb +++ b/spec/serializers/diffs_entity_spec.rb @@ -100,6 +100,7 @@ RSpec.describe DiffsEntity do let(:options) { super().merge(merge_ref_head_diff: merge_ref_head_diff) } before do + allow(merge_request).to receive(:cannot_be_merged?).and_return(true) allow(MergeRequests::Conflicts::ListService).to receive(:new).and_return(conflicts) end diff --git a/spec/serializers/diffs_metadata_entity_spec.rb b/spec/serializers/diffs_metadata_entity_spec.rb index 3311b434ce5..0e3d808aaac 100644 --- a/spec/serializers/diffs_metadata_entity_spec.rb +++ b/spec/serializers/diffs_metadata_entity_spec.rb @@ -65,6 +65,7 @@ RSpec.describe DiffsMetadataEntity do let(:conflicts) { double(conflicts: double(files: [conflict_file]), can_be_resolved_in_ui?: false) } before do + allow(merge_request).to receive(:cannot_be_merged?).and_return(true) allow(MergeRequests::Conflicts::ListService).to receive(:new).and_return(conflicts) end diff --git a/spec/serializers/paginated_diff_entity_spec.rb b/spec/serializers/paginated_diff_entity_spec.rb index db8bf92cbf5..9d4456c11d6 100644 --- a/spec/serializers/paginated_diff_entity_spec.rb +++ b/spec/serializers/paginated_diff_entity_spec.rb @@ -43,6 +43,7 @@ RSpec.describe PaginatedDiffEntity do let(:options) { super().merge(merge_ref_head_diff: merge_ref_head_diff) } before do + allow(merge_request).to receive(:cannot_be_merged?).and_return(true) allow(MergeRequests::Conflicts::ListService).to receive(:new).and_return(conflicts) end -- cgit v1.2.3