Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/capybara/session/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ class SessionConfig

attr_accessor(*OPTIONS)

URI_PARSER = defined?(::URI::RFC2396_PARSER) ? ::URI::RFC2396_PARSER : ::URI::DEFAULT_PARSER
private_constant :URI_PARSER

##
# @!method always_include_port
# See {Capybara.configure}
Expand Down Expand Up @@ -83,7 +86,7 @@ def server_errors=(errors)

remove_method :app_host=
def app_host=(url)
unless url.nil? || url.match?(URI::DEFAULT_PARSER.make_regexp)
unless url.nil? || url.match?(URI_PARSER.make_regexp)
raise ArgumentError, "Capybara.app_host should be set to a url (http://www.example.com). Attempted to set #{url.inspect}."
end

Expand All @@ -92,7 +95,7 @@ def app_host=(url)

remove_method :default_host=
def default_host=(url)
unless url.nil? || url.match?(URI::DEFAULT_PARSER.make_regexp)
unless url.nil? || url.match?(URI_PARSER.make_regexp)
raise ArgumentError, "Capybara.default_host should be set to a url (http://www.example.com). Attempted to set #{url.inspect}."
end

Expand Down