diff options
| author | eileencodes <eileencodes@gmail.com> | 2017-02-18 09:40:20 -0500 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2017-02-20 15:07:35 -0500 |
| commit | 0a683085b1db435b7371350b2799a0f248cd717a (patch) | |
| tree | e00b1507de3169038c036716145d6d4d9b00ff33 /actionsystemtest/test | |
| parent | 893c3b6282bc87c1f07a1f4084de8ff6709917b1 (diff) | |
| download | rails-0a683085b1db435b7371350b2799a0f248cd717a.tar.gz rails-0a683085b1db435b7371350b2799a0f248cd717a.tar.bz2 rails-0a683085b1db435b7371350b2799a0f248cd717a.zip | |
Rename server and remove optional port setting
I've renamed the server to `rails_puma` so that it doesn't override
Capybara's default puma server. I've also removed the hard port setting.
Users can simply use `Capybara.server_port` writer to set the port if
they require that.
Diffstat (limited to 'actionsystemtest/test')
| -rw-r--r-- | actionsystemtest/test/cases/action_system_test_test.rb | 12 | ||||
| -rw-r--r-- | actionsystemtest/test/cases/server_test.rb | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/actionsystemtest/test/cases/action_system_test_test.rb b/actionsystemtest/test/cases/action_system_test_test.rb index 732c06ba20..b77da5a5a9 100644 --- a/actionsystemtest/test/cases/action_system_test_test.rb +++ b/actionsystemtest/test/cases/action_system_test_test.rb @@ -8,18 +8,6 @@ class ActionSystemTestTest < ActiveSupport::TestCase assert_equal :poltergeist, Capybara.default_driver end - test "driven_by defaults to port 21800" do - ActionSystemTest::Base.driven_by :poltergeist - - assert_equal 21800, Capybara.server_port - end - - test "driven_by can change Capybara's server port" do - ActionSystemTest::Base.driven_by :selenium, on: 3000 - - assert_equal 3000, Capybara.server_port - end - test "driven_by sets Capybara's drivers respectively" do ActionSystemTest::Base.driven_by :selenium, using: :chrome diff --git a/actionsystemtest/test/cases/server_test.rb b/actionsystemtest/test/cases/server_test.rb index 39a9be5026..627b146d03 100644 --- a/actionsystemtest/test/cases/server_test.rb +++ b/actionsystemtest/test/cases/server_test.rb @@ -3,7 +3,7 @@ require "action_system_test" class ServerTest < ActiveSupport::TestCase test "initializing the server port" do - server = ActionSystemTest::Server.new(21800) - assert_equal 21800, server.instance_variable_get(:@port) + server = ActionSystemTest::Server + assert_includes Capybara.servers, :rails_puma end end |