diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 17:49:02 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 17:49:02 +0300 |
commit | d282ea8976bf162a2e3c6344a5e33468cd62d00a (patch) | |
tree | d9f1f9abbb6b2e2a8b983aae66a248c6d85542fa /spec | |
parent | 07432373efc89746ec16ec4397f6d53c56352adf (diff) | |
parent | a76ce8d956d5501c019bf4e0af03bc386e07f937 (diff) |
Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'
Move Ruby endpoints to OPT_OUT
See merge request gitlab-org/gitlab-ce!17561
Diffstat (limited to 'spec')
-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 |