Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c0564c54
Commit
c0564c54
authored
Apr 01, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Spinach and Capybara dependencies
Closes #30347
parent
731d574d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
features/support/capybara.rb
features/support/capybara.rb
+3
-1
spec/support/test_env.rb
spec/support/test_env.rb
+1
-1
No files found.
features/support/capybara.rb
View file @
c0564c54
require
'spinach/capybara'
require
'capybara/poltergeist'
require
'capybara/poltergeist'
require
'capybara-screenshot/spinach'
require
'capybara-screenshot/spinach'
...
@@ -25,5 +24,8 @@ Capybara.ignore_hidden_elements = false
...
@@ -25,5 +24,8 @@ Capybara.ignore_hidden_elements = false
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
Spinach
.
hooks
.
before_run
do
Spinach
.
hooks
.
before_run
do
require
'spinach/capybara'
require
'capybara/rails'
TestEnv
.
eager_load_driver_server
TestEnv
.
eager_load_driver_server
end
end
spec/support/test_env.rb
View file @
c0564c54
...
@@ -172,7 +172,7 @@ module TestEnv
...
@@ -172,7 +172,7 @@ module TestEnv
def
eager_load_driver_server
def
eager_load_driver_server
return
unless
defined?
(
Capybara
)
return
unless
defined?
(
Capybara
)
puts
"Starting the Capybara driver
'
server..."
puts
"Starting the Capybara driver server..."
Capybara
.
current_session
.
visit
'/'
Capybara
.
current_session
.
visit
'/'
end
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