aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-11 09:20:54 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-11 09:20:54 -0700
commit9027ce9f7edd4300c14a841784354cbe3d8a1258 (patch)
treef18a30798767cf8d8c242b6347e3a0d8c3a72b37 /railties
parentdab82332c8866b967d1189c14aa0edc0a9fd09ae (diff)
parent8134c26640b042fdc5c8d4d65359876bb5b4f7ae (diff)
downloadrails-9027ce9f7edd4300c14a841784354cbe3d8a1258.tar.gz
rails-9027ce9f7edd4300c14a841784354cbe3d8a1258.tar.bz2
rails-9027ce9f7edd4300c14a841784354cbe3d8a1258.zip
Merge pull request #10175 from vipulnsward/initialize_fix
initialize instead of assert to fix warning
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/initializers/load_path_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index 9b18c329ec..0c66213caa 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -72,6 +72,7 @@ module ApplicationTests
end
test "load environment with global" do
+ $initialize_test_set_from_env = nil
app_file "config/environments/development.rb", <<-RUBY
$initialize_test_set_from_env = 'success'
AppTemplate::Application.configure do