Author: dsvyatobatsko Date: 2008-12-15 09:30:53 -0500 (Mon, 15 Dec 2008) New Revision: 11775 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestControls.xhtml trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestHiddens.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java Log: ajax reset moved to control form Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestControls.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestControls.xhtml 2008-12-15 14:16:36 UTC (rev 11774) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestControls.xhtml 2008-12-15 14:30:53 UTC (rev 11775) @@ -61,7 +61,12 @@ </td> </tr> <tr> - <td colspan="2"><h:commandButton id="_auto_load" actionListener="#{templateBean.reset}" action="#{autoTestBean.load}" value="Load"></h:commandButton> </td> + <td> + <h:commandButton id="_auto_load" actionListener="#{templateBean.reset}" action="#{autoTestBean.load}" value="Load"></h:commandButton> + </td> + <td> + <a4j:commandButton id="_auto_ajax_reset" value="Ajax reset" ajaxSingle="true" style="display: none;" action="#{autoTestBean.reset}" /> + </td> </tr> </table> </h:form> Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestHiddens.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestHiddens.xhtml 2008-12-15 14:16:36 UTC (rev 11774) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestHiddens.xhtml 2008-12-15 14:30:53 UTC (rev 11775) @@ -12,5 +12,4 @@ <h:outputText id="_auto_value" style="display: none;" value="#{autoTestBean.value}"></h:outputText> <h:commandButton id="_auto_simple_submit" value="Simple submit" immediate="#{autoTestBean.immediate}" style="display: none;" /> <a4j:commandButton id="_auto_ajax_submit" value="Ajax submit" reRender="componentId" immediate="#{autoTestBean.immediate}" style="display: none;" /> - <a4j:commandButton id="_auto_ajax_reset" value="Ajax reset" ajaxSingle="true" style="display: none;" action="#{autoTestBean.reset}" /> </html> \ No newline at end of file Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-12-15 14:16:36 UTC (rev 11774) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-12-15 14:30:53 UTC (rev 11775) @@ -367,7 +367,7 @@ } public void startTracing() { - String resetId = base.getParentId() + AUTOTEST_FORM_ID + AJAX_RESET; + String resetId = base.getParentId() + AUTOTEST_CONTROLS_FORM_ID + AJAX_RESET; base.clickAjaxCommandAndWait(resetId); }