aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-11-19 10:18:43 +0000
committerGareth Rees <gareth@mysociety.org>2014-11-19 11:27:22 +0000
commitb18582f2fd854a6c42a25ec82202d7d4bc675008 (patch)
tree3e0b68d34cecca8f56382434e92a1de660348035
parent804f498ea35594828580babf5d21defef6b83c8d (diff)
Initialize a new CensorRule in #new
-rw-r--r--app/controllers/admin_censor_rule_controller.rb2
-rw-r--r--spec/controllers/admin_censor_rule_controller_spec.rb5
2 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb
index 6f79b5ba1..cca678867 100644
--- a/app/controllers/admin_censor_rule_controller.rb
+++ b/app/controllers/admin_censor_rule_controller.rb
@@ -12,6 +12,8 @@ class AdminCensorRuleController < AdminController
if params[:user_id]
@censor_user = User.find(params[:user_id])
end
+
+ @censor_rule ||= CensorRule.new
end
def create
diff --git a/spec/controllers/admin_censor_rule_controller_spec.rb b/spec/controllers/admin_censor_rule_controller_spec.rb
index 77c5f247c..1f6e721ea 100644
--- a/spec/controllers/admin_censor_rule_controller_spec.rb
+++ b/spec/controllers/admin_censor_rule_controller_spec.rb
@@ -10,6 +10,11 @@ describe AdminCensorRuleController do
expect(response).to be_success
end
+ it 'initializes a new censor rule' do
+ get :new
+ expect(assigns[:censor_rule]).to be_new_record
+ end
+
it 'renders the correct template' do
get :new
expect(response).to render_template('new')