2 files changed, 38 insertions, 14 deletions
diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb
index 214b582f56..6fb8757153 100755
--- a/activerecord/test/associations_test.rb
+++ b/activerecord/test/associations_test.rb
@@ -774,6 +774,32 @@ class BelongsToAssociationsTest < Test::Unit::TestCase
 end
 
 
+class ProjectWithAfterCreateHook < ActiveRecord::Base
+  set_table_name 'projects'
+  has_and_belongs_to_many :developers,
+    :class_name => "DeveloperForProjectWithAfterCreateHook",
+    :join_table => "developers_projects",
+    :foreign_key => "project_id",
+    :association_foreign_key => "developer_id"
+
+  after_create :add_david
+
+  def add_david
+    david = DeveloperForProjectWithAfterCreateHook.find_by_name('David')
+    david.projects << self
+  end
+end
+
+class DeveloperForProjectWithAfterCreateHook < ActiveRecord::Base
+  set_table_name 'developers'
+  has_and_belongs_to_many :projects,
+    :class_name => "ProjectWithAfterCreateHook",
+    :join_table => "developers_projects",
+    :association_foreign_key => "project_id",
+    :foreign_key => "developer_id"
+end
+
+
 class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
   fixtures :accounts, :companies, :developers, :projects, :developers_projects
   
@@ -1018,6 +1044,18 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
     assert_equal developers(:david), active_record.developers.find(developers(:david).id), "Ruby find"
   end
 
+  def test_new_with_values_in_collection
+    jamis = DeveloperForProjectWithAfterCreateHook.find_by_name('Jamis')
+    david = DeveloperForProjectWithAfterCreateHook.find_by_name('David')
+    project = ProjectWithAfterCreateHook.new(:name => "Cooking with Bertie")
+    project.developers << jamis
+    project.save!
+    project.reload
+
+    assert project.developers.include?(jamis)
+    assert project.developers.include?(david)
+  end
+
   def xtest_find_in_association_with_options
     developers = projects(:active_record).developers.find(:all)
     assert_equal 2, developers.size
diff --git a/activerecord/test/callbacks_test.rb b/activerecord/test/callbacks_test.rb
index 2e3bf54a86..d915b3a875 100644
--- a/activerecord/test/callbacks_test.rb
+++ b/activerecord/test/callbacks_test.rb
@@ -304,18 +304,4 @@ class CallbacksTest < Test::Unit::TestCase
       [ :before_validation, :returning_false  ]
     ], david.history
   end
-
-  def test_save_not_called_recursively
-    david = RecursiveCallbackDeveloper.find(1)
-    david.save
-    assert_equal 1, david.on_before_save_called
-    assert_equal 1, david.on_after_save_called
-  end
-
-  def test_save_bang_not_called_recursively
-    david = RecursiveCallbackDeveloper.find(1)
-    david.save!
-    assert_equal 1, david.on_before_save_called
-    assert_equal 1, david.on_after_save_called
-  end
 end