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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
f659c406
Commit
f659c406
authored
Mar 30, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eager-load the Capybara server to prevent timeouts
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
e559283c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
features/support/capybara.rb
features/support/capybara.rb
+1
-1
spec/support/capybara.rb
spec/support/capybara.rb
+1
-1
spec/support/test_env.rb
spec/support/test_env.rb
+1
-1
No files found.
features/support/capybara.rb
View file @
f659c406
...
@@ -25,5 +25,5 @@ Capybara.ignore_hidden_elements = false
...
@@ -25,5 +25,5 @@ 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
TestEnv
.
warm_asset_cache
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
TestEnv
.
eager_load_driver_server
end
end
spec/support/capybara.rb
View file @
f659c406
...
@@ -27,6 +27,6 @@ Capybara::Screenshot.prune_strategy = :keep_last_run
...
@@ -27,6 +27,6 @@ Capybara::Screenshot.prune_strategy = :keep_last_run
RSpec
.
configure
do
|
config
|
RSpec
.
configure
do
|
config
|
config
.
before
(
:suite
)
do
config
.
before
(
:suite
)
do
TestEnv
.
warm_asset_cache
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
TestEnv
.
eager_load_driver_server
end
end
end
end
spec/support/test_env.rb
View file @
f659c406
...
@@ -169,7 +169,7 @@ module TestEnv
...
@@ -169,7 +169,7 @@ module TestEnv
#
#
# Otherwise they'd be created by the first test, often timing out and
# Otherwise they'd be created by the first test, often timing out and
# causing a transient test failure
# causing a transient test failure
def
warm_asset_cache
def
eager_load_driver_server
return
unless
defined?
(
Capybara
)
return
unless
defined?
(
Capybara
)
Capybara
.
current_session
.
driver
.
visit
'/'
Capybara
.
current_session
.
driver
.
visit
'/'
...
...
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