Merge pull request #8427 from kennyj/support_rack_env

Add ENV['RACK_ENV'] support to rake runner/console/server.

1 files changed, 23 insertions, 0 deletions

diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 81ed5873a5..797c7a9470 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -67,5 +67,28 @@ module ApplicationTests
 
       assert_match "true", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.application.config.ran"` }
     end
+
+    def test_default_environment
+      assert_match "development", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.env"` }
+    end
+
+    def test_environment_with_rails_env
+      orig = ENV['RAILS_ENV']
+      ENV['RAILS_ENV'] = "production"
+      assert_match "production", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.env"` }
+    ensure
+      ENV['RAILS_ENV'] = orig
+    end
+
+    def test_environment_with_rails_env
+      rack, rails = ENV['RACK_ENV'], ENV['RAILS_ENV']
+      ENV['RACK_ENV'] = "production"
+      ENV['RAILS_ENV'] = nil
+      assert_match "production", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.env"` }
+    ensure
+      ENV['RAILS_ENV'] = rails
+      ENV['RACK_ENV'] = rack
+    end
+
   end
 end