You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/12/13 19:17:08 UTC
wicket git commit: Gym.js tests - Merge #ajaxKeydown() and
#ajaxClick() into one method
Repository: wicket
Updated Branches:
refs/heads/master ca032aa00 -> 5e8fe7afc
Gym.js tests - Merge #ajaxKeydown() and #ajaxClick() into one method
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5e8fe7af
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5e8fe7af
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5e8fe7af
Branch: refs/heads/master
Commit: 5e8fe7afc170ddee4f6395f34f1610a06c548e3d
Parents: ca032aa
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Dec 13 19:15:11 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Dec 13 19:16:50 2015 +0100
----------------------------------------------------------------------
.../src/main/webapp/js-test/lib/gym.js | 29 ++++++++------------
.../src/main/webapp/js-test/tests/ajax/form.js | 6 ++--
.../main/webapp/js-test/tests/mailtemplate.js | 2 +-
3 files changed, 15 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5e8fe7af/wicket-examples/src/main/webapp/js-test/lib/gym.js
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/webapp/js-test/lib/gym.js b/wicket-examples/src/main/webapp/js-test/lib/gym.js
index aee036f..15fbc53 100644
--- a/wicket-examples/src/main/webapp/js-test/lib/gym.js
+++ b/wicket-examples/src/main/webapp/js-test/lib/gym.js
@@ -39,7 +39,7 @@
// native click for <a>
$btn[0].click();
} else {
- // jQuery.click() for <button> and <input type="button|submit">
+ // jQuery.click() for <button> and <input type="button|submit|image">
$btn.click();
}
@@ -78,20 +78,14 @@
return $(selector, _getIframe().contents());
};
- var ajaxClick = function($btn) {
- var deferred = $.Deferred();
- var iframeWindow = _getIframe()[0].contentWindow;
-
- _onAjaxComplete(iframeWindow, function($$) {
- deferred.resolve($$);
- });
-
- $btn.click();
-
- return deferred.promise();
- }
-
- var ajaxKeydown = function($el) {
+ /**
+ * Triggers an JS event on element and waits for an Ajax response
+ *
+ * @param eventName The name of the JS event
+ * @param $el The target element
+ * @returns A promise that will be fulfilled when the Ajax call returns
+ */
+ var ajaxEvent = function(eventName, $el) {
var deferred = $.Deferred();
var iframeWindow = _getIframe()[0].contentWindow;
@@ -99,7 +93,7 @@
deferred.resolve($$);
});
- $el.keydown();
+ $el.trigger(eventName);
return deferred.promise();
}
@@ -131,7 +125,6 @@
window.gym = {
load: load,
click: click,
- ajaxClick: ajaxClick,
- ajaxKeydown: ajaxKeydown
+ ajaxEvent: ajaxEvent
};
})($q);
http://git-wip-us.apache.org/repos/asf/wicket/blob/5e8fe7af/wicket-examples/src/main/webapp/js-test/tests/ajax/form.js
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/webapp/js-test/tests/ajax/form.js b/wicket-examples/src/main/webapp/js-test/tests/ajax/form.js
index 2fcd03a..4393fa5 100644
--- a/wicket-examples/src/main/webapp/js-test/tests/ajax/form.js
+++ b/wicket-examples/src/main/webapp/js-test/tests/ajax/form.js
@@ -37,7 +37,7 @@ $q(document).ready(function() {
var name = 'Aj';
$nameInput.val(name);
- return gym.ajaxKeydown($emailInput);
+ return gym.ajaxEvent('keydown', $emailInput);
}).then(function($) {
// an error feedback message that email is mandatory is expected
@@ -49,7 +49,7 @@ $q(document).ready(function() {
var name = 'Ajax form name';
$nameInput.val(name);
- return gym.ajaxKeydown($emailInput);
+ return gym.ajaxEvent('keydown', $emailInput);
}).then(function($) {
// an error feedback message that email is mandatory is expected
@@ -61,7 +61,7 @@ $q(document).ready(function() {
var email = 'contact@example.com';
$emailInput.val(email);
- return gym.ajaxKeydown($nameInput);
+ return gym.ajaxEvent('keydown', $nameInput);
}).then(function($) {
// the feedback panel must be empty now
http://git-wip-us.apache.org/repos/asf/wicket/blob/5e8fe7af/wicket-examples/src/main/webapp/js-test/tests/mailtemplate.js
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/webapp/js-test/tests/mailtemplate.js b/wicket-examples/src/main/webapp/js-test/tests/mailtemplate.js
index 6847f6f..9d137d3 100644
--- a/wicket-examples/src/main/webapp/js-test/tests/mailtemplate.js
+++ b/wicket-examples/src/main/webapp/js-test/tests/mailtemplate.js
@@ -31,7 +31,7 @@ $q(document).ready(function() {
$nameInput.val(text);
- return gym.ajaxClick($('a:contains("generate")').eq(linkIndex));
+ return gym.ajaxEvent('click', $('a:contains("generate")').eq(linkIndex));
};