aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-02-21 11:42:26 +0100
committerXavier Noria <fxn@hashref.com>2011-02-21 11:42:26 +0100
commitf826e058355606d1b0503b0395519728335324f4 (patch)
tree4ad040efe6e5691bb408e8ebc0b6df4a216a1730 /activerecord/test
parentcd12c369961a612f6b083fc0e3b877cf59b737f4 (diff)
parentb481574a33764e2db1caf01c233a9c9ac9723780 (diff)
downloadrails-f826e058355606d1b0503b0395519728335324f4.tar.gz
rails-f826e058355606d1b0503b0395519728335324f4.tar.bz2
rails-f826e058355606d1b0503b0395519728335324f4.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/autosave_association_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index ca59b3d6de..dbc5d71153 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -743,7 +743,7 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
2.times { |i| @pirate.birds.create!(:name => "birds_#{i}") }
before = @pirate.birds.map { |c| c.mark_for_destruction ; c }
- # Stub the destroy method of the the second child to raise an exception
+ # Stub the destroy method of the second child to raise an exception
class << before.last
def destroy(*args)
super