Updated Branches: refs/heads/master 6ef638659 -> 1ae5f834c
Fix a number of tests Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1ae5f834 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1ae5f834 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1ae5f834 Branch: refs/heads/master Commit: 1ae5f834c5018d6f30df222a76ed219d5eb2f670 Parents: 6ef6386 Author: Howard M. Lewis Ship <[email protected]> Authored: Fri Aug 23 15:19:00 2013 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Fri Aug 23 15:19:13 2013 -0700 ---------------------------------------------------------------------- .../src/test/app1/AutocompleteDemo.tml | 2 +- .../src/test/app1/BeanEditorOverride.tml | 33 ++++++++++---------- tapestry-core/src/test/app1/DateFieldDemo.tml | 25 ++++++--------- tapestry-core/src/test/app1/SelectZoneDemo.tml | 5 ++- .../tapestry5/integration/app1/MiscTests.groovy | 4 +-- .../tapestry5/integration/app1/FormTests.java | 6 ++-- 6 files changed, 34 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ae5f834/tapestry-core/src/test/app1/AutocompleteDemo.tml ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/app1/AutocompleteDemo.tml b/tapestry-core/src/test/app1/AutocompleteDemo.tml index 842f788..d656ab5 100644 --- a/tapestry-core/src/test/app1/AutocompleteDemo.tml +++ b/tapestry-core/src/test/app1/AutocompleteDemo.tml @@ -5,7 +5,7 @@ <t:errors/> - <t:textfield t:id="title" t:mixins="autocomplete,fieldgroup" tokens=",;" size="60"/> + <t:textfield t:id="title" t:mixins="autocomplete,formgroup" tokens=",;" size="60"/> <div class="form-actions"> <input type="submit" class="btn btn-primary" value="Show Track"/> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ae5f834/tapestry-core/src/test/app1/BeanEditorOverride.tml ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/app1/BeanEditorOverride.tml b/tapestry-core/src/test/app1/BeanEditorOverride.tml index 602f454..1dd26b9 100644 --- a/tapestry-core/src/test/app1/BeanEditorOverride.tml +++ b/tapestry-core/src/test/app1/BeanEditorOverride.tml @@ -1,25 +1,26 @@ <html t:type="Border" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd";> + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd"; + xmlns:p="tapestry:parameter"> - <h1>BeanEditor Override Demo</h1> +<h1>BeanEditor Override Demo</h1> - <p>Demonstrates that the BeanEditor properly supports overrides of its property editors.</p> +<p>Demonstrates that the BeanEditor properly supports overrides of its property editors.</p> - <form t:id="form"> - <t:errors/> +<form t:id="form"> + <t:errors/> - <div class="t-beaneditor"> - <div t:id="editor"> - <t:parameter name="firstName"> - <t:label for="firstName"/> - <t:textfield t:id="firstName" value="registrationData.firstName"/> - [FirstName Property Editor Override] - </t:parameter> - </div> + <div class="t-beaneditor"> + <div t:id="editor"> + <p:firstName> + <t:label for="firstName"/> + <t:textfield t:id="firstName" value="registrationData.firstName"/> + [FirstName Property Editor Override] + </p:firstName> </div> + </div> - <input type="submit" value="Register" class="btn btn-primary"/> - <t:actionlink t:id="clear" class="btn btn-default">Clear Data</t:actionlink> - </form> + <input type="submit" value="Register" class="btn btn-primary"/> + <t:actionlink t:id="clear" class="btn btn-default">Clear Data</t:actionlink> +</form> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ae5f834/tapestry-core/src/test/app1/DateFieldDemo.tml ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/app1/DateFieldDemo.tml b/tapestry-core/src/test/app1/DateFieldDemo.tml index e8544ca..ff21040 100644 --- a/tapestry-core/src/test/app1/DateFieldDemo.tml +++ b/tapestry-core/src/test/app1/DateFieldDemo.tml @@ -6,32 +6,25 @@ <t:form> <t:errors/> - <div class="control-group x-birthday"> + <div class="field-group x-birthday"> <t:label for="birthday"/> - <div class="controls"> - <t:datefield format="d MMM yyyy" hidetextfield="true" t:id="birthday"/> - </div> + <t:datefield format="d MMM yyyy" hidetextfield="true" t:id="birthday"/> </div> - <div class="control-group x-impact"> + <div class="field-group x-impact"> <t:label for="asteroidImpact"/> - <div class="controls"> - <t:datefield t:id="asteroidImpact"/> - </div> + <t:datefield t:id="asteroidImpact"/> </div> - - <div class="form-actions"> - <input type="submit" value="Go" class="btn btn-primary"/> - </div> + <input type="submit" value="Go" class="btn btn-primary"/> </t:form> -<div class="btn-toolbar btn-group"> +<div class="btn-group"> - <t:actionlink class="btn" t:id="clear">clear</t:actionlink> - <t:actionlink class="btn" t:id="english">english</t:actionlink> - <t:actionlink class="btn" t:id="french">french</t:actionlink> + <t:actionlink class="btn btn-default" t:id="clear">clear</t:actionlink> + <t:actionlink class="btn btn-default" t:id="english">english</t:actionlink> + <t:actionlink class="btn btn-default" t:id="french">french</t:actionlink> </div> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ae5f834/tapestry-core/src/test/app1/SelectZoneDemo.tml ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/app1/SelectZoneDemo.tml b/tapestry-core/src/test/app1/SelectZoneDemo.tml index 540980c..2f0dcbe 100644 --- a/tapestry-core/src/test/app1/SelectZoneDemo.tml +++ b/tapestry-core/src/test/app1/SelectZoneDemo.tml @@ -12,10 +12,9 @@ <t:form class="well"> <t:errors/> - <t:select t:id="carMaker" validate="required" t:mixins="fieldgroup" + <t:select t:id="carMaker" validate="required" t:mixins="formgroup" model="makeModel" zone="modelZone" encoder="makeEncoder"/> - <t:zone t:id="modelZone"> <t:if test="carMaker"> <t:delegate to="modelBlock"/> @@ -24,7 +23,7 @@ <t:block id="modelBlock"> <t:select t:id="carModel" model="availableModels" validate="required" blankOption="always" - t:mixins="fieldgroup"/> + t:mixins="formgroup"/> </t:block> <div class="form-actions"> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ae5f834/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy index e18ac74..a64a22d 100644 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy @@ -25,10 +25,10 @@ class MiscTests extends TapestryCoreTestCase { } @Test - void FieldGroup_mixin() { + void FormGroup_mixin() { openLinks "Autocomplete Mixin Demo" - assertText "css=div.field-group > label", "Title" + assertText "css=div.form-group > label", "Title" // Using Geb, we could do a lot more. Sigh. } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ae5f834/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java index 6c4bd07..74fa2ea 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java @@ -220,7 +220,7 @@ public class FormTests extends TapestryCoreTestCase waitForPageInitialized(); - click("css=.x-birthday i.icon-calendar"); + click("css=.x-birthday .btn"); sleep(AJAX_WAIT_TIME); @@ -477,8 +477,6 @@ public class FormTests extends TapestryCoreTestCase "//div[@class='palette-selected']//select", - "//div[@class='palette-controls']//button", - "//input[@id='submit_0']"}; for (String path : paths) @@ -487,6 +485,8 @@ public class FormTests extends TapestryCoreTestCase assertAttribute(locator, "disabled"); } + + assertAttribute("css=div.palette .btn@disabled", "disabled"); } /**
