Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-04-02 10:22:08 +0300
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-04-02 10:22:08 +0300
commit9fc17f6f4abdb04f3cf1b60b87bd67b894a19c39 (patch)
tree7ddfbd3850484324f2b6adf9f2d24e2c70d72071 /features
parent6de540100b61f4cdbf8f1e8c5032376c963810b4 (diff)
parentc0564c549deaff44268622bfc26c81ec0c73dae7 (diff)
Merge branch 'sh-fix-capybara-features' into 'master'
Fix Spinach and Capybara dependencies Closes #30347 See merge request !10395
Diffstat (limited to 'features')
-rw-r--r--features/support/capybara.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index 33ca76bea8d..1e46b3faf0b 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -1,4 +1,3 @@
-require 'spinach/capybara'
require 'capybara/poltergeist'
require 'capybara-screenshot/spinach'
@@ -25,5 +24,8 @@ Capybara.ignore_hidden_elements = false
Capybara::Screenshot.prune_strategy = :keep_last_run
Spinach.hooks.before_run do
+ require 'spinach/capybara'
+ require 'capybara/rails'
+
TestEnv.eager_load_driver_server
end