@@ -8,7 +8,7 @@ require 'shoulda' load 'tasks/shoulda.rake' # Test::Unit::UI::VERBOSE -test_files_pattern = 'test/{unit,functional,other}/**/*_test.rb' +test_files_pattern = 'test/{unit,functional,other,matchers}/**/*_test.rb' Rake::TestTask.new do |t| t.libs << 'lib' t.pattern = test_files_pattern Rakefile @@ -78,7 +78,7 @@ module Shoulda # :nodoc: if @scopes.blank? true else - @scopes.each do |scope| + @scopes.all? do |scope| previous_value = @existing.send(scope) # Assume the scope is a foreign key if the field is nil @@ -88,7 +88,14 @@ module Shoulda # :nodoc: @subject.send("#{scope}=", next_value) - allows_value_of(existing_value, @expected_message) + if allows_value_of(existing_value, @expected_message) + @negative_failure_message << + " (with different value of #{scope})" + true + else + @failure_message << " (with different value of #{scope})" + false + end end end end lib/shoulda/active_record/matchers/require_unique_attribute_matcher.rb ef6ffc98deb82fd8a5212a57e7d581428a492241 Joe Ferris joe.r.ferris@gmail.com http://github.com/thoughtbot/shoulda/commit/3c6fb6e0b306f5b06058fac35c1c60b4f4754102 3c6fb6e0b306f5b06058fac35c1c60b4f4754102 2009-01-27T15:01:30-08:00 2009-01-22T15:22:11-08:00 Fixed failing matcher tests 0126fe7a609be757f1b17a118961547940514c36 Joe Ferris joe.r.ferris@gmail.com