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
Tatuya Kamada
gitlab-ce
Commits
460c2d1c
Commit
460c2d1c
authored
Mar 08, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Decrease Capybara timeout for CI environment
parent
935574ed
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
features/support/capybara.rb
features/support/capybara.rb
+1
-1
spec/support/capybara.rb
spec/support/capybara.rb
+1
-1
No files found.
features/support/capybara.rb
View file @
460c2d1c
...
@@ -2,7 +2,7 @@ require 'spinach/capybara'
...
@@ -2,7 +2,7 @@ require 'spinach/capybara'
require
'capybara/poltergeist'
require
'capybara/poltergeist'
# Give CI some extra time
# Give CI some extra time
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
90
:
15
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
30
:
10
Capybara
.
javascript_driver
=
:poltergeist
Capybara
.
javascript_driver
=
:poltergeist
Capybara
.
register_driver
:poltergeist
do
|
app
|
Capybara
.
register_driver
:poltergeist
do
|
app
|
...
...
spec/support/capybara.rb
View file @
460c2d1c
...
@@ -3,7 +3,7 @@ require 'capybara/rspec'
...
@@ -3,7 +3,7 @@ require 'capybara/rspec'
require
'capybara/poltergeist'
require
'capybara/poltergeist'
# Give CI some extra time
# Give CI some extra time
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
9
0
:
10
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
3
0
:
10
Capybara
.
javascript_driver
=
:poltergeist
Capybara
.
javascript_driver
=
:poltergeist
Capybara
.
register_driver
:poltergeist
do
|
app
|
Capybara
.
register_driver
:poltergeist
do
|
app
|
...
...
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