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:
authorStan Hu <stanhu@gmail.com>2017-04-02 06:23:18 +0300
committerStan Hu <stanhu@gmail.com>2017-04-02 08:49:22 +0300
commitc0564c549deaff44268622bfc26c81ec0c73dae7 (patch)
tree0a5c44f06a210c975ae17eed2fc96fe6378366a7
parent731d574d9359eca8cd37ef46e525bbc9603837a3 (diff)
Fix Spinach and Capybara dependencies
Closes #30347
-rw-r--r--features/support/capybara.rb4
-rw-r--r--spec/support/test_env.rb2
2 files changed, 4 insertions, 2 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
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 9db489e9a9b..a19a35c2c0d 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -172,7 +172,7 @@ module TestEnv
def eager_load_driver_server
return unless defined?(Capybara)
- puts "Starting the Capybara driver' server..."
+ puts "Starting the Capybara driver server..."
Capybara.current_session.visit '/'
end