aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-11-04 14:14:03 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-11-04 14:14:03 -0800
commit0d5a384498296f005395d02943bd18e688aba436 (patch)
tree95f947591e9788d9582c1eb10c85164be4338732 /railties
parent11370eea81ca3b7b9d79264c0a4517c961d45bf6 (diff)
downloadrails-0d5a384498296f005395d02943bd18e688aba436.tar.gz
rails-0d5a384498296f005395d02943bd18e688aba436.tar.bz2
rails-0d5a384498296f005395d02943bd18e688aba436.zip
add a test for #17106
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/configuration_test.rb13
-rw-r--r--railties/test/isolation/abstract_unit.rb9
2 files changed, 22 insertions, 0 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 0eddf644d9..2b9f1d9cc1 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -59,6 +59,19 @@ module ApplicationTests
end
end
+ test "lib dir is on LOAD_PATH during config" do
+ app_file 'lib/my_logger.rb', <<-RUBY
+ require "logger"
+ class MyLogger < ::Logger
+ end
+ RUBY
+ add_to_top_of_config <<-RUBY
+ equire 'my_logger'
+ config.logger = MyLogger.new STDOUT
+ RUBY
+ require "#{app_path}/config/environment"
+ end
+
test "a renders exception on pending migration" do
add_to_config <<-RUBY
config.active_record.migration_error = :page_load
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 40469e31d7..bf2992005b 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -231,6 +231,15 @@ module TestHelpers
end
end
+ def add_to_top_of_config(str)
+ environment = File.read("#{app_path}/config/application.rb")
+ if environment =~ /(Rails::Application\s*)/
+ File.open("#{app_path}/config/application.rb", 'w') do |f|
+ f.puts $` + $1 + "\n#{str}\n" + $'
+ end
+ end
+ end
+
def add_to_config(str)
environment = File.read("#{app_path}/config/application.rb")
if environment =~ /(\n\s*end\s*end\s*)\Z/