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
2d005670
Commit
2d005670
authored
Mar 08, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rs-lower-capybara-timeout' into 'master'
Decrease Capybara timeout for CI environment Closes #29091 See merge request !9816
parents
75efb2c9
460c2d1c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
capybara.rb
features/support/capybara.rb
+1
-1
capybara.rb
spec/support/capybara.rb
+1
-1
No files found.
features/support/capybara.rb
View file @
2d005670
...
...
@@ -2,7 +2,7 @@ require 'spinach/capybara'
require
'capybara/poltergeist'
# 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
.
register_driver
:poltergeist
do
|
app
|
...
...
spec/support/capybara.rb
View file @
2d005670
...
...
@@ -3,7 +3,7 @@ require 'capybara/rspec'
require
'capybara/poltergeist'
# 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
.
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