Updated Branches: refs/heads/master b88f6fce5 -> 70889263a
Fix remaining broken 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/2cbe72ec Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2cbe72ec Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2cbe72ec Branch: refs/heads/master Commit: 2cbe72ec35ed09e2bac697a705bba75e40f0ae34 Parents: b88f6fc Author: Howard M. Lewis Ship <[email protected]> Authored: Sat Aug 24 07:38:06 2013 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Sat Aug 24 07:38:06 2013 -0700 ---------------------------------------------------------------------- .../org/apache/tapestry5/integration/app1/MiscTests.groovy | 3 ++- .../java/org/apache/tapestry5/integration/app1/FormTests.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2cbe72ec/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 a64a22d..f0a5c3d 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 @@ -34,12 +34,13 @@ class MiscTests extends TapestryCoreTestCase { } // TAP5-2045 + // No longer such a big deal, as Label no longer has a formal "class" parameter @Test void label_class_override() { openLinks "Override Label Class Demo" - assertSourcePresent "<label for=\"firstName\" class=\"control-label\">First Name</label>", + assertSourcePresent "<label for=\"firstName\">First Name</label>", "<label for=\"lastName\" class=\"dummyClassName\">Last Name</label>" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2cbe72ec/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 74fa2ea..46b2d43 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 @@ -530,10 +530,10 @@ public class FormTests extends TapestryCoreTestCase // ComponentFieldValidator.isRequired() assertSourcePresent( - "[Before label for Value]<label for=\"value\" class=\"control-label\">Value</label>[After label for Value]", + "[Before label for Value]<label for=\"value\">Value</label>[After label for Value]", "[Before field Value]", "[After field Value (optional)]", - "[Before label for Required Value]<label for=\"requiredValue\" class=\"control-label\">Required Value</label>[After label for Required Value]", + "[Before label for Required Value]<label for=\"requiredValue\">Required Value</label>[After label for Required Value]", "[Before field Required Value]", "[After field Required Value (required)]"); }
