summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2017-03-23 15:25:42 +0100
committerToon Claes <toon@gitlab.com>2017-03-23 15:25:42 +0100
commit5058fc67acdde120e673c24555908394c72a343b (patch)
tree444db01345d9b40e3d3d8c02bd6b4da508a92393 /spec/controllers
parent7bfa5234855e8de996d5c7dff14ad6c19ea9d33b (diff)
downloadgitlab-ce-5058fc67acdde120e673c24555908394c72a343b.tar.gz
Remove redundant code to convert restricted_levels to integers
The ApplicationSetting#restricted_visibility_levels= now takes care of converting string formatted levels to integers.
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/admin/application_settings_controller_spec.rb14
1 files changed, 11 insertions, 3 deletions
diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb
index 19b35a346b7..5dd8f66343f 100644
--- a/spec/controllers/admin/application_settings_controller_spec.rb
+++ b/spec/controllers/admin/application_settings_controller_spec.rb
@@ -18,14 +18,22 @@ describe Admin::ApplicationSettingsController do
put :update, application_setting: { default_project_visibility: "20" }
expect(response).to redirect_to(admin_application_settings_path)
- expect(ApplicationSetting.current.default_project_visibility).to eq Gitlab::VisibilityLevel::PUBLIC
+ expect(ApplicationSetting.current.default_project_visibility).to eq(Gitlab::VisibilityLevel::PUBLIC)
end
- it 'falls back to default with default_project_visibility setting is omitted' do
+ it 'update the restricted levels for string values' do
+ put :update, application_setting: { restricted_visibility_levels: %w[10 20] }
+
+ expect(response).to redirect_to(admin_application_settings_path)
+ expect(ApplicationSetting.current.restricted_visibility_levels).to eq([10, 20])
+ end
+
+ it 'falls back to defaults when settings are omitted' do
put :update, application_setting: {}
expect(response).to redirect_to(admin_application_settings_path)
- expect(ApplicationSetting.current.default_project_visibility).to eq Gitlab::VisibilityLevel::PRIVATE
+ expect(ApplicationSetting.current.default_project_visibility).to eq(Gitlab::VisibilityLevel::PRIVATE)
+ expect(ApplicationSetting.current.restricted_visibility_levels).to be_empty
end
end
end