Remove support for rails server RAILS_ENV=env-name

2 files changed, 2 insertions, 7 deletions

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index e68d2e05c5..9ef64da3ef 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -32,11 +32,6 @@ module Rails
 
         opt_parser.parse! args
 
-        # Handle's environment like RAILS_ENV=production passed in directly
-        if index = args.index {|arg| arg.include?("RAILS_ENV")}
-          options[:environment] ||= args.delete_at(index).split('=').last
-        end
-
         options[:server] = args.shift
         options
       end
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 8039aec873..4a3ea82e3d 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -4,14 +4,14 @@ require 'rails/commands/server'
 class Rails::ServerTest < ActiveSupport::TestCase
 
   def test_environment_with_server_option
-    args    = ["thin", "RAILS_ENV=production"]
+    args    = ["thin", "-e", "production"]
     options = Rails::Server::Options.new.parse!(args)
     assert_equal 'production', options[:environment]
     assert_equal 'thin', options[:server]
   end
 
   def test_environment_without_server_option
-    args    = ["RAILS_ENV=production"]
+    args    = ["-e", "production"]
     options = Rails::Server::Options.new.parse!(args)
     assert_equal 'production', options[:environment]
     assert_nil options[:server]