From 2c0fa3208859aed2c1fd0ce54c8d5215d11d0c75 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Fri, 10 Jun 2005 14:58:02 +0000 Subject: Do not use instantiated fixtures (in general) in tests. Also, support the use of transactional fixtures by setting the AR_TX_FIXTURES environment variable to "yes". git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1399 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/mixin_nested_set_test.rb | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'activerecord/test/mixin_nested_set_test.rb') diff --git a/activerecord/test/mixin_nested_set_test.rb b/activerecord/test/mixin_nested_set_test.rb index 746c8aaf08..f51926afbc 100644 --- a/activerecord/test/mixin_nested_set_test.rb +++ b/activerecord/test/mixin_nested_set_test.rb @@ -147,37 +147,37 @@ class MixinNestedSetTest < Test::Unit::TestCase end def test_common_usage - @set_1.add_child( @set_2 ) - assert_equal( 1, @set_1.direct_children.length ) + mixins(:set_1).add_child( mixins(:set_2) ) + assert_equal( 1, mixins(:set_1).direct_children.length ) - @set_2.add_child( @set_3 ) - assert_equal( 1, @set_1.direct_children.length ) + mixins(:set_2).add_child( mixins(:set_3) ) + assert_equal( 1, mixins(:set_1).direct_children.length ) # Local cache is now out of date! # Problem: the update_alls update all objects up the tree - @set_1.reload - assert_equal( 2, @set_1.all_children.length ) - - assert_equal( 1, @set_1.lft ) - assert_equal( 2, @set_2.lft ) - assert_equal( 3, @set_3.lft ) - assert_equal( 4, @set_3.rgt ) - assert_equal( 5, @set_2.rgt ) - assert_equal( 6, @set_1.rgt ) + mixins(:set_1).reload + assert_equal( 2, mixins(:set_1).all_children.length ) + + assert_equal( 1, mixins(:set_1).lft ) + assert_equal( 2, mixins(:set_2).lft ) + assert_equal( 3, mixins(:set_3).lft ) + assert_equal( 4, mixins(:set_3).rgt ) + assert_equal( 5, mixins(:set_2).rgt ) + assert_equal( 6, mixins(:set_1).rgt ) - assert( @set_1.root? ) + assert( mixins(:set_1).root? ) begin - @set_4.add_child( @set_1 ) + mixins(:set_4).add_child( mixins(:set_1) ) fail rescue end - assert_equal( 2, @set_1.all_children.length ) + assert_equal( 2, mixins(:set_1).all_children.length ) - @set_1.add_child @set_4 + mixins(:set_1).add_child mixins(:set_4) - assert_equal( 3, @set_1.all_children.length ) + assert_equal( 3, mixins(:set_1).all_children.length ) end -- cgit v1.2.3