diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-16 15:02:33 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-19 14:40:53 +0100 |
commit | 4ca5eadddbc0518e8b038712479ce7c7f74a6548 (patch) | |
tree | 3f3ca298b62f7c355a200c09c4377650c42c550b /spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb | |
parent | 35239a6aec84c47895ad6664a9b1075be12bd105 (diff) | |
download | gitlab-ce-4ca5eadddbc0518e8b038712479ce7c7f74a6548.tar.gz |
Remove duplicate tests for Gitaly
The disabling of Gitaly was basically stubbing `Feature.enabled?` call,
which was never triggered.
Diffstat (limited to 'spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb')
-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 |