optimize AllowValueMatcher slightly

thoughtbot · Mar 23, 2012 · 026927b · 026927b
1 parent 8724cd2
commit 026927b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/shoulda/matchers/active_model/allow_value_matcher.rb b/lib/shoulda/matchers/active_model/allow_value_matcher.rb
@@ -58,10 +58,14 @@ def description
         private
 
         def errors_match?
-          @instance.valid?
-          @errors = errors_for_attribute(@instance, @attribute)
-          @errors = [@errors] unless @errors.is_a?(Array)
-          @expected_message ? (errors_match_regexp? || errors_match_string?) : (@errors.compact.any?)
+          if ! @instance.valid?
+            @errors = errors_for_attribute(@instance, @attribute)
+            @errors = [@errors] unless @errors.is_a?(Array)
+            @expected_message ? (errors_match_regexp? || errors_match_string?) : (@errors.compact.any?)
+          else
+            @errors = []
+            false
+          end
         end
 
         def errors_for_attribute(instance, attribute)