Author: hlship
Date: Mon Sep 5 23:11:19 2011
New Revision: 1165447
URL: http://svn.apache.org/viewvc?rev=1165447&view=rev
Log:
TAP5-1631: Tapestry creates client ids for error popups containing the ':'
character, which is problematic for some browsers (and some testing tools)
Modified:
tapestry/tapestry5/trunk/build.gradle
tapestry/tapestry5/trunk/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java
Modified: tapestry/tapestry5/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1165447&r1=1165446&r2=1165447&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.gradle (original)
+++ tapestry/tapestry5/trunk/build.gradle Mon Sep 5 23:11:19 2011
@@ -2,7 +2,7 @@ description = "Apache Tapestry 5 Project
// Remember that when generating a release, this should be incremented. Also
don't forget to
// tag the release in Subversion.
-tapestryVersion = "5.3-beta-3"
+tapestryVersion = "5.3-beta-4"
jettyVersion = '7.0.0.v20091005'
tomcatVersion = '6.0.30'
Modified:
tapestry/tapestry5/trunk/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java?rev=1165447&r1=1165446&r2=1165447&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-beanvalidator/src/test/java/org/apache/tapestry5/beanvalidator/integration/TapestryBeanValidationIntegrationTests.java
Mon Sep 5 23:11:19 2011
@@ -208,7 +208,7 @@ public class TapestryBeanValidationInteg
protected final void assertBubbleMessage(String fieldId, String expected)
{
- String popupId = fieldId + ":errorpopup";
+ String popupId = fieldId + "_errorpopup";
waitForElementToAppear(popupId);
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js?rev=1165447&r1=1165446&r2=1165447&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
Mon Sep 5 23:11:19 2011
@@ -1315,7 +1315,7 @@ Tapestry.ErrorPopup = Class.create({
this.innerSpan = new Element("span");
this.outerDiv = $(new Element("div", {
- 'id' : this.field.id + ":errorpopup",
+ 'id' : this.field.id + "_errorpopup",
'class' : 't-error-popup'
})).update(this.innerSpan).hide();
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java?rev=1165447&r1=1165446&r2=1165447&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java
Mon Sep 5 23:11:19 2011
@@ -30,7 +30,7 @@ public abstract class TapestryCoreTestCa
protected final void assertBubbleMessage(String fieldId, String expected)
{
- String popupId = fieldId + ":errorpopup";
+ String popupId = fieldId + "_errorpopup";
waitForElementToAppear(popupId);
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java?rev=1165447&r1=1165446&r2=1165447&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
Mon Sep 5 23:11:19 2011
@@ -190,7 +190,7 @@ public class FormTests extends TapestryC
click(update); // but don't wait
-
waitForCondition("selenium.browserbot.getCurrentWindow().document.getElementById('zipCode:errorpopup')",
"5000");
+
waitForCondition("selenium.browserbot.getCurrentWindow().document.getElementById('zipCode_errorpopup')",
"5000");
assertTextPresent("A zip code consists of five or nine digits, eg:
02134 or 90125-4472.");
@@ -567,11 +567,11 @@ public class FormTests extends TapestryC
click(SUBMIT);
- waitForElementToAppear("amount:errorpopup");
- waitForElementToAppear("quantity:errorpopup");
+ waitForElementToAppear("amount_errorpopup");
+ waitForElementToAppear("quantity_errorpopup");
- assertText("//div[@id='amount:errorpopup']/span", "You must provide a
numeric value for Amount.");
- assertText("//div[@id='quantity:errorpopup']/span", "Provide quantity
as a number.");
+ assertText("//div[@id='amount_errorpopup']/span", "You must provide a
numeric value for Amount.");
+ assertText("//div[@id='quantity_errorpopup']/span", "Provide quantity
as a number.");
}
/**
@@ -745,9 +745,9 @@ public class FormTests extends TapestryC
click(SUBMIT);
- waitForElementToAppear("longValue:errorpopup");
+ waitForElementToAppear("longValue_errorpopup");
- assertText("//div[@id='longValue:errorpopup']/span", "You must provide
an integer value for Long Value.");
+ assertText("//div[@id='longValue_errorpopup']/span", "You must provide
an integer value for Long Value.");
type("longValue", "37");
@@ -807,7 +807,7 @@ public class FormTests extends TapestryC
click("//a[@id='fred']");
- waitForElementToAppear("name:errorpopup");
+ waitForElementToAppear("name_errorpopup");
assertTextPresent("You must provide a value for Name.");
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java?rev=1165447&r1=1165446&r2=1165447&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java
Mon Sep 5 23:11:19 2011
@@ -188,7 +188,7 @@ public class ZoneTests extends TapestryC
click("//a[@id='mySubmit']");
- waitForElementToAppear("value:errorpopup");
+ waitForElementToAppear("value_errorpopup");
type("value", "robot chicken");
