diff options
author | Sean McGivern <sean@gitlab.com> | 2018-11-22 12:50:34 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2018-11-22 12:50:34 +0300 |
commit | 2bc4a17decf943123f5adff0ea624eef325d776d (patch) | |
tree | 2144d1399344696328ba6607803e9745749f8ebb /spec/lib/gitlab/diff | |
parent | f0630090aaea98daef3582bc95efe3a43736a10f (diff) | |
parent | 5c131dac5e2e7fc85bcbef6c1c8e95912b7759d4 (diff) |
Merge branch 'revert-fd6e3781' into 'master'
Revert "Merge branch 'revert-e2aa2177' into 'master'"
Closes #54267
See merge request gitlab-org/gitlab-ce!23237
Diffstat (limited to 'spec/lib/gitlab/diff')
-rw-r--r-- | spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb b/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb index 4578da70bfc..fbcf515281e 100644 --- a/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb +++ b/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb @@ -37,17 +37,7 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do let(:stub_path) { '.gitignore' } end - shared_examples 'initializes a DiffCollection' do - it 'returns a valid instance of a DiffCollection' do - expect(diff_files).to be_a(Gitlab::Git::DiffCollection) - end - end - - context 'with Gitaly disabled', :disable_gitaly do - it_behaves_like 'initializes a DiffCollection' - end - - context 'with Gitaly enabled' do - it_behaves_like 'initializes a DiffCollection' + it 'returns a valid instance of a DiffCollection' do + expect(diff_files).to be_a(Gitlab::Git::DiffCollection) end end |