summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/scenario/entrypoint.rb1
-rw-r--r--qa/qa/specs/config.rb4
2 files changed, 4 insertions, 1 deletions
diff --git a/qa/qa/scenario/entrypoint.rb b/qa/qa/scenario/entrypoint.rb
index ae099fd911e..b9d924651a0 100644
--- a/qa/qa/scenario/entrypoint.rb
+++ b/qa/qa/scenario/entrypoint.rb
@@ -8,6 +8,7 @@ module QA
include Bootable
def perform(address, *files)
+ Specs::Config.act { configure_capybara! }
Runtime::Scenario.define(:gitlab_address, address)
##
diff --git a/qa/qa/specs/config.rb b/qa/qa/specs/config.rb
index 591ddde8ab9..bce7923e52d 100644
--- a/qa/qa/specs/config.rb
+++ b/qa/qa/specs/config.rb
@@ -9,6 +9,8 @@ require 'selenium-webdriver'
module QA
module Specs
class Config < Scenario::Template
+ include Scenario::Actable
+
def perform
configure_rspec!
configure_capybara!
@@ -50,7 +52,7 @@ module QA
Capybara.configure do |config|
config.default_driver = :chrome
config.javascript_driver = :chrome
- config.default_max_wait_time = 4
+ config.default_max_wait_time = 10
# https://github.com/mattheworiordan/capybara-screenshot/issues/164
config.save_path = 'tmp'