aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-03-19 07:46:57 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-03-19 07:46:57 -0700
commit7bdc7635b885e473f6a577264fd8efad1c02174f (patch)
treed5a1331c223888514488113dfbb2358229422921 /actionview/test
parent45786be516e13d55a1fca9a4abaddd5781209103 (diff)
parentd578cbfb5c9fa353ce041bc826e13905910e2d2a (diff)
downloadrails-7bdc7635b885e473f6a577264fd8efad1c02174f.tar.gz
rails-7bdc7635b885e473f6a577264fd8efad1c02174f.tar.bz2
rails-7bdc7635b885e473f6a577264fd8efad1c02174f.zip
Merge pull request #19404 from dmathieu/remove_rack_env
Don't fallback to RACK_ENV when RAILS_ENV is not present
Diffstat (limited to 'actionview/test')
-rw-r--r--actionview/test/abstract_unit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
index 4635c645d0..382bd72f20 100644
--- a/actionview/test/abstract_unit.rb
+++ b/actionview/test/abstract_unit.rb
@@ -28,7 +28,7 @@ require 'pp' # require 'pp' early to prevent hidden_methods from not picking up
module Rails
class << self
def env
- @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "test")
+ @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || "test")
end
end
end