1 files changed, 3 insertions, 16 deletions
diff --git a/actionsystemtest/lib/action_system_test/server.rb b/actionsystemtest/lib/action_system_test/server.rb
index 6f87b2767d..76ae30f753 100644
--- a/actionsystemtest/lib/action_system_test/server.rb
+++ b/actionsystemtest/lib/action_system_test/server.rb
@@ -2,10 +2,6 @@ require "rack/handler/puma"
 
 module ActionSystemTest
   class Server # :nodoc:
-    def initialize(port)
-      @port = port
-    end
-
     def run
       register
       setup
@@ -13,22 +9,13 @@ module ActionSystemTest
 
     private
       def register
-        Capybara.register_server :puma do |app, host|
-          Rack::Handler::Puma.run(app, Port: @port, Threads: "0:1")
+        Capybara.register_server :rails_puma do |app, port, host|
+          Rack::Handler::Puma.run(app, Port: port, Threads: "0:1")
         end
       end
 
       def setup
-        set_server
-        set_port
-      end
-
-      def set_server
-        Capybara.server = :puma
-      end
-
-      def set_port
-        Capybara.server_port = @port
+        Capybara.server = :rails_puma
       end
   end
 end