From 0bfdd1da2830cf3aca292c13d89204b48984ac54 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Fri, 6 Apr 2018 20:55:34 +0900 Subject: Fix broken `ServerTest` with Capybara 3.0.0 It seems that it is no longer possible to specify the value held by `Capybara.server` as sever. Ref: https://github.com/teamcapybara/capybara/commit/ba7674086cbcd3b22d3614011815bc5d483e5960 --- actionpack/test/dispatch/system_testing/server_test.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/dispatch/system_testing/server_test.rb b/actionpack/test/dispatch/system_testing/server_test.rb index 740e90a4da..33d2f6a645 100644 --- a/actionpack/test/dispatch/system_testing/server_test.rb +++ b/actionpack/test/dispatch/system_testing/server_test.rb @@ -5,10 +5,6 @@ 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" @@ -27,6 +23,6 @@ class ServerTest < ActiveSupport::TestCase end teardown do - Capybara.server = @old_capybara_server + Capybara.server = :default end end -- cgit v1.2.3