diff options
Diffstat (limited to 'spec/helpers/diff_helper_spec.rb')
| -rw-r--r-- | spec/helpers/diff_helper_spec.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb index 93efce6b58b..1d5752ef284 100644 --- a/spec/helpers/diff_helper_spec.rb +++ b/spec/helpers/diff_helper_spec.rb @@ -471,7 +471,6 @@ RSpec.describe DiffHelper do describe '#conflicts' do let(:merge_request) { instance_double(MergeRequest, cannot_be_merged?: true) } - let(:merge_ref_head_diff) { true } let(:can_be_resolved_in_ui?) { true } let(:allow_tree_conflicts) { false } let(:files) { [instance_double(Gitlab::Conflict::File, path: 'a')] } @@ -479,7 +478,6 @@ RSpec.describe DiffHelper do before do allow(helper).to receive(:merge_request).and_return(merge_request) - allow(helper).to receive(:options).and_return(merge_ref_head_diff: merge_ref_head_diff) allow_next_instance_of(MergeRequests::Conflicts::ListService, merge_request, allow_tree_conflicts: allow_tree_conflicts) do |svc| allow(svc).to receive(:can_be_resolved_in_ui?).and_return(can_be_resolved_in_ui?) @@ -496,14 +494,6 @@ RSpec.describe DiffHelper do expect(helper.conflicts).to eq('a' => files.first) end - context 'when merge_ref_head_diff option is false' do - let(:merge_ref_head_diff) { false } - - it 'returns nil' do - expect(helper.conflicts).to be_nil - end - end - context 'when merge request can be merged' do let(:merge_request) { instance_double(MergeRequest, cannot_be_merged?: false) } |