diff options
| -rw-r--r-- | app/controllers/admin_censor_rule_controller.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/admin_censor_rule_controller_spec.rb | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index cca678867..c5d2b16c1 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -8,9 +8,11 @@ class AdminCensorRuleController < AdminController def new if params[:info_request_id] @info_request = InfoRequest.find(params[:info_request_id]) + @censor_rule = @info_request.censor_rules.build end if params[:user_id] @censor_user = User.find(params[:user_id]) + @censor_rule = @censor_user.censor_rules.build end @censor_rule ||= CensorRule.new diff --git a/spec/controllers/admin_censor_rule_controller_spec.rb b/spec/controllers/admin_censor_rule_controller_spec.rb index 1f6e721ea..b0f66c86f 100644 --- a/spec/controllers/admin_censor_rule_controller_spec.rb +++ b/spec/controllers/admin_censor_rule_controller_spec.rb @@ -28,6 +28,12 @@ describe AdminCensorRuleController do expect(assigns[:info_request]).to eq(info_request) end + it 'associates the info request with the new censor rule' do + info_request = FactoryGirl.create(:info_request) + get :new, :info_request_id => info_request.id + expect(assigns[:censor_rule].info_request).to eq(info_request) + end + it 'does not find an info request if no info_request_id param is supplied' do get :new expect(assigns[:info_request]).to be_nil @@ -43,6 +49,12 @@ describe AdminCensorRuleController do expect(assigns[:censor_user]).to eq(user) end + it 'associates the user with the new censor rule' do + user = FactoryGirl.create(:user) + get :new, :user_id => user.id + expect(assigns[:censor_rule].user).to eq(user) + end + it 'does not find a user if no user_id param is supplied' do get :new expect(assigns[:censor_user]).to be_nil |