From 5a7028a1a590ff82c8e1f34484eeb7603f2ef908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= <rafael@franca.dev>
Date: Thu, 29 Oct 2020 20:05:22 +0000
Subject: [PATCH] Remove deprecated `server` argument from the rails server
 command

---
 guides/source/6_1_release_notes.md            |  2 ++
 railties/CHANGELOG.md                         |  4 ++++
 .../rails/commands/server/server_command.rb   | 23 ++-----------------
 railties/test/commands/server_test.rb         |  4 ----
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/guides/source/6_1_release_notes.md b/guides/source/6_1_release_notes.md
index 23f3496cabb..5b31dbb1245 100644
--- a/guides/source/6_1_release_notes.md
+++ b/guides/source/6_1_release_notes.md
@@ -39,6 +39,8 @@ Please refer to the [Changelog][railties] for detailed changes.
 
 *   Remove deprecated `SOURCE_ANNOTATION_DIRECTORIES` environment variable support from `rails notes`.
 
+*   Remove deprecated `server` argument from the rails server command.
+
 ### Deprecations
 
 ### Notable changes
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e48db6a39b3..954a3760b2d 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated `server` argument from the rails server command.
+
+    *Rafael Mendonça França*
+
 *   Remove deprecated `SOURCE_ANNOTATION_DIRECTORIES` environment variable support from `rails notes`.
 
     *Rafael Mendonça França*
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index 1e00f3ff0b2..16a516ffc49 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -102,8 +102,6 @@ module Rails
       DEFAULT_PORT = 3000
       DEFAULT_PIDFILE = "tmp/pids/server.pid"
 
-      argument :using, optional: true
-
       class_option :port, aliases: "-p", type: :numeric,
         desc: "Runs Rails on the specified port - defaults to 3000.", banner: :port
       class_option :binding, aliases: "-b", type: :string,
@@ -128,7 +126,6 @@ module Rails
         super
 
         @original_options = local_options - %w( --restart )
-        deprecate_positional_rack_server_and_rewrite_to_option(@original_options)
       end
 
       def perform
@@ -147,7 +144,7 @@ module Rails
             after_stop_callback = -> { say "Exiting" unless options[:daemon] }
             server.start(after_stop_callback)
           else
-            say rack_server_suggestion(using)
+            say rack_server_suggestion(options[:using])
           end
         end
       end
@@ -156,7 +153,7 @@ module Rails
         def server_options
           {
             user_supplied_options: user_supplied_options,
-            server:                using,
+            server:                options[:using],
             log_stdout:            log_to_stdout?,
             Port:                  port,
             Host:                  host,
@@ -266,22 +263,6 @@ module Rails
           FileUtils.rm_f(pid) if options[:restart]
         end
 
-        def deprecate_positional_rack_server_and_rewrite_to_option(original_options)
-          if using
-            ActiveSupport::Deprecation.warn(<<~MSG.squish)
-              Passing the Rack server name as a regular argument is deprecated
-              and will be removed in the next Rails version. Please, use the -u
-              option instead.
-            MSG
-
-            original_options.concat [ "-u", using ]
-          else
-            # Use positional internally to get around Thor's immutable options.
-            # TODO: Replace `using` occurrences with `options[:using]` after deprecation removal.
-            @using = options[:using]
-          end
-        end
-
         def rack_server_suggestion(server)
           if server.in?(RACK_SERVERS)
             <<~MSG
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index c9026e2d95b..61f2169fccc 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -44,10 +44,6 @@ class Rails::Command::ServerCommandTest < ActiveSupport::TestCase
     assert_no_match(/Maybe you meant/, output)
   end
 
-  def test_using_positional_argument_deprecation
-    assert_match(/DEPRECATION WARNING/, run_command("tin"))
-  end
-
   def test_using_known_server_that_isnt_in_the_gemfile
     assert_match(/Could not load server "unicorn". Maybe you need to the add it to the Gemfile/, run_command("-u", "unicorn"))
   end