aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-04-07 07:18:16 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-04-07 07:18:16 +0900
commitcb2f69659e01a9ec4b09c70f2357b426ca9a1264 (patch)
tree0e171a3b851dd4c4f08877b9bd24a1ebfbe11941 /actionpack
parente6f5e75ef1143e81f7f1252add059da37c61a0ed (diff)
downloadrails-cb2f69659e01a9ec4b09c70f2357b426ca9a1264.tar.gz
rails-cb2f69659e01a9ec4b09c70f2357b426ca9a1264.tar.bz2
rails-cb2f69659e01a9ec4b09c70f2357b426ca9a1264.zip
Partially revert 0bfdd1d
The `Capybara.server=` proc acceptance restored in Capyara 3.0.1. Ref: https://github.com/teamcapybara/capybara/commit/8f115d94e035eca992036f16e50c1dce5f555c97
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/system_testing/server_test.rb6
1 files changed, 5 insertions, 1 deletions
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