diff options
author | Patricio Cano <suprnova32@gmail.com> | 2016-06-29 22:30:27 +0300 |
---|---|---|
committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-06 00:54:22 +0300 |
commit | fbaabb3911c6fec25edc25bfffad94ae2a7c0e28 (patch) | |
tree | f8ec3e24dbff92c06e651e47a48c4ed47c277897 /spec | |
parent | 120a1189bfa8b2afa7a8274c5617808f88f36101 (diff) |
Rename `enabled_git_access_protocols` to singular.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/admin/admin_disables_git_access_protocol_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/git_access_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/internal_spec.rb | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/features/admin/admin_disables_git_access_protocol_spec.rb b/spec/features/admin/admin_disables_git_access_protocol_spec.rb index 550dcb62453..5b1c0460274 100644 --- a/spec/features/admin/admin_disables_git_access_protocol_spec.rb +++ b/spec/features/admin/admin_disables_git_access_protocol_spec.rb @@ -54,13 +54,13 @@ feature 'Admin disables Git access protocol', feature: true do def disable_http_protocol visit admin_application_settings_path - find('#application_setting_enabled_git_access_protocols').find(:xpath, 'option[2]').select_option + find('#application_setting_enabled_git_access_protocol').find(:xpath, 'option[2]').select_option click_on 'Save' end def disable_ssh_protocol visit admin_application_settings_path - find('#application_setting_enabled_git_access_protocols').find(:xpath, 'option[3]').select_option + find('#application_setting_enabled_git_access_protocol').find(:xpath, 'option[3]').select_option click_on 'Save' end end diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb index ddccd2d9eb3..c79ba11f782 100644 --- a/spec/lib/gitlab/git_access_spec.rb +++ b/spec/lib/gitlab/git_access_spec.rb @@ -70,7 +70,7 @@ describe Gitlab::GitAccess, lib: true do describe '#check with single protocols allowed' do def disable_protocol(protocol) settings = ::ApplicationSetting.create_from_defaults - settings.update_attribute(:enabled_git_access_protocols, protocol) + settings.update_attribute(:enabled_git_access_protocol, protocol) end context 'ssh disabled' do diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 1f49cdad044..e567d36afa8 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -211,7 +211,7 @@ describe API::API, api: true do context 'ssh access has been disabled' do before do settings = ::ApplicationSetting.create_from_defaults - settings.update_attribute(:enabled_git_access_protocols, 'http') + settings.update_attribute(:enabled_git_access_protocol, 'http') end it 'rejects the SSH push' do @@ -234,7 +234,7 @@ describe API::API, api: true do context 'http access has been disabled' do before do settings = ::ApplicationSetting.create_from_defaults - settings.update_attribute(:enabled_git_access_protocols, 'ssh') + settings.update_attribute(:enabled_git_access_protocol, 'ssh') end it 'rejects the HTTP push' do @@ -257,7 +257,7 @@ describe API::API, 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_protocols, 'ssh') + settings.update_attribute(:enabled_git_access_protocol, 'ssh') project.team << [user, :developer] push(key, project, 'web') |