diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-19 19:41:15 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-19 19:41:15 -0300 |
| commit | 43073b393d234acd094ac7c220163f4e419d11f5 (patch) | |
| tree | 0d78982dfb1b93f929cc186c951f775a494af621 /railties/test/application/configuration/base_test.rb | |
| parent | 867631f9cfa6d639baacc09aac76e68819d5501f (diff) | |
| download | rails-43073b393d234acd094ac7c220163f4e419d11f5.tar.gz rails-43073b393d234acd094ac7c220163f4e419d11f5.tar.bz2 rails-43073b393d234acd094ac7c220163f4e419d11f5.zip | |
Revert "Improve custom configuration"
This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336.
Conflicts:
railties/lib/rails/railtie/configuration.rb
It added regression. Will be back after the beta
Diffstat (limited to 'railties/test/application/configuration/base_test.rb')
| -rw-r--r-- | railties/test/application/configuration/base_test.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/railties/test/application/configuration/base_test.rb b/railties/test/application/configuration/base_test.rb index 6e2b618160..d6a82b139d 100644 --- a/railties/test/application/configuration/base_test.rb +++ b/railties/test/application/configuration/base_test.rb @@ -5,8 +5,6 @@ require 'env_helpers' module ApplicationTests module ConfigurationTests class BaseTest < ActiveSupport::TestCase - include ActiveSupport::Testing::Isolation - def setup build_app boot_rails @@ -32,8 +30,8 @@ module ApplicationTests end def require_environment - require "#{app_path}/config/environment" + require "#{app_path}/config/environment" end end end -end +end
\ No newline at end of file |