You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/11/26 19:58:43 UTC
[9/9] git commit: Handle the case where Prototype may not yet have
loaded when waitForCSSSelectedElementToAppear is invoked
Handle the case where Prototype may not yet have loaded when waitForCSSSelectedElementToAppear is invoked
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3dd5c8e0
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3dd5c8e0
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3dd5c8e0
Branch: refs/heads/5.4-js-rewrite
Commit: 3dd5c8e0455baabcea50a834f825bb4cab85bb02
Parents: 2ce2925
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Nov 26 09:23:40 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Nov 26 09:23:40 2012 -0800
----------------------------------------------------------------------
.../apache/tapestry5/test/SeleniumTestCase.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3dd5c8e0/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
index 3f7b33b..59d754e 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
@@ -1346,7 +1346,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
*/
protected void waitForCSSSelectedElementToAppear(String cssRule)
{
- String condition = String.format("window.$$(\"%s\").size() > 0", cssRule);
+ String condition = String.format("window.$$ && window.$$(\"%s\").size() > 0", cssRule);
waitForCondition(condition, PAGE_LOAD_TIMEOUT);
}