diff options
| -rw-r--r-- | app/models/censor_rule.rb | 1 | ||||
| -rw-r--r-- | spec/models/censor_rule_spec.rb | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb index 3a15bf532..da3f49760 100644 --- a/app/models/censor_rule.rb +++ b/app/models/censor_rule.rb @@ -33,6 +33,7 @@ class CensorRule < ActiveRecord::Base attr_accessor :allow_global validate :require_user_request_or_public_body, :unless => proc{ |rule| rule.allow_global == true } validate :require_valid_regexp, :if => proc{ |rule| rule.regexp? == true } + validates_presence_of :text named_scope :global, {:conditions => {:info_request_id => nil, :user_id => nil, diff --git a/spec/models/censor_rule_spec.rb b/spec/models/censor_rule_spec.rb index 471a73fa2..1965b0894 100644 --- a/spec/models/censor_rule_spec.rb +++ b/spec/models/censor_rule_spec.rb @@ -73,6 +73,12 @@ end describe 'when validating rules' do + describe 'should be invalid without text' do + censor_rule = CensorRule.new + censor_rule.valid?.should == false + censor_rule.errors.on(:text).should == "can't be blank" + end + describe 'when validating a regexp rule' do before do |