This is an automated email from the ASF dual-hosted git repository. papegaaij pushed a commit to branch csp-form in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 793bc66231d39dbc58646d2f6ae1b1715f58f459 Author: Emond Papegaaij <[email protected]> AuthorDate: Wed Jan 22 21:23:31 2020 +0100 WICKET-6726: update expected markup for tests --- .../html/form/FormDefaultButtonTestPage_expected.html | 14 ++++++++++++-- .../markup/html/form/FormMethodTestPage_expected.html | 2 +- .../markup/html/form/pageWithParameters_expected.html | 2 +- .../data/table/filter/FilterFormTestPage_expected.html | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html index 9ab27de..ffad769 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html @@ -1,6 +1,16 @@ <html> -<body> - <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.FormDefaultButtonTestPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden" class="hidden-fields"><input type="text" tabindex="-1" autocomplete="off"/><input type="submit" tabindex="-1" name="default" onclick=" var b=document.getElementById('default2'); if (b!=null&&b.onclick!=null&&typeof(b.onclick) != 'undefined') { var r = W [...] +<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script> +<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script> +<script type="text/javascript"> +/*<![CDATA[*/ +Wicket.Event.add(window, "domready", function(event) { +Wicket.Event.add('form1_hf_1', 'click', function(event) { var b=document.getElementById('default2'); if (b!=null && b.onclick!=null && typeof(b.onclick) != 'undefined') { var r = Wicket.bind(b.onclick, b)(); if (r != false) b.click(); } else { b.click(); }; return false;});; +Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND); +;}); +/*]]>*/ +</script> +</head><body> + <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.FormDefaultButtonTestPage?0-1.-form"><div class="wicket--hidden-fields"><input type="text" tabindex="-1" autocomplete="off"/><input id="form1_hf_1" type="submit" tabindex="-1" name="default" /></div> <button wicket:id="default" name="default" id="default2"></button> </form> </body> diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html index c7e4191..0bd35d1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html @@ -1,6 +1,6 @@ <html> <body> <form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost"></form> - <form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div id="formget2_hf_0" style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden" class="hidden-fields"><input type="hidden" name="0-1.-formget" value="" /></div></form> + <form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div id="formget2_hf_0" class="wicket--hidden-fields"><input type="hidden" name="0-1.-formget" value="" /></div></form> </body> </html> diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html index 75ad75e..842f424 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html @@ -1,6 +1,6 @@ <html> <body> <form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost&first=foo&second=bar"></form> - <form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div id="formget2_hf_0" style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden" class="hidden-fields"><input type="hidden" name="0-1.-formget" value="" /><input type="hidden" name="first" value="foo" /><input type="hidden" name="second" value="bar" /></div></form> + <form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div id="formget2_hf_0" class="wicket--hidden-fields"><input type="hidden" name="0-1.-formget" value="" /><input type="hidden" name="first" value="foo" /><input type="hidden" name="second" value="bar" /></div></form> </body> </html> diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html index 3cc020e..8b3e253 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html @@ -2,7 +2,7 @@ <head><script type="text/javascript" src="../resource/org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm/wicket-filterform.js"></script> <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script> <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script> -<script type="text/javascript" > +<script type="text/javascript"> /*<![CDATA[*/ Wicket.Event.add(window, "load", function(event) { Wicket.FilterForm.restore('form1focus');; @@ -10,6 +10,6 @@ Wicket.FilterForm.restore('form1focus');; /*]]>*/ </script> </head><body> - <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterFormTestPage?0-1.-form"><div style='position: absolute; left: -9999px; width: 1px; height: 1px;' class='hidden-fields'><input type='hidden' name='form1focus' id='form1focus' value=''/><input type='submit'/></div></form> + <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterFormTestPage?0-1.-form"><div class='wicket--hidden-fields'><input type='hidden' name='form1focus' id='form1focus' value=''/><input type='submit'/></div></form> </body> </html>
