BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
9fc17f6f
Commit
9fc17f6f
authored
Apr 02, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sh-fix-capybara-features' into 'master'
Fix Spinach and Capybara dependencies Closes #30347 See merge request !10395
parents
6de54010
c0564c54
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
capybara.rb
features/support/capybara.rb
+3
-1
test_env.rb
spec/support/test_env.rb
+1
-1
No files found.
features/support/capybara.rb
View file @
9fc17f6f
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
spec/support/test_env.rb
View file @
9fc17f6f
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment