Changeset 9050

Timestamp:

03/17/08 21:48:28 (4 months ago)

Author:

david

Message:

Added logging for dependency load errors with fixtures (closes #11056) [stuthulhu]

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added logging for dependency load errors with fixtures #11056 [stuthulhu]
-
-* Time zone aware attributes use Time#in_time_zone [Geoff Buesing]

trunk/activerecord/lib/active_record/fixtures.rb

@@ -847 +847 @@
-        end
-
+        def try_to_load_dependency(file_name)
+          require_dependency file_name
+        rescue LoadError => e
+          # Let's hope the developer has included it himself
+          
+          # Let's warn in case this is a subdependency, otherwise
+          # subdependency error messages are totally cryptic
+          ActiveRecord::Base.logger.warn("Unable to load #{file_name}, underlying cause #{e.message} \n\n #{e.backtrace.join("\n")}")
+        end
+        
-        def require_fixture_classes(table_names = nil)
-          (table_names || fixture_table_names).each do |table_name|
-            file_name = table_name.to_s
-            file_name = file_name.singularize if ActiveRecord::Base.pluralize_table_names
-
-
-
-
-
+
-          end
-        end

trunk/activerecord/test/cases/fixtures_test.rb

@@ -591 +591 @@
-  end
-end
+
+class FixtureLoadingTest < ActiveRecord::TestCase
+  def test_logs_message_for_failed_dependency_load
+    Test::Unit::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError)
+    ActiveRecord::Base.logger.expects(:warn)
+    Test::Unit::TestCase.try_to_load_dependency(:does_not_exist)
+  end
+
+  def test_does_not_logs_message_for_successful_dependency_load
+    Test::Unit::TestCase.expects(:require_dependency).with(:works_out_fine)
+    ActiveRecord::Base.logger.expects(:warn).never
+    Test::Unit::TestCase.try_to_load_dependency(:works_out_fine)
+  end
+end