mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Allow Pathnames to be added to eager load paths
This commit is contained in:
parent
eb6dd34136
commit
ec3134739c
3 changed files with 19 additions and 1 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
* Support for Pathnames in eager load paths.
|
||||||
|
|
||||||
|
*Mike Pack*
|
||||||
|
|
||||||
* Fixed missing line and shadow on service pages(404, 422, 500).
|
* Fixed missing line and shadow on service pages(404, 422, 500).
|
||||||
|
|
||||||
*Dmitry Korotkov*
|
*Dmitry Korotkov*
|
||||||
|
|
|
@ -465,7 +465,7 @@ module Rails
|
||||||
# files inside eager_load paths.
|
# files inside eager_load paths.
|
||||||
def eager_load!
|
def eager_load!
|
||||||
config.eager_load_paths.each do |load_path|
|
config.eager_load_paths.each do |load_path|
|
||||||
matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
|
matcher = /\A#{Regexp.escape(load_path.to_s)}\/(.*)\.rb\Z/
|
||||||
Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
|
Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
|
||||||
require_dependency file.sub(matcher, '\1')
|
require_dependency file.sub(matcher, '\1')
|
||||||
end
|
end
|
||||||
|
|
|
@ -71,6 +71,20 @@ module ApplicationTests
|
||||||
assert Zoo
|
assert Zoo
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "eager loading accepts Pathnames" do
|
||||||
|
app_file "lib/foo.rb", <<-RUBY
|
||||||
|
module Foo; end
|
||||||
|
RUBY
|
||||||
|
|
||||||
|
add_to_config <<-RUBY
|
||||||
|
config.eager_load = true
|
||||||
|
config.eager_load_paths << Pathname.new("#{app_path}/lib")
|
||||||
|
RUBY
|
||||||
|
|
||||||
|
require "#{app_path}/config/environment"
|
||||||
|
assert Foo
|
||||||
|
end
|
||||||
|
|
||||||
test "load environment with global" do
|
test "load environment with global" do
|
||||||
$initialize_test_set_from_env = nil
|
$initialize_test_set_from_env = nil
|
||||||
app_file "config/environments/development.rb", <<-RUBY
|
app_file "config/environments/development.rb", <<-RUBY
|
||||||
|
|
Loading…
Reference in a new issue