diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-03-07 10:52:29 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-03-07 14:52:58 +0100 |
commit | a76ce8d956d5501c019bf4e0af03bc386e07f937 (patch) | |
tree | 5479f2fcda91538ebe00a50cd2c0773d313790a9 | |
parent | 0136bbbb89eb975ed5ae053d903ed5d3eb7d811f (diff) | |
download | gitlab-ce-a76ce8d956d5501c019bf4e0af03bc386e07f937.tar.gz |
Fix tests not completely disabling Gitaly
-rw-r--r-- | spec/models/repository_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 38653e18306..579069ffa14 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1004,7 +1004,7 @@ describe Repository do end end - context 'with Gitaly disabled', :skip_gitaly_mock do + context 'with Gitaly disabled', :disable_gitaly do context 'when pre hooks were successful' do it 'runs without errors' do hook = double(trigger: [true, nil]) @@ -1896,7 +1896,7 @@ describe Repository do it_behaves_like 'adding tag' end - context 'when Gitaly operation_user_add_tag feature is disabled', :skip_gitaly_mock do + context 'when Gitaly operation_user_add_tag feature is disabled', :disable_gitaly do it_behaves_like 'adding tag' it 'passes commit SHA to pre-receive and update hooks and tag SHA to post-receive hook' do @@ -1955,7 +1955,7 @@ describe Repository do end end - context 'with gitaly disabled', :skip_gitaly_mock do + context 'with gitaly disabled', :disable_gitaly do it_behaves_like "user deleting a branch" let(:old_rev) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' } # git rev-parse feature |