diff options
author | Robert Speicher <robert@gitlab.com> | 2017-01-24 19:14:14 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-01-24 19:14:14 +0000 |
commit | 94cc7cfad25f2c28bd4db8ca1fd39ece98c206b4 (patch) | |
tree | 04b1d6471e4c9f00419b7b8358b9f5b9e4a1a959 /spec/requests | |
parent | 8c9a06c37c4cf9763b3781d7e567a7b442c2152c (diff) | |
parent | 765d57d6505b7fbd2542ee957d85399ebc74ba70 (diff) | |
download | gitlab-ce-94cc7cfad25f2c28bd4db8ca1fd39ece98c206b4.tar.gz |
Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master'
Dont persist application settings in test env
See merge request !8715
Diffstat (limited to 'spec/requests')
-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') |