Skip to content

Commit

Permalink
Fix build. It seems that the Mocha's behavior were changed.
Browse files Browse the repository at this point in the history
  • Loading branch information
kennyj authored and sikachu committed Apr 24, 2012
1 parent db6787a commit d95f3d3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 6 additions & 2 deletions activerecord/test/cases/autosave_association_test.rb
Expand Up @@ -626,7 +626,9 @@ def test_should_skip_validation_on_a_child_association_if_marked_for_destruction
def test_a_child_marked_for_destruction_should_not_be_destroyed_twice def test_a_child_marked_for_destruction_should_not_be_destroyed_twice
@pirate.ship.mark_for_destruction @pirate.ship.mark_for_destruction
assert @pirate.save assert @pirate.save
@pirate.ship.expects(:destroy).never class << @pirate.ship
def destroy; raise "Should not be called" end
end
assert @pirate.save assert @pirate.save
end end


Expand Down Expand Up @@ -671,7 +673,9 @@ def test_should_skip_validation_on_a_parent_association_if_marked_for_destructio
def test_a_parent_marked_for_destruction_should_not_be_destroyed_twice def test_a_parent_marked_for_destruction_should_not_be_destroyed_twice
@ship.pirate.mark_for_destruction @ship.pirate.mark_for_destruction
assert @ship.save assert @ship.save
@ship.pirate.expects(:destroy).never class << @ship.pirate
def destroy; raise "Should not be called" end
end
assert @ship.save assert @ship.save
end end


Expand Down
4 changes: 3 additions & 1 deletion activerecord/test/cases/explain_test.rb
Expand Up @@ -28,7 +28,9 @@ def test_logging_query_plan_without_logger
original = base.logger original = base.logger
base.logger = nil base.logger = nil


base.logger.expects(:warn).never class << base.logger
def warn; raise "Should not be called" end
end


with_threshold(0) do with_threshold(0) do
car = Car.where(:name => 'honda').first car = Car.where(:name => 'honda').first
Expand Down

0 comments on commit d95f3d3

Please sign in to comment.