[gatewiki-commits] SF.net SVN: gatewiki:[1799] trunk/cow
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
[gatewiki-commits] SF.net SVN: gatewiki:[1799] trunk/cow
by ian_roberts
::
Rate this Message:
Revision: 1799
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1799&view=rev Author: ian_roberts Date: 2009-11-10 11:36:41 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Use real redirections rather than meta refresh at the end of the edit flow. Selenium test modifications are simply that this means one fewer page refresh at the end of a flow, so I've removed a waitForPageToLoad. Modified Paths: -------------- trunk/cow/grails-app/views/page/edit/errorExit.gsp trunk/cow/grails-app/views/page/edit/normalExit.gsp trunk/cow/selenium/tests/basic-show-edit.html trunk/cow/selenium/tests/link-regeneration.html trunk/cow/selenium/tests/newpage.html trunk/cow/selenium/tests/user-writing.html trunk/cow/selenium/workstation-suite.html Modified: trunk/cow/grails-app/views/page/edit/errorExit.gsp =================================================================== --- trunk/cow/grails-app/views/page/edit/errorExit.gsp 2009-11-10 11:08:27 UTC (rev 1798) +++ trunk/cow/grails-app/views/page/edit/errorExit.gsp 2009-11-10 11:36:41 UTC (rev 1799) @@ -1,26 +1,16 @@ -<html> - <head> - <title>CoW: Controllable Wiki</title> - <g:if test="${id && pageExists}"> - <meta http-equiv="refresh" - content="0;url=${pageURI(action:'show', id:id, linkPath:pagePath)}" - /> - </g:if> - <g:else> - <meta http-equiv="refresh" - content="0;url=${pageURI(action:'show', id:id, linkPath:'help/')}" - /> - </g:else> - <% flash.message = message %> - <% flash.errMessage = errMessage %> - <g:handleWebFlowException exception="${rootCauseException}" /> - </head> - <body> - <g:if test="${id && pageExists}"> - <p style="text-align: center;">You should be automatically redirected but if not click <a href="${pageURI(action:'show', id:id, linkPath:pagePath)}">here</a>. - </g:if> - <g:else> - <p style="text-align: center;">You should be automatically redirected but if not click <a href="${pageURI(action:'show', id:id, linkPath:'help/')}">here</a>. - </g:else> - </body> -</html> +<% + flash.message = message + flash.errMessage = errMessage + g.handleWebFlowException(exception:rootCauseException) + def theID + def thePath + if(id && pageExists) { + theID = id + thePath = pagePath + } else { + theID = 2 + thePath = '/' + } + response.sendRedirect(pageURI(action:'show', id:theID, linkPath:thePath)) + +%> Modified: trunk/cow/grails-app/views/page/edit/normalExit.gsp =================================================================== --- trunk/cow/grails-app/views/page/edit/normalExit.gsp 2009-11-10 11:08:27 UTC (rev 1798) +++ trunk/cow/grails-app/views/page/edit/normalExit.gsp 2009-11-10 11:36:41 UTC (rev 1799) @@ -1,14 +1,6 @@ -<html> - <head> - <title>CoW: Controllable Wiki</title> - <meta http-equiv="refresh" - content="0;url=${pageURI(action:(action?:'show'), id:id, linkPath:pagePath)}" - /> - <% flash.message = message %> - <% flash.errMessage = errMessage %> - </head> - <body> - <p style="text-align: center;">You should be automatically redirected but if not click <a href="${pageURI(action:(action?:'show'), id:id, linkPath:pagePath)}">here</a>. - </body> -</html> - +<% + flash.message = message + flash.errMessage = errMessage + response.sendRedirect(pageURI(action:(action?:'show'), id:id, + linkPath:pagePath)) +%> Modified: trunk/cow/selenium/tests/basic-show-edit.html =================================================================== --- trunk/cow/selenium/tests/basic-show-edit.html 2009-11-10 11:08:27 UTC (rev 1798) +++ trunk/cow/selenium/tests/basic-show-edit.html 2009-11-10 11:36:41 UTC (rev 1799) @@ -57,11 +57,6 @@ <td></td> </tr> <tr> - <td>waitForPageToLoad</td> - <td>10000</td> - <td></td> -</tr> -<tr> <td>clickAndWait</td> <td>link=Help</td> <td></td> Modified: trunk/cow/selenium/tests/link-regeneration.html =================================================================== --- trunk/cow/selenium/tests/link-regeneration.html 2009-11-10 11:08:27 UTC (rev 1798) +++ trunk/cow/selenium/tests/link-regeneration.html 2009-11-10 11:36:41 UTC (rev 1799) @@ -122,7 +122,7 @@ <!--Check link for non existent page is in red--> <tr> <td>verifyHtmlSource</td> - <td>*<a class="cow-non-existant-url" href="new-page.html">new-page.html</a>*</td> + <td>*<a class="cow-non-existant-url" href="new-page.html?m=1">new-page.html</a>*</td> <td></td> </tr> <!--Create page for non existent link--> @@ -165,24 +165,29 @@ <!--Delete test Wiki--> <tr> <td>open</td> - <td>/admin/</td> + <td>/wiki/show/${id}</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=Wiki areas</td> + <td>click</td> + <td>_action_Delete</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=${id}</td> + <td>assertConfirmation</td> + <td>Are you sure?</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>_action_Delete</td> + <td>waitForPageToLoad</td> + <td>10000</td> <td></td> </tr> +<tr> + <td>assertText</td> + <td>//div[@class='body']/div[@class='message']</td> + <td>Wiki ${id} deleted</td> +</tr> </tbody></table> </body> Modified: trunk/cow/selenium/tests/newpage.html =================================================================== --- trunk/cow/selenium/tests/newpage.html 2009-11-10 11:08:27 UTC (rev 1798) +++ trunk/cow/selenium/tests/newpage.html 2009-11-10 11:36:41 UTC (rev 1799) @@ -107,11 +107,6 @@ <td></td> </tr> <tr> - <td>waitForPageToLoad</td> - <td>10000</td> - <td></td> -</tr> -<tr> <td>verifyTextPresent</td> <td>Edit on page index.html saved</td> <td></td> Modified: trunk/cow/selenium/tests/user-writing.html =================================================================== --- trunk/cow/selenium/tests/user-writing.html 2009-11-10 11:08:27 UTC (rev 1798) +++ trunk/cow/selenium/tests/user-writing.html 2009-11-10 11:36:41 UTC (rev 1799) @@ -312,11 +312,6 @@ <td></td> </tr> <tr> - <td>waitForPageToLoad</td> - <td>10000</td> - <td></td> -</tr> -<tr> <td>verifyTextPresent</td> <td>Edit on page index.html saved</td> <td></td> Modified: trunk/cow/selenium/workstation-suite.html =================================================================== --- trunk/cow/selenium/workstation-suite.html 2009-11-10 11:08:27 UTC (rev 1798) +++ trunk/cow/selenium/workstation-suite.html 2009-11-10 11:36:41 UTC (rev 1799) @@ -9,7 +9,7 @@ <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody> <tr><td><b>Test Suite</b></td></tr> <tr><td><a href="tests/basic-show-edit.html">basic-show-edit</a></td></tr> - <tr><td><a href="tests/basic-show-edit.html">link-regeneration</a></td></tr> + <tr><td><a href="tests/link-regeneration.html">link-regeneration</a></td></tr> <tr><td><a href="tests/newpage.html">newpage</a></td></tr> <tr><td><a href="tests/upload.html">upload</a></td></tr> </tbody></table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ gatewiki-commits mailing list gatewiki-commits@... https://lists.sourceforge.net/lists/listinfo/gatewiki-commits |
| Free embeddable forum powered by Nabble | Forum Help |
