1 files changed, 21 insertions, 21 deletions
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index 043fc6ea6e..875b62f16e 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -42,7 +42,7 @@ class BasicsTest < Test::Unit::TestCase
     topic.save
     assert_equal("Budget", topic.title)
     assert_equal("Jason", topic.author_name)
-    assert_equal(@topics["first"]["author_email_address"], Topic.find(1).author_email_address)
+    assert_equal(topics(:first).author_email_address, Topic.find(1).author_email_address)
   end
   
   def test_integers_as_nil
@@ -110,7 +110,7 @@ class BasicsTest < Test::Unit::TestCase
   end
  
   def test_attributes_hash
-    assert_equal @projects['active_record'].to_hash, Project.find_first.attributes
+    assert_equal @loaded_fixtures['projects']['active_record'].to_hash, Project.find_first.attributes
   end
 
   def test_create
@@ -229,14 +229,14 @@ class BasicsTest < Test::Unit::TestCase
   def test_load
     topics = Topic.find_all nil, "id"    
     assert_equal(2, topics.size)
-    assert_equal(@topics["first"]["title"], topics.first.title)
+    assert_equal(topics(:first).title, topics.first.title)
   end
   
   def test_load_with_condition
     topics = Topic.find_all "author_name = 'Mary'"
     
     assert_equal(1, topics.size)
-    assert_equal(@topics["second"]["title"], topics.first.title)
+    assert_equal(topics(:second).title, topics.first.title)
   end
 
   def test_table_name_guesses
@@ -721,35 +721,35 @@ class BasicsTest < Test::Unit::TestCase
   end
 
   def test_increment_attribute
-    assert_equal 0, @topics["first"].find.replies_count
-    @topics["first"].find.increment! :replies_count
-    assert_equal 1, @topics["first"].find.replies_count
+    assert_equal 0, topics(:first).replies_count
+    topics(:first).increment! :replies_count
+    assert_equal 1, topics(:first, :reload).replies_count
     
-    @topics["first"].find.increment(:replies_count).increment!(:replies_count)
-    assert_equal 3, @topics["first"].find.replies_count
+    topics(:first).increment(:replies_count).increment!(:replies_count)
+    assert_equal 3, topics(:first, :reload).replies_count
   end
   
   def test_increment_nil_attribute
-    assert_nil @topics["first"].find.parent_id
-    @topics["first"].find.increment! :parent_id
-    assert_equal 1, @topics["first"].find.parent_id
+    assert_nil topics(:first).parent_id
+    topics(:first).increment! :parent_id
+    assert_equal 1, topics(:first).parent_id
   end
   
   def test_decrement_attribute
-    @topics["first"].find.increment(:replies_count).increment!(:replies_count)
-    assert_equal 2, @topics["first"].find.replies_count
+    topics(:first).increment(:replies_count).increment!(:replies_count)
+    assert_equal 2, topics(:first).replies_count
     
-    @topics["first"].find.decrement!(:replies_count)
-    assert_equal 1, @topics["first"].find.replies_count
+    topics(:first).decrement!(:replies_count)
+    assert_equal 1, topics(:first, :reload).replies_count
 
-    @topics["first"].find.decrement(:replies_count).decrement!(:replies_count)
-    assert_equal -1, @topics["first"].find.replies_count
+    topics(:first).decrement(:replies_count).decrement!(:replies_count)
+    assert_equal -1, topics(:first, :reload).replies_count
   end
   
   def test_toggle_attribute
-    assert !@topics["first"].find.approved?
-    @topics["first"].find.toggle!(:approved)
-    assert @topics["first"].find.approved?
+    assert !topics(:first).approved?
+    topics(:first).toggle!(:approved)
+    assert topics(:first).approved?
   end
 
   def test_reload