From 5a0d73f17ce5590b1246d90ef54b6c6234f0fd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 2 Jun 2010 00:42:20 +0200
Subject: Add lib to load paths when application is inherited to be able to
 load lib code during configuration.

---
 .../test/application/initializers/load_path_test.rb     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index b39b9ecaae..d31915e129 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -19,6 +19,23 @@ module ApplicationTests
       assert $:.include?("#{app_path}/app/models")
     end
 
+    test "initializing an application adds lib path on inheritance hook" do
+      app_file "lib/foo.rb", <<-RUBY
+        module Foo; end
+      RUBY
+
+      add_to_config <<-RUBY
+        require "foo"
+        raise "Expected Foo to be defined" unless defined?(Foo)
+      RUBY
+
+      assert_nothing_raised do
+        require "#{app_path}/config/environment"
+      end
+
+      assert $:.include?("#{app_path}/lib")
+    end
+
     test "initializing an application eager load any path under app" do
       app_file "app/anything/foo.rb", <<-RUBY
         module Foo; end
-- 
cgit v1.2.3


From afc102698672cdf546a15424471d3287a39dbb06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 2 Jun 2010 08:45:03 +0200
Subject: Still copy application configuration to generator even if they are
 required earlier. Also tidy up the guide a little bit.

---
 railties/test/generators/generators_test_helper.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index d8bdb344f2..4a5a9b2932 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -1,4 +1,6 @@
 require 'abstract_unit'
+require 'rails/generators'
+require 'rails/generators/test_case'
 
 module Rails
   def self.root
@@ -8,8 +10,9 @@ end
 Rails.application.config.root = Rails.root
 Rails.application.config.generators.templates = [File.join(Rails.root, "lib", "templates")]
 
-require 'rails/generators'
-require 'rails/generators/test_case'
+# Call configure to load the settings from
+# Rails.application.config.generators to Rails::Generators
+Rails::Generators.configure!
 
 require 'active_record'
 require 'action_dispatch'
-- 
cgit v1.2.3