diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-01-21 22:55:35 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-01-21 22:55:35 +0000 |
commit | baeaa97ef49558a303b0bd7b6cc9ce4ccfc13d1d (patch) | |
tree | c009601bc21af2f88f0d246427d5fbe3db5e5bb2 /spec/requests/api/internal_spec.rb | |
parent | f6f52b43b59641f5e0c6f7aa47b1354ca3aeee32 (diff) | |
download | gitlab-ce-baeaa97ef49558a303b0bd7b6cc9ce4ccfc13d1d.tar.gz |
Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"
This reverts merge request !8573
Diffstat (limited to 'spec/requests/api/internal_spec.rb')
-rw-r--r-- | spec/requests/api/internal_spec.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 91202244227..a3798c8cd6c 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -337,7 +337,8 @@ describe API::Internal, api: true do context 'ssh access has been disabled' do before do - stub_application_setting(enabled_git_access_protocol: 'http') + settings = ::ApplicationSetting.create_from_defaults + settings.update_attribute(:enabled_git_access_protocol, 'http') end it 'rejects the SSH push' do @@ -359,7 +360,8 @@ describe API::Internal, api: true do context 'http access has been disabled' do before do - stub_application_setting(enabled_git_access_protocol: 'ssh') + settings = ::ApplicationSetting.create_from_defaults + settings.update_attribute(:enabled_git_access_protocol, 'ssh') end it 'rejects the HTTP push' do @@ -381,7 +383,8 @@ describe API::Internal, api: true do context 'web actions are always allowed' do it 'allows WEB push' do - stub_application_setting(enabled_git_access_protocol: 'ssh') + settings = ::ApplicationSetting.create_from_defaults + settings.update_attribute(:enabled_git_access_protocol, 'ssh') project.team << [user, :developer] push(key, project, 'web') |