Author: lfryc(a)redhat.com Date: 2010-11-05 11:18:53 -0400 (Fri, 05 Nov 2010) New Revision: 19966 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java Log: fixed rich:collapsiblePanel tests failing due to failed location using rich:componentId in iteration components Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-11-05 15:18:00 UTC (rev 19965) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-11-05 15:18:53 UTC (rev 19966) @@ -37,14 +37,10 @@ </ui:define> <ui:define name="outOfTemplateBefore"> - <script type="text/javascript"> - testedComponentId = "#{rich:clientId('collapsiblePanel')}"; - </script> </ui:define> <ui:define name="component"> - #{nonexistingbean.aaa} - + <rich:collapsiblePanel id="collapsiblePanel" bodyClass="#{richCollapsiblePanelBean.attributes['bodyClass'].value}" bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}" Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java 2010-11-05 15:18:00 UTC (rev 19965) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java 2010-11-05 15:18:53 UTC (rev 19966) @@ -516,8 +516,7 @@ * @return spinner input value */ private String getInputValue() { - String id = selenium.getEval(new JavaScript("window.testedComponentId")); - return selenium.getEval(new JavaScript("window.RichFaces.$('" + id + "').value")); + return selenium.getValue(input); } /**