Ensure that failure messages accurately reflect matchers and remove regex matching from expectations

Author: twitnithegirl

lib/rspec/rails/matchers/be_a_new.rb

@@ -32,10 +32,11 @@ def failure_message
               message << "expected #{actual.inspect} to be a new #{expected.inspect}"
             end
             unless attributes_match?(actual)
+              describe_unmatched_attributes = surface_descriptions_in(unmatched_attributes)
               if unmatched_attributes.size > 1
-                message << "attributes #{unmatched_attributes.inspect} were not set on #{actual.inspect}"
+                message << "attributes #{describe_unmatched_attributes.inspect} were not set on #{actual.inspect}"
               else
-                message << "attribute #{unmatched_attributes.inspect} was not set on #{actual.inspect}"
+                message << "attribute #{describe_unmatched_attributes.inspect} was not set on #{actual.inspect}"
               end
             end
           end.join(' and ')

spec/rspec/rails/matchers/be_a_new_spec.rb

@@ -76,11 +76,9 @@ def new_record?; true; end
             expect {
               expect(record).to be_a_new(record.class).with(
                 :foo => a_string_matching("bar"))
-            }.to raise_error{|e|
-              expect(e.message).to match(/attribute \{.*\} was not set on #{Regexp.escape record.inspect}/)
-              expect(e.message).to match(/@expected="bar"/)
-            }
+            }.to raise_error("attribute {\"foo\"=>(a string matching \"bar\")} was not set on #{record.inspect}")
           end
+
           context "matcher is wrong type" do
             it "fails" do
               expect {
@@ -110,10 +108,7 @@ def new_record?; true; end
                   :foo => a_string_matching("foo"),
                   :bar => a_string_matching("barn")
                 )
-              }.to raise_error {|e|
-                expect(e.message).to match(/attribute \{.*\} was not set on #{Regexp.escape record.inspect}/)
-                expect(e.message).to match(/@expected="barn"/)
-              }
+              }.to raise_error("attribute {\"bar\"=>(a string matching \"barn\")} was not set on #{record.inspect}")
             end
           end
         end