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
7c61bdcf
Commit
7c61bdcf
authored
Mar 15, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Capybara 2.6.2 deprecation warnings
parent
ac8c6f24
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/wait_for_ajax.rb
spec/support/wait_for_ajax.rb
+1
-1
No files found.
features/support/capybara.rb
View file @
7c61bdcf
...
...
@@ -9,7 +9,7 @@ Capybara.register_driver :poltergeist do |app|
Capybara
::
Poltergeist
::
Driver
.
new
(
app
,
js_errors:
true
,
timeout:
timeout
,
window_size:
[
1366
,
768
])
end
Capybara
.
default_wait_time
=
timeout
Capybara
.
default_
max_
wait_time
=
timeout
Capybara
.
ignore_hidden_elements
=
false
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
...
...
spec/support/capybara.rb
View file @
7c61bdcf
...
...
@@ -10,7 +10,7 @@ Capybara.register_driver :poltergeist do |app|
Capybara
::
Poltergeist
::
Driver
.
new
(
app
,
js_errors:
true
,
timeout:
timeout
,
window_size:
[
1366
,
768
])
end
Capybara
.
default_wait_time
=
timeout
Capybara
.
default_
max_
wait_time
=
timeout
Capybara
.
ignore_hidden_elements
=
true
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
...
...
spec/support/wait_for_ajax.rb
View file @
7c61bdcf
module
WaitForAjax
def
wait_for_ajax
Timeout
.
timeout
(
Capybara
.
default_wait_time
)
do
Timeout
.
timeout
(
Capybara
.
default_
max_
wait_time
)
do
loop
until
finished_all_ajax_requests?
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