diff options
Diffstat (limited to 'activerecord/test/fixtures')
| -rw-r--r-- | activerecord/test/fixtures/author.rb | 10 | ||||
| -rw-r--r-- | activerecord/test/fixtures/project.rb | 4 |
2 files changed, 7 insertions, 7 deletions
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}"} |