From 82b5f57e40640e52460d58ead3efb426c4ee0e4c Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 11 Jun 2013 14:31:38 -0400 Subject: [PATCH] Make it possible to set a site setting to empty string --- app/controllers/admin/site_settings_controller.rb | 2 +- spec/controllers/admin/site_settings_controller_spec.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb index c827ef8856f..2dcaab37cd2 100644 --- a/app/controllers/admin/site_settings_controller.rb +++ b/app/controllers/admin/site_settings_controller.rb @@ -7,7 +7,7 @@ class Admin::SiteSettingsController < Admin::AdminController end def update - params.require(:value) + raise ActionController::ParameterMissing.new(:value) unless params.has_key?(:value) SiteSetting.send("#{params[:id]}=", params[:value]) render nothing: true end diff --git a/spec/controllers/admin/site_settings_controller_spec.rb b/spec/controllers/admin/site_settings_controller_spec.rb index 67134742585..2f72b9b4e2f 100644 --- a/spec/controllers/admin/site_settings_controller_spec.rb +++ b/spec/controllers/admin/site_settings_controller_spec.rb @@ -34,10 +34,10 @@ describe Admin::SiteSettingsController do xhr :put, :update, id: 'test_setting', value: 'hello' end - # it 'allows value to be a blank string' do - # SiteSetting.expects(:'test_setting=').with('').once - # xhr :put, :update, id: 'test_setting', value: '' - # end + it 'allows value to be a blank string' do + SiteSetting.expects(:'test_setting=').with('').once + xhr :put, :update, id: 'test_setting', value: '' + end end end