aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-04-06 20:55:34 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-04-06 21:01:28 +0900
commit0bfdd1da2830cf3aca292c13d89204b48984ac54 (patch)
tree735836f1a34bf1aab2ad6722d76d7f0f2f6f43e7 /actionpack
parent457312f54fc1641ad42bcc6362b13836fc30feec (diff)
downloadrails-0bfdd1da2830cf3aca292c13d89204b48984ac54.tar.gz
rails-0bfdd1da2830cf3aca292c13d89204b48984ac54.tar.bz2
rails-0bfdd1da2830cf3aca292c13d89204b48984ac54.zip
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
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/system_testing/server_test.rb6
1 files changed, 1 insertions, 5 deletions
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