Merge branch 'master' of github.com:rails/rails

2 files changed, 2 insertions, 8 deletions

diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index 77b6c1f65d..5593840c71 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -293,10 +293,10 @@ module Rails
               Run `rails server --help` for more options.
             MSG
           else
-            suggestions = Rails::Command::Spellchecker.suggest(server, from: RACK_SERVERS)
+            suggestion = Rails::Command::Spellchecker.suggest(server, from: RACK_SERVERS)
 
             <<~MSG
-              Could not find server "#{server}". Maybe you meant #{suggestions.inspect}?
+              Could not find server "#{server}". Maybe you meant #{suggestion.inspect}?
               Run `rails server --help` for more options.
             MSG
           end
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index a16a2d3f0a..f98c1f78f7 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -49,12 +49,6 @@ class GeneratorsTest < Rails::Generators::TestCase
     I18n.default_locale = orig_default_locale
   end
 
-  def test_generator_multiple_suggestions
-    name = :tas
-    output = capture(:stdout) { Rails::Generators.invoke name }
-    assert_match 'Maybe you meant "task"?', output
-  end
-
   def test_help_when_a_generator_with_required_arguments_is_invoked_without_arguments
     output = capture(:stdout) { Rails::Generators.invoke :model, [] }
     assert_match(/Description:/, output)