@@ -73,7 +73,7 @@ Contributions are always welcome. Checkout the latest code on GitHub: Please include tests with your patches. There are a few gems required to run the tests: $ gem install multi_rails - $ gem install thoughtbot-shoulda jeremymcanally-matchy --source http://gems.github.com + $ gem install thoughtbot-shoulda jnunemaker-matchy --source http://gems.github.com Make sure the tests pass against all versions of Rails since 2.1: README @@ -10,6 +10,8 @@ require 'action_controller/test_process' require 'action_view' require 'test/unit' require 'shoulda' + +gem 'jnunemaker-matchy' require 'matchy' require File.dirname(__FILE__) + '/../init.rb' @@ -26,9 +28,9 @@ class Company < ActiveRecord::Base end class Test::Unit::TestCase - def change(receiver=nil, message=nil, &block) - ChangeExpectation.new(self, receiver, message, &block) - end + # def change(receiver=nil, message=nil, &block) + # ChangeExpectation.new(self, receiver, message, &block) + # end def create_user(attrs = {}) User.create({:name => 'Brandon', :username => 'brandon', :password => 'password'}.merge(attrs)) @@ -43,92 +45,3 @@ class Test::Unit::TestCase end end end - -# Change matcher copied from RSpec -class ChangeExpectation < Matchy::Expectations::Base - def initialize(test_case, receiver=nil, message=nil, &block) - @test_case = test_case - @message = message || "result" - @value_proc = block || lambda {receiver.__send__(message)} - @to = @from = @minimum = @maximum = @amount = nil - end - - def matches?(event_proc) - raise_block_syntax_error if block_given? - - @before = evaluate_value_proc - event_proc.call - @after = evaluate_value_proc - - return (@to = false) if @from unless @from == @before - return false if @to unless @to == @after - return (@before + @amount == @after) if @amount - return ((@after - @before) >= @minimum) if @minimum - return ((@after - @before) <= @maximum) if @maximum - return @before != @after - end - - def raise_block_syntax_error - raise(<<-MESSAGE -block passed to should or should_not change must use {} instead of do/end -MESSAGE - ) - end - - def evaluate_value_proc - @value_proc.call - end - - def failure_message - if @to - "#{@message} should have been changed to #{@to.inspect}, but is now #{@after.inspect}" - elsif @from - "#{@message} should have initially been #{@from.inspect}, but was #{@before.inspect}" - elsif @amount - "#{@message} should have been changed by #{@amount.inspect}, but was changed by #{actual_delta.inspect}" - elsif @minimum - "#{@message} should have been changed by at least #{@minimum.inspect}, but was changed by #{actual_delta.inspect}" - elsif @maximum - "#{@message} should have been changed by at most #{@maximum.inspect}, but was changed by #{actual_delta.inspect}" - else - "#{@message} should have changed, but is still #{@before.inspect}" - end - end - - def actual_delta - @after - @before - end - - def negative_failure_message - "#{@message} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}" - end - - def by(amount) - @amount = amount - self - end - - def by_at_least(minimum) - @minimum = minimum - self - end - - def by_at_most(maximum) - @maximum = maximum - self - end - - def to(to) - @to = to - self - end - - def from (from) - @from = from - self - end - - def description - "change ##{@message}" - end -end test/test_helper.rb b624ba06b7d39328be58a4ee80fb94a600e8b010 Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/acts_as_audited/commit/e4adb6bc7e40249b9e2b91cf609031e6fd1f36fb e4adb6bc7e40249b9e2b91cf609031e6fd1f36fb 2009-06-03T06:20:44-07:00 2009-06-03T06:20:44-07:00 Require jnunemaker's fork of matchy 400021d877ff079f6b889bb155ab0e11aacae43c Brandon Keepers brandon@collectiveidea.com