You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2013/06/04 19:03:13 UTC
[1/3] git commit: Move the "data-page-initialized" attribute to the
tag, easier to reference when using Geb
Updated Branches:
refs/heads/master 85284b2b1 -> a8b333601
Move the "data-page-initialized" attribute to the <body> tag, easier to reference when using Geb
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8808d63d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8808d63d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8808d63d
Branch: refs/heads/master
Commit: 8808d63d7406f83d888b451749b8a645c815ecca
Parents: 85284b2
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Jun 4 10:00:43 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Jun 4 10:00:43 2013 -0700
----------------------------------------------------------------------
.../META-INF/modules/t5/core/pageinit.coffee | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8808d63d/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee
index 677458d..a580de0 100644
--- a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee
+++ b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/pageinit.coffee
@@ -122,7 +122,7 @@ define ["underscore", "./console", "./dom", "./events"],
# be ready to go. We set a flag, mostly used by test suites, to ensure that all is ready.
# Note that later Ajax requests do not change this attribute, so their timing continues to be tricky.
- (dom document.documentElement).attribute "data-page-initialized", "true"
+ dom.body().attribute "data-page-initialized", "true"
exports = _.extend loadLibrariesAndInitialize,
# Passed a list of initializers, executes each initializer in order. Due to asynchronous loading
[2/3] git commit: Update script to compile to same place as Gradle
build
Posted by hl...@apache.org.
Update script to compile to same place as Gradle build
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2aa9b521
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2aa9b521
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2aa9b521
Branch: refs/heads/master
Commit: 2aa9b52162688973df7e56151745c4e8bbf10450
Parents: 8808d63
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Jun 4 10:01:00 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Jun 4 10:01:00 2013 -0700
----------------------------------------------------------------------
tapestry-core/compile-coffeescript | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2aa9b521/tapestry-core/compile-coffeescript
----------------------------------------------------------------------
diff --git a/tapestry-core/compile-coffeescript b/tapestry-core/compile-coffeescript
index ced00b3..fd83081 100755
--- a/tapestry-core/compile-coffeescript
+++ b/tapestry-core/compile-coffeescript
@@ -6,7 +6,7 @@
# Doe NOT compile the test scripts.
inputDir=src/main/coffeescript
-outputDir=build/generated-sources/compiled-coffeescript
+outputDir=src/main/generated/compiled-coffeescript
# Because all of these are AMD modules, they don't need a hygenic function wrapper,
# so we can use --bare
[3/3] git commit: Add tests for Less compilation
Posted by hl...@apache.org.
Add tests for Less compilation
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a8b33360
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a8b33360
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a8b33360
Branch: refs/heads/master
Commit: a8b3336014cb94612c5ac6160552ba639170480d
Parents: 2aa9b52
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Jun 4 10:01:12 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Jun 4 10:01:12 2013 -0700
----------------------------------------------------------------------
.../test/groovy/t5/wro4j/tests/Wro4jSpec.groovy | 21 ++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a8b33360/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy b/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy
index 1d0e5c9..ee37621 100644
--- a/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy
+++ b/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy
@@ -26,7 +26,7 @@ class Wro4jSpec extends GebSpec {
// Open index page
go()
- waitFor { ! $("#banner").empty }
+ waitFor { !$("body[data-page-initialized]").empty }
then:
@@ -34,4 +34,23 @@ class Wro4jSpec extends GebSpec {
// means that the CoffeeScript was compiled to JS and executed.
$("#banner").text().trim() == "Index module loaded, bare!"
}
+
+ def "Less compilation"() {
+
+ when:
+
+ go()
+
+ waitFor { !$("body[data-page-initialized]").empty }
+
+ $(".navbar .dropdown-toggle").click()
+
+ $(".navbar .dropdown-menu a", text: "MultiLess").click()
+
+ waitFor { !$(".demo").empty }
+
+ then:
+
+ $(".demo").jquery.css("background-color") == "rgb(179, 179, 255)"
+ }
}
[3/3] git commit: Add tests for Less compilation
Posted by hl...@apache.org.
Add tests for Less compilation
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a8b33360
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a8b33360
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a8b33360
Branch: refs/heads/master
Commit: a8b3336014cb94612c5ac6160552ba639170480d
Parents: 2aa9b52
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Jun 4 10:01:12 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Jun 4 10:01:12 2013 -0700
----------------------------------------------------------------------
.../test/groovy/t5/wro4j/tests/Wro4jSpec.groovy | 21 ++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a8b33360/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy
----------------------------------------------------------------------
diff --git a/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy b/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy
index 1d0e5c9..ee37621 100644
--- a/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy
+++ b/tapestry-wro4j/src/test/groovy/t5/wro4j/tests/Wro4jSpec.groovy
@@ -26,7 +26,7 @@ class Wro4jSpec extends GebSpec {
// Open index page
go()
- waitFor { ! $("#banner").empty }
+ waitFor { !$("body[data-page-initialized]").empty }
then:
@@ -34,4 +34,23 @@ class Wro4jSpec extends GebSpec {
// means that the CoffeeScript was compiled to JS and executed.
$("#banner").text().trim() == "Index module loaded, bare!"
}
+
+ def "Less compilation"() {
+
+ when:
+
+ go()
+
+ waitFor { !$("body[data-page-initialized]").empty }
+
+ $(".navbar .dropdown-toggle").click()
+
+ $(".navbar .dropdown-menu a", text: "MultiLess").click()
+
+ waitFor { !$(".demo").empty }
+
+ then:
+
+ $(".demo").jquery.css("background-color") == "rgb(179, 179, 255)"
+ }
}
[2/3] git commit: Update script to compile to same place as Gradle
build
Posted by hl...@apache.org.
Update script to compile to same place as Gradle build
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2aa9b521
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2aa9b521
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2aa9b521
Branch: refs/heads/master
Commit: 2aa9b52162688973df7e56151745c4e8bbf10450
Parents: 8808d63
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Jun 4 10:01:00 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Jun 4 10:01:00 2013 -0700
----------------------------------------------------------------------
tapestry-core/compile-coffeescript | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2aa9b521/tapestry-core/compile-coffeescript
----------------------------------------------------------------------
diff --git a/tapestry-core/compile-coffeescript b/tapestry-core/compile-coffeescript
index ced00b3..fd83081 100755
--- a/tapestry-core/compile-coffeescript
+++ b/tapestry-core/compile-coffeescript
@@ -6,7 +6,7 @@
# Doe NOT compile the test scripts.
inputDir=src/main/coffeescript
-outputDir=build/generated-sources/compiled-coffeescript
+outputDir=src/main/generated/compiled-coffeescript
# Because all of these are AMD modules, they don't need a hygenic function wrapper,
# so we can use --bare