github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added callbacks on push_with_attributes #1594 [Florian Weber]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1698 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-07-05 07:20:24 +00:00
parent f1880cac58
commit 0e92f36d75
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
View File

@@ -82,8 +82,10 @@ module ActiveRecord
def push_with_attributes(record, join_attributes = {})
raise_on_type_mismatch(record)
join_attributes.each { |key, value| record[key.to_s] = value }
callback(:before_add, record)
insert_record(record) unless @owner.new_record?
@target << record
callback(:after_add, record)
self
end

32
activerecord/test/association_callbacks_test.rb
View File

@@ -10,10 +10,10 @@ class AssociationCallbacksTest < Test::Unit::TestCase
fixtures :posts, :authors, :projects, :developers
def setup
@david = authors(:david)
@thinking = posts(:thinking)
@authorless = posts(:authorless)
assert @david.post_log.empty?
@david = authors(:david)
@thinking = posts(:thinking)
@authorless = posts(:authorless)
assert @david.post_log.empty?
end
def test_adding_macro_callbacks
@@ -74,14 +74,14 @@ class AssociationCallbacksTest < Test::Unit::TestCase
def test_has_and_belongs_to_many_remove_callback
david = developers(:david)
jamis = developers(:jamis)
ar = projects(:active_record)
assert ar.developers_log.empty?
ar.developers_with_callbacks.delete(david)
assert_equal ["before_removing#{david.id}", "after_removing#{david.id}"], ar.developers_log
activerecord = projects(:active_record)
assert activerecord.developers_log.empty?
activerecord.developers_with_callbacks.delete(david)
assert_equal ["before_removing#{david.id}", "after_removing#{david.id}"], activerecord.developers_log
ar.developers_with_callbacks.delete(jamis)
activerecord.developers_with_callbacks.delete(jamis)
assert_equal ["before_removing#{david.id}", "after_removing#{david.id}", "before_removing#{jamis.id}",
"after_removing#{jamis.id}"], ar.developers_log
"after_removing#{jamis.id}"], activerecord.developers_log
end
def test_dont_add_if_before_callback_raises_exception
@@ -95,6 +95,16 @@ class AssociationCallbacksTest < Test::Unit::TestCase
@david.reload
assert !@david.unchangable_posts.include?(@authorless)
end
def test_push_with_attributes
david = developers(:david)
activerecord = projects(:active_record)
assert activerecord.developers_log.empty?
activerecord.developers_with_callbacks.push_with_attributes(david, {})
assert_equal ["before_adding#{david.id}", "after_adding#{david.id}"], activerecord.developers_log
activerecord.developers_with_callbacks.push_with_attributes(david, {})
assert_equal ["before_adding#{david.id}", "after_adding#{david.id}", "before_adding#{david.id}",
"after_adding#{david.id}"], activerecord.developers_log
end
end