Author: lfryc(a)redhat.com Date: 2010-01-14 07:14:39 -0500 (Thu, 14 Jan 2010) New Revision: 16287 Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/repeat/RepeatTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/org/jboss/richfaces/integrationTest/repeat/locators.properties Log: - merge of changes in branch community/3.3.X to locally - r16284 through r16286 Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/repeat/RepeatTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/repeat/RepeatTestCase.java 2010-01-14 12:11:27 UTC (rev 16286) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/repeat/RepeatTestCase.java 2010-01-14 12:14:39 UTC (rev 16287) @@ -86,7 +86,7 @@ } // select some option in reason - int options = getJQueryCount(locSelectReason + "/*[@value]"); + int options = getJQueryCount(locSelectReason + " *[value]"); assertTrue(options > 0); selenium.select(locSelectReason, format("index={0}", row % options)); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/org/jboss/richfaces/integrationTest/repeat/locators.properties =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/org/jboss/richfaces/integrationTest/repeat/locators.properties 2010-01-14 12:11:27 UTC (rev 16286) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/org/jboss/richfaces/integrationTest/repeat/locators.properties 2010-01-14 12:14:39 UTC (rev 16287) @@ -1,5 +1,5 @@ FIELDSET_HEADER=jquery=legend -INPUT_PROPOSED_PRICE_PREFORMATTED=jquery\=table.rich-table tr{0,choice,0\#|1\#\:nth-child({0})} td\:eq(1) input -SELECT_REASON_PREFORMATTED=jquery\=table.rich-table tr{0,choice,0\#|1\#\:nth-child({0})} td\:eq(3) select -OUTPUT_SALES_COST_PREFORMATTED=jquery\=table.rich-table tr{0,choice,0\#|1\#\:nth-child({0})} td\:eq(2) -OUTPUT_GROSS_MARGIN_PREFORMATTED=jquery\=table.rich-table tr{0,choice,0\#|1\#\:nth-child({0})} td\:eq(4) +INPUT_PROPOSED_PRICE_PREFORMATTED=jquery\=table.rich-table tr{0,choice,0\#|1\#\:nth-child({0})} td\:nth-child(2) input +SELECT_REASON_PREFORMATTED=jquery\=table.rich-table tr{0,choice,0\#|1\#\:nth-child({0})} td\:nth-child(4) select +OUTPUT_SALES_COST_PREFORMATTED=jquery\=table.rich-table tr{0,choice,0\#|1\#\:nth-child({0})} td\:nth-child(3) +OUTPUT_GROSS_MARGIN_PREFORMATTED=jquery\=table.rich-table tr{0,choice,0\#|1\#\:nth-child({0})} td\:nth-child(5)