This is an automated email from the ASF dual-hosted git repository. svenmeier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/wicket.git
commit f3eb42d0aaf993e518906cecc6a0110be077ac54 Author: Martin Tzvetanov Grigorov <[email protected]> AuthorDate: Fri May 10 10:39:37 2019 +0300 WICKET-6667 Fix AMD QUnit tests by removing Wicket.Ajax.Debug --- wicket-core/src/test/js/amd.html | 7 +------ wicket-core/src/test/js/amd.js | 8 ++------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/wicket-core/src/test/js/amd.html b/wicket-core/src/test/js/amd.html index fd58819..dfd314c 100644 --- a/wicket-core/src/test/js/amd.html +++ b/wicket-core/src/test/js/amd.html @@ -10,17 +10,12 @@ paths: { 'jquery': '../../main/java/org/apache/wicket/resource/jquery/jquery-'+location.search.substring(1), // no .js extension 'Wicket': '../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery', - 'WicketDebugWindow': '../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug', "qunit": "qunit/qunit" }, shim: { 'Wicket': { deps: ['jquery'], exports: 'Wicket' - }, - 'WicketDebugWindow': { - deps: ['Wicket'], - exports: 'WicketDebugWindow' } } }; @@ -30,7 +25,7 @@ <!-- the module under test --> <script> require(["amd", "qunit"], function (amdModule, qunit) { - amdModule.runTests(); + amdModule.runTests(); qunit.start(); } ); diff --git a/wicket-core/src/test/js/amd.js b/wicket-core/src/test/js/amd.js index 8756d65..f588701 100644 --- a/wicket-core/src/test/js/amd.js +++ b/wicket-core/src/test/js/amd.js @@ -22,17 +22,15 @@ define( [ "jquery", "Wicket", - "WicketDebugWindow", "qunit" ], - function ($, w, wdw, qunit) { + function ($, w, qunit) { "use strict"; return { runTests: function () { qunit.test("Wicket object is successfully loaded via RequireJs", function () { - - qunit.expect(14); + qunit.expect(13); // test for one member for each Wicket.** module qunit.ok($.isFunction(w.Event.fix), "Wicket Event (from wicket-ajax-jquery.js) is imported"); @@ -49,8 +47,6 @@ define( qunit.ok($.isFunction(new w.ThrottlerEntry().getFunc), "Wicket ThrottlerEntry (from wicket-ajax-jquery.js) is imported"); qunit.equal('div', w.DOM.get('amdElement').tagName.toLowerCase(), "Wicket.DOM.get() works"); - - qunit.ok($.isFunction(w.Ajax.DebugWindow.logError), "Wicket Ajax.DebugWindow (from wicket-ajax-jquery-debug.js) is imported"); }); } };
