Changeset 6228

Timestamp:

02/25/07 19:27:56 (2 years ago)

Author:

david

Message:

Setting fixtures automatically for integration tests is a bit harder -- will have to wait until the test superclass reform is implemented

Files:

• trunk/activerecord/lib/active_record/fixtures.rb (modified) (1 diff)
• trunk/railties/helpers/test_helper.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/fixtures.rb

@@ -491 +491 @@
-        (table_names || fixture_table_names).each do |table_name|
-          table_name = table_name.to_s.tr('.','_')
+
-          define_method(table_name) do |fixture, *optionals|
-            force_reload = optionals.shift
-            @fixture_cache[table_name] ||= Hash.new
-            @fixture_cache[table_name][fixture] = nil if force_reload
+
-            if @loaded_fixtures[table_name][fixture.to_s]
-              @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find

trunk/railties/helpers/test_helper.rb

@@ -28 +28 @@
-  # If you need to control the loading order (due to foreign key constraints etc), you'll
-  # need to change this line to explicitly name the order you desire.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherent this setting
-  fixtures :all
-