WICKET-7072 Move back the JS tests to wicket-core/src/test/js

Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
apache · Sep 25, 2023 · d6897c4 · d6897c4
1 parent 39be9a9
commit d6897c4
Show file tree

Hide file tree

Showing 34 changed files with 1 addition and 2 deletions.
diff --git a/testing/wicket-js-tests/Gruntfile.js b/testing/wicket-js-tests/Gruntfile.js
@@ -128,7 +128,7 @@ module.exports = function(grunt) {
 			server: {
 				options: {
 					port: 38887,
-//					debug: true,
+					debug: true,
 					middleware: function(connect, options, middlewares) {
 						middlewares.unshift(function(req, res, next) {
 							if (req.url.indexOf('submitNestedForm') > 0) {

diff --git a/wicket-core-tests/src/test/js/ajax.js → wicket-core/src/test/js/ajax.js b/wicket-core-tests/src/test/js/ajax.js → wicket-core/src/test/js/ajax.js
diff --git a/wicket-core-tests/src/test/js/all.html → wicket-core/src/test/js/all.html b/wicket-core-tests/src/test/js/all.html → wicket-core/src/test/js/all.html
@@ -165,7 +165,6 @@
 
 		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>
 	<script type="text/javascript" src="qunit/qunit.js"></script>
 	<script type="text/javascript" src="qunit/jquery.mockjax.js"></script>

diff --git a/wicket-core-tests/src/test/js/amd.html → wicket-core/src/test/js/amd.html b/wicket-core-tests/src/test/js/amd.html → wicket-core/src/test/js/amd.html
diff --git a/wicket-core-tests/src/test/js/amd.js → wicket-core/src/test/js/amd.js b/wicket-core-tests/src/test/js/amd.js → wicket-core/src/test/js/amd.js
diff --git a/wicket-core-tests/src/test/js/amd/require.js → wicket-core/src/test/js/amd/require.js b/wicket-core-tests/src/test/js/amd/require.js → wicket-core/src/test/js/amd/require.js
diff --git a/wicket-core-tests/src/test/js/channels.js → wicket-core/src/test/js/channels.js b/wicket-core-tests/src/test/js/channels.js → wicket-core/src/test/js/channels.js
diff --git a/.../test/js/data/ajax/complexComponentId.xml → .../test/js/data/ajax/complexComponentId.xml b/.../test/js/data/ajax/complexComponentId.xml → .../test/js/data/ajax/complexComponentId.xml
diff --git a/...js/data/ajax/componentDoesNotExistsId.xml → ...js/data/ajax/componentDoesNotExistsId.xml b/...js/data/ajax/componentDoesNotExistsId.xml → ...js/data/ajax/componentDoesNotExistsId.xml
diff --git a/...sts/src/test/js/data/ajax/componentId.xml → ...ore/src/test/js/data/ajax/componentId.xml b/...sts/src/test/js/data/ajax/componentId.xml → ...ore/src/test/js/data/ajax/componentId.xml
diff --git a/.../js/data/ajax/componentToReplaceTitle.xml → .../js/data/ajax/componentToReplaceTitle.xml b/.../js/data/ajax/componentToReplaceTitle.xml → .../js/data/ajax/componentToReplaceTitle.xml
diff --git a/...c/test/js/data/ajax/emptyAjaxResponse.xml → ...c/test/js/data/ajax/emptyAjaxResponse.xml b/...c/test/js/data/ajax/emptyAjaxResponse.xml → ...c/test/js/data/ajax/emptyAjaxResponse.xml
diff --git a/...ts/src/test/js/data/ajax/evaluationId.xml → ...re/src/test/js/data/ajax/evaluationId.xml b/...ts/src/test/js/data/ajax/evaluationId.xml → ...re/src/test/js/data/ajax/evaluationId.xml
diff --git a/...ta/ajax/evaluationIdentifierAndCodeId.xml → ...ta/ajax/evaluationIdentifierAndCodeId.xml b/...ta/ajax/evaluationIdentifierAndCodeId.xml → ...ta/ajax/evaluationIdentifierAndCodeId.xml
diff --git a/.../test/js/data/ajax/javaScriptTemplate.xml → .../test/js/data/ajax/javaScriptTemplate.xml b/.../test/js/data/ajax/javaScriptTemplate.xml → .../test/js/data/ajax/javaScriptTemplate.xml
diff --git a/.../js/data/ajax/manyEvaluationsResponse.xml → .../js/data/ajax/manyEvaluationsResponse.xml b/.../js/data/ajax/manyEvaluationsResponse.xml → .../js/data/ajax/manyEvaluationsResponse.xml
diff --git a/...re-tests/src/test/js/data/ajax/metaId.xml → wicket-core/src/test/js/data/ajax/metaId.xml b/...re-tests/src/test/js/data/ajax/metaId.xml → wicket-core/src/test/js/data/ajax/metaId.xml
diff --git a/...jax/multipleEvaluationsWithIdentifier.xml → ...jax/multipleEvaluationsWithIdentifier.xml b/...jax/multipleEvaluationsWithIdentifier.xml → ...jax/multipleEvaluationsWithIdentifier.xml
diff --git a/.../test/js/data/ajax/nonWicketResponse.json → .../test/js/data/ajax/nonWicketResponse.json b/.../test/js/data/ajax/nonWicketResponse.json → .../test/js/data/ajax/nonWicketResponse.json
diff --git a/...est/js/data/ajax/redirectAjaxResponse.xml → ...est/js/data/ajax/redirectAjaxResponse.xml b/...est/js/data/ajax/redirectAjaxResponse.xml → ...est/js/data/ajax/redirectAjaxResponse.xml
diff --git a/...rc/test/js/data/ajax/submitNestedForm.xml → ...rc/test/js/data/ajax/submitNestedForm.xml b/...rc/test/js/data/ajax/submitNestedForm.xml → ...rc/test/js/data/ajax/submitNestedForm.xml
diff --git a/wicket-core-tests/src/test/js/data/start.js → wicket-core/src/test/js/data/start.js b/wicket-core-tests/src/test/js/data/start.js → wicket-core/src/test/js/data/start.js
diff --git a/wicket-core-tests/src/test/js/data/test.css → wicket-core/src/test/js/data/test.css b/wicket-core-tests/src/test/js/data/test.css → wicket-core/src/test/js/data/test.css
diff --git a/wicket-core-tests/src/test/js/data/test.js → wicket-core/src/test/js/data/test.js b/wicket-core-tests/src/test/js/data/test.js → wicket-core/src/test/js/data/test.js
diff --git a/wicket-core-tests/src/test/js/data/test.png → wicket-core/src/test/js/data/test.png b/wicket-core-tests/src/test/js/data/test.png → wicket-core/src/test/js/data/test.png
diff --git a/wicket-core-tests/src/test/js/dom.js → wicket-core/src/test/js/dom.js b/wicket-core-tests/src/test/js/dom.js → wicket-core/src/test/js/dom.js
diff --git a/wicket-core-tests/src/test/js/event.js → wicket-core/src/test/js/event.js b/wicket-core-tests/src/test/js/event.js → wicket-core/src/test/js/event.js
diff --git a/wicket-core-tests/src/test/js/form.js → wicket-core/src/test/js/form.js b/wicket-core-tests/src/test/js/form.js → wicket-core/src/test/js/form.js
diff --git a/wicket-core-tests/src/test/js/head.js → wicket-core/src/test/js/head.js b/wicket-core-tests/src/test/js/head.js → wicket-core/src/test/js/head.js
diff --git a/...re-tests/src/test/js/qunit/blanket.min.js → wicket-core/src/test/js/qunit/blanket.min.js b/...re-tests/src/test/js/qunit/blanket.min.js → wicket-core/src/test/js/qunit/blanket.min.js
diff --git a/...tests/src/test/js/qunit/jquery.mockjax.js → ...-core/src/test/js/qunit/jquery.mockjax.js b/...tests/src/test/js/qunit/jquery.mockjax.js → ...-core/src/test/js/qunit/jquery.mockjax.js
diff --git a/...et-core-tests/src/test/js/qunit/qunit.css → wicket-core/src/test/js/qunit/qunit.css b/...et-core-tests/src/test/js/qunit/qunit.css → wicket-core/src/test/js/qunit/qunit.css
diff --git a/wicket-core-tests/src/test/js/qunit/qunit.js → wicket-core/src/test/js/qunit/qunit.js b/wicket-core-tests/src/test/js/qunit/qunit.js → wicket-core/src/test/js/qunit/qunit.js
diff --git a/wicket-core-tests/src/test/js/timer.js → wicket-core/src/test/js/timer.js b/wicket-core-tests/src/test/js/timer.js → wicket-core/src/test/js/timer.js