Repository: wicket Updated Branches: refs/heads/master 830fb15c3 -> 4ec7c6260
WICKET-6523 browser auto start; fixed version parameter when choosing from modules or filtering Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2da55051 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2da55051 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2da55051 Branch: refs/heads/master Commit: 2da550519a80268531a479bc6abf382427c9f399 Parents: c989470 Author: Sven Meier <[email protected]> Authored: Thu Jan 25 17:09:16 2018 +0100 Committer: Sven Meier <[email protected]> Committed: Tue Feb 6 16:20:11 2018 +0100 ---------------------------------------------------------------------- .../testing/jstest/StartJavaScriptTests.java | 17 +++++++++++++++++ wicket-core/src/test/js/ajax.js | 8 +------- wicket-core/src/test/js/all.html | 5 ++++- 3 files changed, 22 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2da55051/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java ---------------------------------------------------------------------- diff --git a/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java b/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java index 3197a95..ee9ae3c 100644 --- a/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java +++ b/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java @@ -16,7 +16,9 @@ */ package org.apache.wicket.testing.jstest; +import java.awt.Desktop; import java.lang.management.ManagementFactory; +import java.net.URI; import javax.management.MBeanServer; @@ -112,6 +114,9 @@ public class StartJavaScriptTests try { server.start(); + + browse(); + server.join(); } catch (Exception e) @@ -121,6 +126,18 @@ public class StartJavaScriptTests } } + private static void browse() + { + try + { + Desktop.getDesktop().browse(new URI("http://localhost:8080/ajax-tests/test/js/all.html?2.2.4";)); + } + catch (Exception e) + { + System.out.println("can not open browser " + e); + } + } + /** * Construct. */ http://git-wip-us.apache.org/repos/asf/wicket/blob/2da55051/wicket-core/src/test/js/ajax.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/js/ajax.js b/wicket-core/src/test/js/ajax.js index 09f999d..f95c702 100644 --- a/wicket-core/src/test/js/ajax.js +++ b/wicket-core/src/test/js/ajax.js @@ -31,13 +31,7 @@ </Directory> - ... or tweak wicket-examples' StartExamples.java like so: - - bb.setContextPath("/ajax-tests"); - bb.setWar("../wicket-core/src"); - - then run it by opening "http://localhost/ajax-tests/test/js/all.html"; in the browser - + Or start StartJavaScriptTests.java in project wicket-js-tests. */ /*global ok: true, start: true, asyncTest: true, test: true, equal: true, deepEqual: true, http://git-wip-us.apache.org/repos/asf/wicket/blob/2da55051/wicket-core/src/test/js/all.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/js/all.html b/wicket-core/src/test/js/all.html index 081c370..b5d8beb 100644 --- a/wicket-core/src/test/js/all.html +++ b/wicket-core/src/test/js/all.html @@ -6,7 +6,10 @@ <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" /> <script> - document.write("<scr"+"ipt src='../../main/java/org/apache/wicket/resource/jquery/jquery-"+location.search.substring(1)+".js'></scr"+"ipt>"); + // version lies between question mark and first ampersand (or end) + var version = location.search.match(/\?(.*?)(&|$)/)[1]; + + document.write("<scr"+"ipt src='../../main/java/org/apache/wicket/resource/jquery/jquery-"+version+".js'></scr"+"ipt>"); </script> <!--<script src="https://code.jquery.com/jquery-migrate-3.0.0.js";></script>--> <script src="../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js"></script>
