diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-29 12:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-29 12:09:01 +0300 |
commit | 9ce66d4dcfe444ac27fb13b3e064de8bbf3572ef (patch) | |
tree | 6724f5ee3fbc7e5b9290a8951035c9c09d8f4437 /spec/support/capybara.rb | |
parent | 7bc73460c0262e1686cdf00be4673f10ffabd1a4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/capybara.rb')
-rw-r--r-- | spec/support/capybara.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 559ae01982f..66fce4fddf1 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -9,6 +9,9 @@ require 'selenium-webdriver' # Give CI some extra time timeout = ENV['CI'] || ENV['CI_SERVER'] ? 60 : 30 +# Support running Capybara on a specific port to allow saving commonly used pages +Capybara.server_port = ENV['CAPYBARA_PORT'] if ENV['CAPYBARA_PORT'] + # Define an error class for JS console messages JSConsoleError = Class.new(StandardError) |