From cb2f69659e01a9ec4b09c70f2357b426ca9a1264 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sat, 7 Apr 2018 07:18:16 +0900 Subject: Partially revert 0bfdd1d The `Capybara.server=` proc acceptance restored in Capyara 3.0.1. Ref: https://github.com/teamcapybara/capybara/commit/8f115d94e035eca992036f16e50c1dce5f555c97 --- actionpack/test/dispatch/system_testing/server_test.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/actionpack/test/dispatch/system_testing/server_test.rb b/actionpack/test/dispatch/system_testing/server_test.rb index 33d2f6a645..740e90a4da 100644 --- a/actionpack/test/dispatch/system_testing/server_test.rb +++ b/actionpack/test/dispatch/system_testing/server_test.rb @@ -5,6 +5,10 @@ require "capybara/dsl" require "action_dispatch/system_testing/server" class ServerTest < ActiveSupport::TestCase + setup do + @old_capybara_server = Capybara.server + end + test "port is always included" do ActionDispatch::SystemTesting::Server.new.run assert Capybara.always_include_port, "expected Capybara.always_include_port to be true" @@ -23,6 +27,6 @@ class ServerTest < ActiveSupport::TestCase end teardown do - Capybara.server = :default + Capybara.server = @old_capybara_server end end -- cgit v1.2.3