diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-01-22 00:11:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-23 16:35:24 +0100 |
| commit | 632c2939bb1e9d10b5e9be05bc4692d92f9f5f32 (patch) | |
| tree | b56bf9a5fb3665fc38cdf5fa0b1e5739983a3bdb /spec/requests/api/internal_spec.rb | |
| parent | 6c65f7a7ce52fadcf53ea2395103de32b0107874 (diff) | |
| download | gitlab-ce-632c2939bb1e9d10b5e9be05bc4692d92f9f5f32.tar.gz | |
Revert "Merge branch 'revert-9cac0317' into 'master'
"
This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing
changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
Diffstat (limited to 'spec/requests/api/internal_spec.rb')
| -rw-r--r-- | spec/requests/api/internal_spec.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index a3798c8cd6c..91202244227 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -337,8 +337,7 @@ describe API::Internal, api: true do context 'ssh access has been disabled' do before do - settings = ::ApplicationSetting.create_from_defaults - settings.update_attribute(:enabled_git_access_protocol, 'http') + stub_application_setting(enabled_git_access_protocol: 'http') end it 'rejects the SSH push' do @@ -360,8 +359,7 @@ describe API::Internal, api: true do context 'http access has been disabled' do before do - settings = ::ApplicationSetting.create_from_defaults - settings.update_attribute(:enabled_git_access_protocol, 'ssh') + stub_application_setting(enabled_git_access_protocol: 'ssh') end it 'rejects the HTTP push' do @@ -383,8 +381,7 @@ describe API::Internal, api: true do context 'web actions are always allowed' do it 'allows WEB push' do - settings = ::ApplicationSetting.create_from_defaults - settings.update_attribute(:enabled_git_access_protocol, 'ssh') + stub_application_setting(enabled_git_access_protocol: 'ssh') project.team << [user, :developer] push(key, project, 'web') |