Merge branch 'jquery_update'

* 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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

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

View File

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