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
a61c1977
Commit
a61c1977
authored
Dec 08, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't disable capybara-screenshot in CI environment
parent
b2592f01
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
features/support/capybara.rb
features/support/capybara.rb
+3
-6
spec/support/capybara.rb
spec/support/capybara.rb
+3
-6
No files found.
features/support/capybara.rb
View file @
a61c1977
require
'spinach/capybara'
require
'spinach/capybara'
require
'capybara/poltergeist'
require
'capybara/poltergeist'
require
'capybara-screenshot/spinach'
# Give CI some extra time
# Give CI some extra time
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
90
:
15
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
90
:
15
...
@@ -20,12 +21,8 @@ end
...
@@ -20,12 +21,8 @@ end
Capybara
.
default_max_wait_time
=
timeout
Capybara
.
default_max_wait_time
=
timeout
Capybara
.
ignore_hidden_elements
=
false
Capybara
.
ignore_hidden_elements
=
false
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
# Keep only the screenshots generated from the last failing test suite
require
'capybara-screenshot/spinach'
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
# Keep only the screenshots generated from the last failing test suite
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
end
Spinach
.
hooks
.
before_run
do
Spinach
.
hooks
.
before_run
do
TestEnv
.
warm_asset_cache
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
TestEnv
.
warm_asset_cache
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
...
...
spec/support/capybara.rb
View file @
a61c1977
require
'capybara/rails'
require
'capybara/rails'
require
'capybara/rspec'
require
'capybara/rspec'
require
'capybara/poltergeist'
require
'capybara/poltergeist'
require
'capybara-screenshot/rspec'
# Give CI some extra time
# Give CI some extra time
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
90
:
10
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
90
:
10
...
@@ -21,12 +22,8 @@ end
...
@@ -21,12 +22,8 @@ end
Capybara
.
default_max_wait_time
=
timeout
Capybara
.
default_max_wait_time
=
timeout
Capybara
.
ignore_hidden_elements
=
true
Capybara
.
ignore_hidden_elements
=
true
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
# Keep only the screenshots generated from the last failing test suite
require
'capybara-screenshot/rspec'
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
# Keep only the screenshots generated from the last failing test suite
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
end
RSpec
.
configure
do
|
config
|
RSpec
.
configure
do
|
config
|
config
.
before
(
:suite
)
do
config
.
before
(
:suite
)
do
...
...
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