Changeset 2719

Timestamp:

10/24/05 16:45:33 (3 years ago)

Author:

bitsweat

Message:

r2727@asus: jeremy | 2005-10-24 14:14:36 -0700
Fallback to @loaded_fixtures = {}. Use Logger#silence. Test fixture isolation with use_instantiated_fixtures and with no fixtures declaration.

Files:

• trunk/activerecord/lib/active_record/fixtures.rb (modified) (3 diffs)
• trunk/activerecord/test/fixtures_test.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/fixtures.rb

@@ -218 +218 @@
-
-  def self.instantiate_fixtures(object, table_name, fixtures, load_instances=true)
-    old_logger_level = ActiveRecord::Base.logger.level
-    ActiveRecord::Base.logger.level = Logger::ERROR
-
-    object.instance_variable_set "@#{table_name.to_s.gsub('.','_')}", fixtures
-    if load_instances
-fixtures.each do |name, fixture|
-if model = fixture.find
-object.instance_variable_set "@#{name}", model
-end
-
-
-
-ActiveRecord::Base.logger.level = old_logger_level
+ActiveRecord::Base.logger.silence do
+fixtures.each do |name, fixture|
+if model = fixture.find
+    object.instance_variable_set "@#{name}", model
+    
+    
+
+end
-  end
-
@@ -559 +556 @@
-          # Clear dirty fixtures and loaded fixtures which were not declared
-          # for this test case.
-+
+|
-          Fixtures.delete_fixtures(wipe) unless wipe.empty?
-          dirty_fixture_table_names.clear
@@ -574 +571 @@
-                f.table_name.to_s
-              }
+            else
+              @loaded_fixtures = {}
-          end
-        end

trunk/activerecord/test/fixtures_test.rb

@@ -330 +330 @@
-  end
-end
+
+class FixtureCleanup5Test < FixtureCleanup3Test
+  self.use_instantiated_fixtures = false
+
+  def test_dirty_fixture_table_names
+    assert_equal %w(developers), dirty_fixture_table_names
+    assert_equal %w(developers), loaded_fixture_table_names
+    assert_equal %w(developers), fixture_table_names
+  end
+end
+
+class FixtureCleanup6Test < FixtureCleanup4Test
+  self.use_instantiated_fixtures = true
+
+  def test_dirty_fixture_table_names
+    assert_equal [], dirty_fixture_table_names
+    assert_equal %w(developers), loaded_fixture_table_names
+    assert_equal %w(developers), fixture_table_names
+  end
+end
+
+class FixtureCleanup7Test < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
+  self.use_instantiated_fixtures = true
+
+  def test_dirty_fixture_table_names
+    assert_equal [], dirty_fixture_table_names
+    assert_equal [], loaded_fixture_table_names
+    assert_equal [], fixture_table_names
+  end
+
+  def test_isolation
+    assert_equal 0, Topic.count
+    assert_equal 0, Developer.count
+  end
+end
+
+class FixtureCleanup8Test < FixtureCleanup7Test
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures = true
+end