2 files changed, 27 insertions, 12 deletions
diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index f99ea13022..9e449856f4 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -1,14 +1,14 @@
 require 'abstract_unit'
+require 'env_helpers'
 require 'rails/commands/console'
 
 class Rails::ConsoleTest < ActiveSupport::TestCase
+  include EnvHelpers
+
   class FakeConsole
     def self.start; end
   end
 
-  def setup
-  end
-
   def test_sandbox_option
     console = Rails::Console.new(app, parse_arguments(["--sandbox"]))
     assert console.sandbox?
@@ -78,7 +78,14 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
       assert_match(/\sspecial-production\s/, output)
     end
   end
-  
+
+  def test_default_environment_with_rack_env
+    with_rack_env 'production' do
+      start
+      assert_match(/\sproduction\s/, output)
+    end
+  end
+
   def test_e_option
     start ['-e', 'special-production']
     assert_match(/\sspecial-production\s/, output)
@@ -126,12 +133,4 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
   def parse_arguments(args)
     Rails::Console.parse_arguments(args)
   end
-
-  def with_rails_env(env)
-    original_rails_env = ENV['RAILS_ENV']
-    ENV['RAILS_ENV'] = env
-    yield
-  ensure
-    ENV['RAILS_ENV'] = original_rails_env
-  end
 end
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 4a3ea82e3d..cb57b3c0cd 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -1,7 +1,9 @@
 require 'abstract_unit'
+require 'env_helpers'
 require 'rails/commands/server'
 
 class Rails::ServerTest < ActiveSupport::TestCase
+  include EnvHelpers
 
   def test_environment_with_server_option
     args    = ["thin", "-e", "production"]
@@ -23,4 +25,18 @@ class Rails::ServerTest < ActiveSupport::TestCase
     assert_nil options[:environment]
     assert_equal 'thin', options[:server]
   end
+
+  def test_environment_with_rails_env
+    with_rails_env 'production' do
+      server = Rails::Server.new
+      assert_equal 'production', server.options[:environment]
+    end
+  end
+
+  def test_environment_with_rack_env
+    with_rack_env 'production' do
+      server = Rails::Server.new
+      assert_equal 'production', server.options[:environment]
+    end
+  end
 end