You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/10/27 20:46:51 UTC
[4/4] wicket git commit: WicketWICKET-6263 Fix JavaScript tests to
pass with jQuery 2.x. and 3.x
WicketWICKET-6263 Fix JavaScript tests to pass with jQuery 2.x. and 3.x
Add checks in the tests for the version of jQuery and whether they run in PhantomJS.
Improve Gulp setup to run the tests against latest 1.x, 2.x and 3.x of jQuery
Update Node.js and NPM.js versions to their latest versions
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ed872b82
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ed872b82
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ed872b82
Branch: refs/heads/master
Commit: ed872b8214314f7b22dbe162b9fef31613531f6b
Parents: 8313bd5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Oct 27 22:44:51 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Oct 27 22:46:06 2016 +0200
----------------------------------------------------------------------
testing/wicket-js-tests/Gruntfile.js | 19 +-
testing/wicket-js-tests/pom.xml | 4 +-
.../wicket/resource/jquery/jquery-3.1.1.js | 10220 +++++++++++++++++
.../wicket/resource/jquery/jquery-3.1.1.min.js | 4 +
wicket-core/src/test/js/ajax.js | 14 +-
wicket-core/src/test/js/all.html | 7 +-
wicket-core/src/test/js/amd.html | 2 +-
wicket-core/src/test/js/dom.js | 18 +-
wicket-core/src/test/js/event.js | 10 +-
wicket-core/src/test/js/form.js | 6 +-
10 files changed, 10279 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed872b82/testing/wicket-js-tests/Gruntfile.js
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/Gruntfile.js b/testing/wicket-js-tests/Gruntfile.js
index ed16b6d..af593e7 100644
--- a/testing/wicket-js-tests/Gruntfile.js
+++ b/testing/wicket-js-tests/Gruntfile.js
@@ -114,7 +114,11 @@ module.exports = function(grunt) {
*/
all: {
options: {
- urls: ['http://localhost:38887/test/js/all.html']
+ urls: [
+ 'http://localhost:38887/test/js/all.html?1.12.4',
+ 'http://localhost:38887/test/js/all.html?2.2.4',
+ 'http://localhost:38887/test/js/all.html?3.1.1'
+ ]
}
},
@@ -123,14 +127,13 @@ module.exports = function(grunt) {
*/
amd: {
options: {
- urls: ['http://localhost:38887/test/js/amd.html']
+ urls: [
+ 'http://localhost:38887/test/js/amd.html?1.12.4',
+ 'http://localhost:38887/test/js/amd.html?2.2.4',
+ 'http://localhost:38887/test/js/amd.html?3.1.1'
+ ]
}
- },
-
- /*
- * Runs only local tests (w/o ajax ones).
- */
- local: ['../../wicket-core/src/test/js/all.html']
+ }
},
connect: {
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed872b82/testing/wicket-js-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 77e6adf..56fe7ec 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -72,8 +72,8 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <npmVersion>3.10.8</npmVersion>
- <nodeVersion>v6.8.1</nodeVersion>
+ <npmVersion>3.10.9</npmVersion>
+ <nodeVersion>v7.0.0</nodeVersion>
</configuration>
</execution>
<execution>