Skip to content

Commit 1744e59

Browse files
committed
Remove code for running specs without docker since that does not work
1 parent d6dd73d commit 1744e59

File tree

4 files changed

+6
-39
lines changed

4 files changed

+6
-39
lines changed

spec/integration/ruby_server_js_client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def poll_for_js_result(script)
5555
# Start a Capybara server for our rack app
5656
Capybara::Server.new(rack_app).tap(&:boot)
5757
end
58-
let(:server_host) { CapybaraServerHelper.server_host_for_browser(server) }
58+
let(:server_host) { Socket.gethostname }
5959

6060
let(:test_page) { "http://#{server_host}:#{server.port}/js-client/test.html" }
6161
let(:name) { "James\u1f61d" }

spec/integration/ruby_server_nodejs_client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Use Capybara::Server directly instead of creating a session that would use WebDriver
3838
let(:server) { Capybara::Server.new(rack_app).tap(&:boot) }
39-
let(:server_host) { CapybaraServerHelper.server_host_for_client(server) }
39+
let(:server_host) { '127.0.0.1' }
4040
let(:server_url) { "http://#{server_host}:#{server.port}" }
4141
let(:name) { "James\u1f61d" }
4242

spec/integration/ruby_server_ruby_client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# Use Capybara::Server directly instead of creating a session that would use WebDriver
2222
let(:server) { Capybara::Server.new(rack_app).tap(&:boot) }
2323

24-
let(:server_host) { CapybaraServerHelper.server_host_for_client(server) }
24+
let(:server_host) { '127.0.0.1' }
2525
let(:client_url) { "http://#{basic_username}:#{basic_password}@#{server_host}:#{server.port}" }
2626
let(:client) do
2727
GRPCWeb::Client.new(

spec/support/capybara.rb

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,9 @@
5050
config.server = :webrick
5151
config.always_include_port = true
5252

53-
if ENV['CI'] || ENV['DOCKER']
54-
# In Docker/CI, bind to all interfaces
55-
# Use the container's hostname which docker compose --use-aliases makes resolvable
56-
config.server_host = '0.0.0.0'
57-
config.default_driver = :selenium_chrome_standalone
58-
config.javascript_driver = :selenium_chrome_standalone
59-
else
60-
config.server_host = IPSocket.getaddress(Socket.gethostname)
61-
config.app_host = "http://#{Socket.gethostname}"
62-
if ENV['CHROME']
63-
config.javascript_driver = :selenium_chrome
64-
else
65-
config.javascript_driver = :selenium_chrome_headless
66-
end
67-
end
53+
config.server_host = '0.0.0.0'
54+
config.default_driver = :selenium_chrome_standalone
55+
config.javascript_driver = :selenium_chrome_standalone
6856

6957
puts "Capybara is using the #{config.javascript_driver} driver for javascript tests"
7058
end
@@ -73,27 +61,6 @@
7361
# https://github.com/puzzle/skills/issues/800
7462
Selenium::WebDriver.logger.ignore(:clear_local_storage, :clear_session_storage)
7563

76-
# Helper module for getting the correct server host in different environments
77-
module CapybaraServerHelper
78-
def self.server_host_for_client(server)
79-
# In Docker, use localhost since client runs in same container as server
80-
if ENV['CI'] || ENV['DOCKER']
81-
'127.0.0.1'
82-
else
83-
server.host
84-
end
85-
end
86-
87-
def self.server_host_for_browser(_server)
88-
# In Docker, use the container's hostname since docker compose --use-aliases makes it resolvable
89-
if ENV['CI'] || ENV['DOCKER']
90-
Socket.gethostname
91-
else
92-
Capybara.server_host
93-
end
94-
end
95-
end
96-
9764
RSpec.configure do |config|
9865
config.before(type: :feature) { Capybara.app = TestGRPCWebApp.build }
9966

0 commit comments

Comments
 (0)