Merge branch 'release/0.11' into wdtk

1 files changed, 14 insertions, 8 deletions

diff --git a/spec/models/censor_rule_spec.rb b/spec/models/censor_rule_spec.rb
index c11b05a03..3782cc630 100644
--- a/spec/models/censor_rule_spec.rb
+++ b/spec/models/censor_rule_spec.rb
@@ -73,10 +73,10 @@ end
 
 describe 'when validating rules' do
 
-    describe 'should be invalid without text' do
+    it '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"
+        censor_rule.errors[:text].should == ["can't be blank"]
     end
 
     describe 'when validating a regexp rule' do
@@ -96,7 +96,7 @@ describe 'when validating rules' do
             it 'should add an error message to the text field with the regexp error message' do
                 Regexp.stub!(:new).and_raise(RegexpError.new("very bad regexp"))
                 @censor_rule.valid?.should == false
-                @censor_rule.errors.on(:text).should == "very bad regexp"
+                @censor_rule.errors[:text].should == ["very bad regexp"]
             end
 
         end
@@ -106,7 +106,7 @@ describe 'when validating rules' do
             it 'should not add any error message to the text field' do
                 Regexp.stub!(:new)
                 @censor_rule.valid?
-                @censor_rule.errors.on(:text).should == nil
+                @censor_rule.errors[:text].should == []
             end
 
         end
@@ -134,15 +134,21 @@ describe 'when validating rules' do
 
         it 'should not allow a global text censor rule (without user_id, request_id or public_body_id)' do
             @censor_rule.valid?.should == false
-            @expected_error = 'Censor must apply to an info request a user or a body;  is invalid'
-            @censor_rule.errors.full_messages.should == [@expected_error]
+
+            expected_error = ["Rule must apply to an info request, a user or a body"]
+            @censor_rule.errors[:user].should == expected_error
+            @censor_rule.errors[:info_request].should == expected_error
+            @censor_rule.errors[:public_body].should == expected_error
         end
 
         it 'should not allow a global regex censor rule (without user_id, request_id or public_body_id)' do
             @censor_rule.regexp = true
             @censor_rule.valid?.should == false
-            @expected_error = 'Censor must apply to an info request a user or a body;  is invalid'
-            @censor_rule.errors.full_messages.should == [@expected_error]
+
+            expected_error = ["Rule must apply to an info request, a user or a body"]
+            @censor_rule.errors[:user].should == expected_error
+            @censor_rule.errors[:info_request].should == expected_error
+            @censor_rule.errors[:public_body].should == expected_error
         end
 
     end