From 5154089c181e9b36753b193bd7ffb141e88232f1 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 20 Mar 2015 08:14:11 -0700 Subject: Revert "Merge pull request #19404 from dmathieu/remove_rack_env" Preserving RACK_ENV behavior. This reverts commit 7bdc7635b885e473f6a577264fd8efad1c02174f, reversing changes made to 45786be516e13d55a1fca9a4abaddd5781209103. --- actionview/test/abstract_unit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionview/test') diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 382bd72f20..4635c645d0 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"] || "test") + @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "test") end end end -- cgit v1.2.3