diff options
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/associations/callbacks_test.rb | 34 | ||||
| -rwxr-xr-x | activerecord/test/associations_test.rb | 7 | ||||
| -rw-r--r-- | activerecord/test/fixtures/author.rb | 10 | ||||
| -rw-r--r-- | activerecord/test/fixtures/project.rb | 4 |
4 files changed, 48 insertions, 7 deletions
diff --git a/activerecord/test/associations/callbacks_test.rb b/activerecord/test/associations/callbacks_test.rb index afb1b8e84d..4b6b7f4123 100644 --- a/activerecord/test/associations/callbacks_test.rb +++ b/activerecord/test/associations/callbacks_test.rb @@ -60,6 +60,29 @@ class AssociationCallbacksTest < Test::Unit::TestCase "after_adding#{@thinking.id}", "after_adding_proc#{@thinking.id}"], @david.post_log end + def test_has_many_callbacks_with_create + morten = Author.create :name => "Morten" + post = morten.posts_with_proc_callbacks.create! :title => "Hello", :body => "How are you doing?" + assert_equal ["before_adding<new>", "after_adding#{post.id}"], morten.post_log + end + + def test_has_many_callbacks_with_create! + morten = Author.create! :name => "Morten" + post = morten.posts_with_proc_callbacks.create :title => "Hello", :body => "How are you doing?" + assert_equal ["before_adding<new>", "after_adding#{post.id}"], morten.post_log + end + + def test_has_many_callbacks_for_save_on_parent + jack = Author.new :name => "Jack" + post = jack.posts_with_callbacks.build :title => "Call me back!", :body => "Before you wake up and after you sleep" + + callback_log = ["before_adding<new>", "after_adding#{jack.posts_with_callbacks.first.id}"] + assert_equal callback_log, jack.post_log + assert jack.save + assert_equal 1, jack.posts_with_callbacks.count + assert_equal callback_log, jack.post_log + end + def test_has_and_belongs_to_many_add_callback david = developers(:david) ar = projects(:active_record) @@ -98,6 +121,17 @@ class AssociationCallbacksTest < Test::Unit::TestCase assert_equal log_array, activerecord.developers_log.sort end + def test_has_many_and_belongs_to_many_callbacks_for_save_on_parent + project = Project.new :name => "Callbacks" + project.developers_with_callbacks.build :name => "Jack", :salary => 95000 + + callback_log = ["before_adding<new>", "after_adding<new>"] + assert_equal callback_log, project.developers_log + assert project.save + assert_equal 1, project.developers_with_callbacks.count + assert_equal callback_log, project.developers_log + end + def test_dont_add_if_before_callback_raises_exception assert !@david.unchangable_posts.include?(@authorless) begin diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index 9e4d0f2711..f912816f33 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -595,6 +595,13 @@ class HasManyAssociationsTest < Test::Unit::TestCase end end + def test_create_with_bang_on_has_many_raises_when_record_not_saved + assert_raises(ActiveRecord::RecordInvalid) do + firm = Firm.find(:first) + firm.plain_clients.create! + end + end + def test_create_with_bang_on_habtm_when_parent_is_new_raises assert_raises(ActiveRecord::RecordNotSaved) do Developer.new("name" => "Aredridel").projects.create! diff --git a/activerecord/test/fixtures/author.rb b/activerecord/test/fixtures/author.rb index fa710bab9c..5ef0c6cfe9 100644 --- a/activerecord/test/fixtures/author.rb +++ b/activerecord/test/fixtures/author.rb @@ -33,13 +33,13 @@ class Author < ActiveRecord::Base :before_remove => :log_before_removing, :after_remove => :log_after_removing has_many :posts_with_proc_callbacks, :class_name => "Post", - :before_add => Proc.new {|o, r| o.post_log << "before_adding#{r.id}"}, - :after_add => Proc.new {|o, r| o.post_log << "after_adding#{r.id}"}, + :before_add => Proc.new {|o, r| o.post_log << "before_adding#{r.id || '<new>'}"}, + :after_add => Proc.new {|o, r| o.post_log << "after_adding#{r.id || '<new>'}"}, :before_remove => Proc.new {|o, r| o.post_log << "before_removing#{r.id}"}, :after_remove => Proc.new {|o, r| o.post_log << "after_removing#{r.id}"} has_many :posts_with_multiple_callbacks, :class_name => "Post", - :before_add => [:log_before_adding, Proc.new {|o, r| o.post_log << "before_adding_proc#{r.id}"}], - :after_add => [:log_after_adding, Proc.new {|o, r| o.post_log << "after_adding_proc#{r.id}"}] + :before_add => [:log_before_adding, Proc.new {|o, r| o.post_log << "before_adding_proc#{r.id || '<new>'}"}], + :after_add => [:log_after_adding, Proc.new {|o, r| o.post_log << "after_adding_proc#{r.id || '<new>'}"}] has_many :unchangable_posts, :class_name => "Post", :before_add => :raise_exception, :after_add => :log_after_adding has_many :categorizations @@ -74,7 +74,7 @@ class Author < ActiveRecord::Base private def log_before_adding(object) - @post_log << "before_adding#{object.id}" + @post_log << "before_adding#{object.id || '<new>'}" end def log_after_adding(object) diff --git a/activerecord/test/fixtures/project.rb b/activerecord/test/fixtures/project.rb index 2079dc9b58..2538b99d00 100644 --- a/activerecord/test/fixtures/project.rb +++ b/activerecord/test/fixtures/project.rb @@ -7,8 +7,8 @@ class Project < ActiveRecord::Base has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0" has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id}' has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => "DELETE FROM developers_projects WHERE project_id = \#{id} AND developer_id = \#{record.id}" - has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id}"}, - :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id}"}, + has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id || '<new>'}"}, + :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"}, :before_remove => Proc.new {|o, r| o.developers_log << "before_removing#{r.id}"}, :after_remove => Proc.new {|o, r| o.developers_log << "after_removing#{r.id}"} |