Author: andyhot
Date: Mon Mar 10 23:43:45 2008
New Revision: 635816
URL: http://svn.apache.org/viewvc?rev=635816&view=rev
Log:
TAPESTRY-2225: fix regression in normal refresh and cancel + added selenium
test.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry-4.1.5/form.js
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Home.html
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Tap2225.html
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/integration/TestBrowserIssues.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry-4.1.5/form.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry-4.1.5/form.js?rev=635816&r1=635815&r2=635816&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry-4.1.5/form.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry-4.1.5/form.js
Mon Mar 10 23:43:45 2008
@@ -335,12 +335,11 @@
if (parms && !dj_undef("async", parms) && parms.async){
this.submitAsync(form, null, submitName, parms);
+ form.submitmode.value = previous;
+ tapestry.form.setFormValidating(formName, validateState);
} else {
this.submit(form, submitName, parms);
}
-
- form.submitmode.value = previous;
- tapestry.form.setFormValidating(formName, validateState);
},
/**
@@ -373,12 +372,11 @@
if (parms && !dj_undef("async", parms) && parms.async){
this.submitAsync(form, null, submitName, parms);
+ form.submitmode.value = previous;
+ tapestry.form.setFormValidating(formName, validateState);
} else {
this.submit(form, submitName, parms);
}
-
- form.submitmode.value = previous;
- tapestry.form.setFormValidating(formName, validateState);
},
/**
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Home.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Home.html?rev=635816&r1=635815&r2=635816&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Home.html
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Home.html
Mon Mar 10 23:43:45 2008
@@ -4,6 +4,7 @@
<li><a jwcid="@PageLink" page="Tap1129">TAPESTRY-1129</a></li>
<li><a jwcid="@PageLink" page="Tap1141">TAPESTRY-1141</a></li>
<li><a jwcid="@PageLink" page="Tap1775">TAPESTRY-1775</a></li>
+ <li><a jwcid="@PageLink" page="Tap2225">TAPESTRY-2225</a></li>
</ul>
</body>
</html>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Tap2225.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Tap2225.html?rev=635816&r1=635815&r2=635816&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Tap2225.html
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test-data/app1/Tap2225.html
Mon Mar 10 23:43:45 2008
@@ -15,9 +15,7 @@
<input type="submit" jwcid="[EMAIL PROTECTED]" submitType="cancel"
value="CANC" updateComponents="status"/>
</form>
- <div jwcid="[EMAIL PROTECTED]">
- <span jwcid="@Insert" value="ognl:messageAsync"/>
- </div>
+ <div jwcid="[EMAIL PROTECTED]"><span jwcid="@Insert"
value="ognl:messageAsync"/></div>
</body>
</html>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/integration/TestBrowserIssues.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/integration/TestBrowserIssues.java?rev=635816&r1=635815&r2=635816&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/integration/TestBrowserIssues.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/integration/TestBrowserIssues.java
Mon Mar 10 23:43:45 2008
@@ -163,12 +163,41 @@
waitForInnerHTML("msg2", "SUCCESS");
}
- private void openIssuePage(String issue) {
+ public void test_issue_2225() throws Exception
+ {
+ openIssuePage("TAPESTRY-2225");
+
+ assertFalse(_selenium.isElementPresent("normal"));
+ assertTrue(_selenium.isElementPresent("status"));
+
+ _selenium.click("asyncR");
+ waitForInnerHTML("status", "asyncREFRESH");
+
+ _selenium.click("asyncC");
+ waitForInnerHTML("status", "asyncCANCEL");
+
+ clickAndWait("normR");
+ assertTrue(_selenium.isElementPresent("normal"));
+ assertEquals(getInnerHTML("normal"), "refresh");
+
+ clickAndWait("normC");
+ assertTrue(_selenium.isElementPresent("normal"));
+ assertEquals(getInnerHTML("normal"), "cancel");
+ }
+
+ private void openIssuePage(String issue)
+ {
_selenium.open(BASE_URL);
clickAndWait("link=" + issue);
assertTrue(_selenium.getTitle().contains(issue));
+ }
+
+ private String getInnerHTML(String elm)
+ {
+ return
_selenium.getEval("selenium.browserbot.getCurrentWindow().document.getElementById('"
+ + elm + "').innerHTML");
}
private void waitForInnerHTML(String elm, String content)
