Commit a76ce8d9 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Fix tests not completely disabling Gitaly

parent 0136bbbb
...@@ -1004,7 +1004,7 @@ describe Repository do ...@@ -1004,7 +1004,7 @@ describe Repository do
end end
end end
context 'with Gitaly disabled', :skip_gitaly_mock do context 'with Gitaly disabled', :disable_gitaly do
context 'when pre hooks were successful' do context 'when pre hooks were successful' do
it 'runs without errors' do it 'runs without errors' do
hook = double(trigger: [true, nil]) hook = double(trigger: [true, nil])
...@@ -1896,7 +1896,7 @@ describe Repository do ...@@ -1896,7 +1896,7 @@ describe Repository do
it_behaves_like 'adding tag' it_behaves_like 'adding tag'
end 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_behaves_like 'adding tag'
it 'passes commit SHA to pre-receive and update hooks and tag SHA to post-receive hook' do 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 ...@@ -1955,7 +1955,7 @@ describe Repository do
end end
end end
context 'with gitaly disabled', :skip_gitaly_mock do context 'with gitaly disabled', :disable_gitaly do
it_behaves_like "user deleting a branch" it_behaves_like "user deleting a branch"
let(:old_rev) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' } # git rev-parse feature let(:old_rev) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' } # git rev-parse feature
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment