Author: ppitonak(a)redhat.com Date: 2011-02-07 08:38:59 -0500 (Mon, 07 Feb 2011) New Revision: 21501 Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java Log: * fixed tests for tab panel and command button Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties 2011-02-07 13:30:27 UTC (rev 21500) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties 2011-02-07 13:38:59 UTC (rev 21501) @@ -11,5 +11,6 @@ attr.type.submit=submit attr.type.button=button attr.type.reset=reset +attr.type.image=image attr.type.nonvalid=nonvalid attr.type.null= Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2011-02-07 13:30:27 UTC (rev 21500) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2011-02-07 13:38:59 UTC (rev 21501) @@ -399,9 +399,9 @@ AttributeLocator attr = button.getAttribute(Attribute.TYPE); JQueryLocator typeInput = pjq("select[id$=typeInput]"); - selenium.select(typeInput, optionLabel("nonvalid")); + selenium.select(typeInput, optionLabel("image")); selenium.waitForPageToLoad(); - assertEquals(selenium.getAttribute(attr), "submit", "Button's type"); + assertEquals(selenium.getAttribute(attr), "image", "Button's type"); selenium.select(typeInput, optionLabel("reset")); selenium.waitForPageToLoad(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-07 13:30:27 UTC (rev 21500) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-07 13:38:59 UTC (rev 21501) @@ -262,6 +262,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10310") public void testAjaxEvents() { selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); selenium.waitForPageToLoad();