kotovalexarian-likes-github/teamcapybara--capybara
1
0
Fork 0
mirror of https://github.com/teamcapybara/capybara.git synced 2022-11-09 12:08:07 -05:00
Code Releases Activity

Merge branch 'jquery_update'

Browse source 
* jquery_update:
  fix small timing issue in test
  update jquery/ui used for testing to something more modern
This commit is contained in:
Thomas Walpole 2015-11-20 14:36:53 -08:00
commit 37238054df
4 changed files with 26 additions and 9842 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

804
lib/capybara/spec/public/jquery-ui.js vendored
View file

File diff suppressed because one or more lines are too long

9049
lib/capybara/spec/public/jquery.js vendored
View file

File diff suppressed because one or more lines are too long

8
lib/capybara/spec/public/test.js
View file

@ -60,12 +60,14 @@ $(function() {
$('title').text('changed title') $('title').text('changed title')
}, 250) }, 250)
}); });
$('#click-test').dblclick(function() { $('#click-test').on({
dblclick: function() {
$(this).after('<a id="has-been-double-clicked" href="#">Has been double clicked</a>'); $(this).after('<a id="has-been-double-clicked" href="#">Has been double clicked</a>');
}); },
$('#click-test').bind('contextmenu', function(e) { contextmenu: function(e) {
e.preventDefault(); e.preventDefault();
$(this).after('<a id="has-been-right-clicked" href="#">Has been right clicked</a>'); $(this).after('<a id="has-been-right-clicked" href="#">Has been right clicked</a>');
}
}); });
$('#open-alert').click(function() { $('#open-alert').click(function() {
alert('Alert opened'); alert('Alert opened');

1
lib/capybara/spec/session/window/window_opened_by_spec.rb
View file

@ -72,6 +72,7 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
expect do expect do
@session.window_opened_by do @session.window_opened_by do
button.click button.click
sleep 0.1 # It's possible for window_opened_by to be fullfilled before the second window opens
end end
end.to raise_error(Capybara::WindowError, two_windows_message) end.to raise_error(Capybara::WindowError, two_windows_message)
@session.document.synchronize(2, errors: [Capybara::CapybaraError]) do @session.document.synchronize(2, errors: [Capybara::CapybaraError]) do