diff --git a/forgerock-ui-commons/pom.xml b/forgerock-ui-commons/pom.xml
index ca829a06..e09d1bc5 100644
--- a/forgerock-ui-commons/pom.xml
+++ b/forgerock-ui-commons/pom.xml
@@ -221,6 +221,11 @@
js
min
+
+ jp.openam.commons.ui.libs
+ jquery-migrate
+ js
+
jp.openam.commons.ui.libs
lodash
diff --git a/forgerock-ui-commons/src/main/js/config/process/CommonConfig.js b/forgerock-ui-commons/src/main/js/config/process/CommonConfig.js
index 41b031b6..c247f3cd 100644
--- a/forgerock-ui-commons/src/main/js/config/process/CommonConfig.js
+++ b/forgerock-ui-commons/src/main/js/config/process/CommonConfig.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/util/Constants",
"org/forgerock/commons/ui/common/main/EventManager"
diff --git a/forgerock-ui-commons/src/main/js/config/validators/CommonValidators.js b/forgerock-ui-commons/src/main/js/config/validators/CommonValidators.js
index 4fca24d5..31b9082c 100644
--- a/forgerock-ui-commons/src/main/js/config/validators/CommonValidators.js
+++ b/forgerock-ui-commons/src/main/js/config/validators/CommonValidators.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery"
+ "jquery-migrate"
], function($) {
var obj = {
"required": {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginDialog.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginDialog.js
index a0380bba..703dffb2 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginDialog.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginDialog.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
"org/forgerock/commons/ui/common/util/UIUtils",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginView.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginView.js
index ff4f11cb..c36d32b8 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginView.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginView.js
@@ -12,6 +12,7 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
@@ -60,9 +61,9 @@ define([
this.$el.find("input[name=login]").val(login).prop('autofocus', false);
this.$el.find("[name=loginRemember]").prop("checked",true);
validatorsManager.validateAllFields(this.$el);
- this.$el.find("[name=password]").focus();
+ this.$el.find("[name=password]").trigger("focus");
} else {
- this.$el.find("input[name=login]").focus();
+ this.$el.find("input[name=login]").trigger("focus");
}
if (callback) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/SiteConfigurator.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/SiteConfigurator.js
index 51430869..8c2937f1 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/SiteConfigurator.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/SiteConfigurator.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/Backgrid.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/Backgrid.js
index 691c598e..d5d87ac0 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/Backgrid.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/Backgrid.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"backgrid"
], function ($, Backgrid) {
/**
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/extension/ThemeablePaginator.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/extension/ThemeablePaginator.js
index ebb1812e..3149f795 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/extension/ThemeablePaginator.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/extension/ThemeablePaginator.js
@@ -28,7 +28,7 @@
* new Backgrid.Extension.ThemeablePaginator({ ... });
*/
define([
- "jquery",
+ "jquery-migrate",
"backgrid.paginator",
"org/forgerock/commons/ui/common/backgrid/Backgrid"
], function ($, BackgridPaginator, Backgrid) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/extension/ThemeableServerSideFilter.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/extension/ThemeableServerSideFilter.js
index d2afc2a0..84cc6d1c 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/extension/ThemeableServerSideFilter.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/backgrid/extension/ThemeableServerSideFilter.js
@@ -28,7 +28,7 @@
* new Backgrid.Extension.ThemeableServerSideFilter({ ... });
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"backgrid-filter",
"org/forgerock/commons/ui/common/backgrid/Backgrid"
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/BootstrapDialog.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/BootstrapDialog.js
index 63c3c7b0..4ad11879 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/BootstrapDialog.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/BootstrapDialog.js
@@ -12,16 +12,17 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
"underscore",
- "jquery",
+ "jquery-migrate",
"bootstrap-dialog"
], function (_, $, BootstrapDialog) {
function forceFocus (dialog) {
- dialog.$modalContent.find("[autofocus]").focus();
+ dialog.$modalContent.find("[autofocus]").trigger("focus");
}
function setButtonStates (dialog) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/BootstrapDialogView.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/BootstrapDialogView.js
index da221f99..f14fc5a8 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/BootstrapDialogView.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/BootstrapDialogView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/ModuleLoader",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Breadcrumbs.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Breadcrumbs.js
index ab854db6..1d61e90e 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Breadcrumbs.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Breadcrumbs.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"backbone"
], function($, _, Backbone) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ChangesPending.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ChangesPending.js
index b21e20f5..53bfa550 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ChangesPending.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ChangesPending.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/main/AbstractView"
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ConfirmationDialog.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ConfirmationDialog.js
index c813eff2..b7fad261 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ConfirmationDialog.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ConfirmationDialog.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/components/Dialog",
"org/forgerock/commons/ui/common/components/BootstrapDialogView"
], function($, Dialog, BootstrapDialogView) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js
index a60fa459..1eb805ba 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/UIUtils",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js
index ad761035..ca42eab5 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"backbone",
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware"
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Navigation.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Navigation.js
index 2ba88fab..dfa5349a 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Navigation.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Navigation.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"backbone",
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/popup/PopupView.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/popup/PopupView.js
index b5e9b64d..e23b4323 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/popup/PopupView.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/popup/PopupView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery"
+ "jquery-migrate"
], function($) {
var obj = {};
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractCollection.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractCollection.js
index 36a052de..e9a51fb7 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractCollection.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractCollection.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"backbone",
"backbone.paginator",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractConfigurationAware.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractConfigurationAware.js
index 2ff35de5..d98cfca4 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractConfigurationAware.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractConfigurationAware.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/util/ModuleLoader"
], function($, _, ModuleLoader) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractModel.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractModel.js
index aa75f31b..29e41a20 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractModel.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractModel.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"backbone",
"org/forgerock/commons/ui/common/util/ObjectUtil",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractView.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractView.js
index 0c25952d..df620236 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractView.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractView.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"backbone",
"org/forgerock/commons/ui/common/main/Configuration",
@@ -139,7 +140,7 @@ define([
};
this.setElement($(this.element));
- this.$el.unbind();
+ this.$el.off();
this.delegateEvents();
if (Configuration.baseTemplate !== this.baseTemplate && !this.noBaseTemplate) {
@@ -161,7 +162,7 @@ define([
rebind: function() {
this.setElement($(this.element));
- this.$el.unbind();
+ this.$el.off();
this.delegateEvents();
},
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ErrorsHandler.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ErrorsHandler.js
index 7cea69b6..88b75123 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ErrorsHandler.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ErrorsHandler.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
"underscore",
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
"org/forgerock/commons/ui/common/main/EventManager",
"org/forgerock/commons/ui/common/util/Constants"
@@ -32,7 +33,7 @@ define([
if (error.hasOwnProperty('responseText')) {
try {
- error.responseObj = $.parseJSON(error.responseText);
+ error.responseObj = JSON.parse(error.responseText);
} catch (parseErr) { /* Must not be JSON */ }
}
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/EventManager.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/EventManager.js
index 048c9779..6428665d 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/EventManager.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/EventManager.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore"
], function($, _) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ProcessConfiguration.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ProcessConfiguration.js
index c3a5b66b..227f5d65 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ProcessConfiguration.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ProcessConfiguration.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/util/Constants",
"org/forgerock/commons/ui/common/main/EventManager",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ServiceInvoker.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ServiceInvoker.js
index 1d07a7ad..cffc3a83 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ServiceInvoker.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ServiceInvoker.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
"org/forgerock/commons/ui/common/util/Constants",
@@ -55,7 +56,7 @@ define([
rejectHandler;
resolveHandler = function () {
- promise.resolve.apply(promise, arguments);
+ return promise.resolve.apply(promise, arguments);
};
rejectHandler = function (jqXHR, textStatus, errorThrown) {
@@ -66,7 +67,7 @@ define([
// logged-in, resubmit their original request. Only do this if there
// isn't an errorsHandler for 401 included in the request.
if (jqXHR.status === 401 && !ErrorsHandler.matchError({status:401},options.errorsHandlers)) {
- EventManager.sendEvent(Constants.EVENT_SHOW_LOGIN_DIALOG, {
+ return EventManager.sendEvent(Constants.EVENT_SHOW_LOGIN_DIALOG, {
authenticatedCallback : function () {
$.ajax(options).then(resolveHandler,rejectHandler);
}
@@ -79,11 +80,11 @@ define([
errorsHandlers: options.errorsHandlers
});
if(errorCallback) { errorCallback(jqXHR); }
- promise.reject.apply(promise, arguments);
+ return promise.reject.apply(promise, arguments);
}
} else {
if(errorCallback) { errorCallback(jqXHR); }
- promise.reject.apply(promise, arguments);
+ return promise.reject.apply(promise, arguments);
}
};
@@ -100,12 +101,6 @@ define([
obj.applyDefaultHeadersIfNecessary(options, obj.configuration.defaultHeaders);
- if (!options.suppressEvents) {
- EventManager.sendEvent(Constants.EVENT_START_REST_CALL, {
- suppressSpinner: options.suppressSpinner
- });
- }
-
options.success = function (data, textStatus, jqXHR) {
if(data && data.error) {
if (!options.suppressEvents) {
@@ -159,9 +154,15 @@ define([
options.headers["Cache-Control"] = "no-cache";
}
- $.ajax(options).then(resolveHandler,rejectHandler);
-
- return promise;
+ if (!options.suppressEvents) {
+ return EventManager.sendEvent(Constants.EVENT_START_REST_CALL, {
+ suppressSpinner: options.suppressSpinner
+ }).then(function () {
+ return $.ajax(options).then(resolveHandler,rejectHandler);
+ });
+ } else {
+ return $.ajax(options).then(resolveHandler,rejectHandler);
+ }
};
/**
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SessionManager.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SessionManager.js
index 7a04eb84..0d77511c 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SessionManager.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SessionManager.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/util/CookieHelper",
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SpinnerManager.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SpinnerManager.js
index 567c4962..85f6f158 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SpinnerManager.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SpinnerManager.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"spin"
], function($, Spinner) {
@@ -27,11 +28,6 @@ define([
}
obj.spinner = new Spinner().spin(document.getElementById('wrapper'));
- $(".spinner").position({
- of: $(window),
- my: "center center",
- at: "center center"
- });
if (priority && (!obj.priority || priority > obj.priority)) {
obj.priority = priority;
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ValidatorsManager.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ValidatorsManager.js
index b69ddf89..4b930efd 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ValidatorsManager.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ValidatorsManager.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
"org/forgerock/commons/ui/common/util/ModuleLoader"
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js
index 8c13fd2f..0fae5035 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/util/UIUtils",
"org/forgerock/commons/ui/common/components/Messages",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/i18nManager.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/i18nManager.js
index b9ec0fcb..de045b8a 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/i18nManager.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/i18nManager.js
@@ -15,7 +15,7 @@
*/
define( "org/forgerock/commons/ui/common/main/i18nManager", [
- "jquery",
+ "jquery-migrate",
"lodash",
"require",
"handlebars",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/AutoScroll.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/AutoScroll.js
index c5294dd0..6f6c3368 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/AutoScroll.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/AutoScroll.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash"
], function ($, _) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/BackgridUtils.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/BackgridUtils.js
index 47b4f8f3..14451234 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/BackgridUtils.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/BackgridUtils.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/backgrid/Backgrid",
"org/forgerock/commons/ui/common/util/DateUtil",
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/FormGenerationUtils.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/FormGenerationUtils.js
index f79ce267..c6b6d5d2 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/FormGenerationUtils.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/FormGenerationUtils.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/util/DateUtil"
], function ($, dateUtil) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ModuleLoader.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ModuleLoader.js
index 087b1df7..a26161d7 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ModuleLoader.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ModuleLoader.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery"
+ "jquery-migrate"
], function ($) {
return {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js
index 76092fa1..628abccc 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"require",
"handlebars",
@@ -221,11 +222,11 @@ define([
$.event.special.delayedkeyup = {
setup: function() {
- $(this).bind("keyup", $.event.special.delayedkeyup.handler);
+ $(this).on("keyup", $.event.special.delayedkeyup.handler);
},
teardown: function() {
- $(this).unbind("keyup", $.event.special.delayedkeyup.handler);
+ $(this).off("keyup", $.event.special.delayedkeyup.handler);
},
handler: function( event ) {
diff --git a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ValidatorsUtils.js b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ValidatorsUtils.js
index 431606a0..070b5d13 100644
--- a/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ValidatorsUtils.js
+++ b/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ValidatorsUtils.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore"
], function($, _) {
var obj = {};
diff --git a/forgerock-ui-commons/src/test/qunit/AbstractCollection.js b/forgerock-ui-commons/src/test/qunit/AbstractCollection.js
index a30eda0a..66198c4d 100644
--- a/forgerock-ui-commons/src/test/qunit/AbstractCollection.js
+++ b/forgerock-ui-commons/src/test/qunit/AbstractCollection.js
@@ -12,20 +12,23 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
/*globals QUnit */
define([
- "jquery",
+ "jquery-migrate",
"sinon",
+ "qunit",
"org/forgerock/commons/ui/common/main/AbstractCollection",
"org/forgerock/commons/ui/common/main/ServiceInvoker"
-], function ($, sinon, AbstractCollection, ServiceInvoker) {
+], function ($, sinon, QUnit, AbstractCollection, ServiceInvoker) {
QUnit.module('AbstractCollection Functions');
- QUnit.test("query operations", function () {
+ QUnit.test("query operations", function (assert) {
var testCollection = new AbstractCollection(),
- restCallArg;
+ restCallArg,
+ done = assert.async();
testCollection.url = "/crestResource?_queryFilter=true";
@@ -58,16 +61,16 @@ define([
testCollection.setTotalPagedResultsPolicy("EXACT");
testCollection.getFirstPage().then(function () {
- QUnit.equal(ServiceInvoker.restCall.callCount, 1, "Only one REST call produced");
+ assert.equal(ServiceInvoker.restCall.callCount, 1, "Only one REST call produced");
restCallArg = ServiceInvoker.restCall.args[0][0]; // first invocation, first argument
- QUnit.equal(testCollection.length, 2, "collection contains two records from the backend");
- QUnit.equal(testCollection.where({givenName: "Boaty"}).length, 1,
+ assert.equal(testCollection.length, 2, "collection contains two records from the backend");
+ assert.equal(testCollection.where({givenName: "Boaty"}).length, 1,
"able to find expected model content in collection");
- QUnit.ok(testCollection.hasNext(), "response with cookie indicates that hasNext is true");
- QUnit.equal(testCollection.state.totalRecords, 5, "Total records correctly populated in collection state");
- QUnit.equal(testCollection.state.totalPages, 3, "Total pages correctly populated in collection state");
- QUnit.equal(restCallArg.url, "/crestResource", "correct url used to query backend");
- QUnit.equal(restCallArg.data,
+ assert.ok(testCollection.hasNext(), "response with cookie indicates that hasNext is true");
+ assert.equal(testCollection.state.totalRecords, 5, "Total records correctly populated in collection state");
+ assert.equal(testCollection.state.totalPages, 3, "Total pages correctly populated in collection state");
+ assert.equal(restCallArg.url, "/crestResource", "correct url used to query backend");
+ assert.equal(restCallArg.data,
"_queryFilter=true&_pageSize=2&_sortKeys=givenName&_totalPagedResultsPolicy=EXACT",
"correct data submitted to backend for first page");
}).then(function () {
@@ -75,19 +78,20 @@ define([
return testCollection.getFirstPage();
}).then(function () {
restCallArg = ServiceInvoker.restCall.args[1][0]; // second invocation, first argument
- QUnit.equal(restCallArg.data,
+ assert.equal(restCallArg.data,
"_queryFilter=true&_pageSize=2&_sortKeys=-givenName&_totalPagedResultsPolicy=EXACT",
"correct data submitted to backend for descending sortKey");
}).then(function () {
return testCollection.getNextPage();
}).then(function () {
restCallArg = ServiceInvoker.restCall.args[2][0]; // third invocation, first argument
- QUnit.equal(restCallArg.data,
+ assert.equal(restCallArg.data,
"_queryFilter=true&_pageSize=2&_sortKeys=-givenName"+
"&_totalPagedResultsPolicy=EXACT&_pagedResultsCookie=2",
"correct data submitted to backend for next page");
}).then(function () {
ServiceInvoker.restCall.restore();
+ done();
});
});
diff --git a/forgerock-ui-commons/src/test/qunit/AbstractModel.js b/forgerock-ui-commons/src/test/qunit/AbstractModel.js
index fc0bd2db..85485b14 100644
--- a/forgerock-ui-commons/src/test/qunit/AbstractModel.js
+++ b/forgerock-ui-commons/src/test/qunit/AbstractModel.js
@@ -12,23 +12,26 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"sinon",
+ "qunit",
"org/forgerock/commons/ui/common/main/AbstractModel",
"org/forgerock/commons/ui/common/main/ServiceInvoker"
-], function ($, sinon, AbstractModel, ServiceInvoker) {
+], function ($, sinon, QUnit, AbstractModel, ServiceInvoker) {
QUnit.module('AbstractModel Functions');
- QUnit.test("create with server-assigned id", function () {
+ QUnit.test("create with server-assigned id", function (assert) {
var testModel = new AbstractModel(),
newRecord = {
"foo": "bar",
"hello": "world"
},
- restCallArg;
+ restCallArg,
+ done = assert.async();
testModel.url = "/crestResource";
@@ -41,21 +44,23 @@ define([
testModel.save(newRecord).then(function () {
restCallArg = ServiceInvoker.restCall.args[0][0]; // first invocation, first argument
- QUnit.equal(testModel.id, 1, "Newly-created model has id from backend");
- QUnit.equal(restCallArg.url, "/crestResource?_action=create&", "correct url used to create model");
- QUnit.equal(restCallArg.type, "POST", "correct method used to create model");
+ assert.equal(testModel.id, 1, "Newly-created model has id from backend");
+ assert.equal(restCallArg.url, "/crestResource?_action=create&", "correct url used to create model");
+ assert.equal(restCallArg.type, "POST", "correct method used to create model");
ServiceInvoker.restCall.restore();
+ done();
});
});
- QUnit.test("create with client-supplied id", function () {
+ QUnit.test("create with client-supplied id", function (assert) {
var testModel = new AbstractModel(),
newRecord = {
"foo": "bar",
"hello": "world"
},
- restCallArg;
+ restCallArg,
+ done = assert.async();
testModel.url = "/crestResource";
testModel.id = "myCustomId";
@@ -68,18 +73,19 @@ define([
testModel.save(newRecord).then(function () {
restCallArg = ServiceInvoker.restCall.args[0][0]; // first invocation, first argument
- QUnit.equal(testModel.get("_rev"), 1, "Model has new rev from backend");
- QUnit.equal(restCallArg.url, "/crestResource/myCustomId?", "correct url used to create model");
- QUnit.equal(restCallArg.headers["If-None-Match"], "*", "correct revision header provided");
- QUnit.equal(restCallArg.type, "PUT", "correct method used to create model");
-
+ assert.equal(testModel.get("_rev"), 1, "Model has new rev from backend");
+ assert.equal(restCallArg.url, "/crestResource/myCustomId?", "correct url used to create model");
+ assert.equal(restCallArg.headers["If-None-Match"], "*", "correct revision header provided");
+ assert.equal(restCallArg.type, "PUT", "correct method used to create model");
ServiceInvoker.restCall.restore();
+ done();
})
});
- QUnit.test("read operation", function () {
+ QUnit.test("read operation", function (assert) {
var testModel = new AbstractModel(),
- restCallArg;
+ restCallArg,
+ done = assert.async();
testModel.url = "/crestResource";
testModel.id = 1;
@@ -94,10 +100,10 @@ define([
testModel.fetch().then(function () {
restCallArg = ServiceInvoker.restCall.args[0][0]; // first invocation, first argument
- QUnit.equal(testModel.get("name"), "foo", "example data populated from fetch call");
- QUnit.equal(testModel.get("_rev"), 1, "revision populated from fetch call");
- QUnit.equal(restCallArg.url, "/crestResource/1?", "correct url used to read model");
- QUnit.equal(restCallArg.type, "GET", "correct method used to read model");
+ assert.equal(testModel.get("name"), "foo", "example data populated from fetch call");
+ assert.equal(testModel.get("_rev"), 1, "revision populated from fetch call");
+ assert.equal(restCallArg.url, "/crestResource/1?", "correct url used to read model");
+ assert.equal(restCallArg.type, "GET", "correct method used to read model");
}).then(function () {
testModel.additionalParameters = {
"_fields": "name"
@@ -105,26 +111,28 @@ define([
return testModel.fetch();
}).then(function () {
restCallArg = ServiceInvoker.restCall.args[1][0]; // second invocation, first argument
- QUnit.equal(restCallArg.url, "/crestResource/1?_fields=name", "url includes additionalParameters");
+ assert.equal(restCallArg.url, "/crestResource/1?_fields=name", "url includes additionalParameters");
}).then(function () {
testModel.parse = function (response) {
return _.extend({"addedByParseFunction": true}, response);
};
return testModel.fetch();
}).then(function () {
- QUnit.equal(testModel.get("addedByParseFunction"), true, "parse function successfully modified model content");
+ assert.equal(testModel.get("addedByParseFunction"), true, "parse function successfully modified model content");
ServiceInvoker.restCall.restore();
+ done();
});
});
- QUnit.test("update operations", function () {
+ QUnit.test("update operations", function (assert) {
var testModel = new AbstractModel({
"_id": 1,
"_rev": 1,
"foo": "bar",
"hello": "world"
}),
- restCallArg;
+ restCallArg,
+ done = assert.async();
testModel.url = "/crestResource";
@@ -136,23 +144,24 @@ define([
testModel.save().then(function () {
restCallArg = ServiceInvoker.restCall.args[0][0]; // first invocation, first argument
- QUnit.equal(testModel.get("_rev"), 2, "Model has new rev from backend");
- QUnit.equal(restCallArg.url, "/crestResource/1?", "correct url used to update model");
- QUnit.equal(restCallArg.headers["If-Match"], 1, "correct revision header provided");
- QUnit.equal(restCallArg.type, "PUT", "correct method used to update model");
-
+ assert.equal(testModel.get("_rev"), 2, "Model has new rev from backend");
+ assert.equal(restCallArg.url, "/crestResource/1?", "correct url used to update model");
+ assert.equal(restCallArg.headers["If-Match"], 1, "correct revision header provided");
+ assert.equal(restCallArg.type, "PUT", "correct method used to update model");
ServiceInvoker.restCall.restore();
+ done();
});
});
- QUnit.test("delete operations", function () {
+ QUnit.test("delete operations", function (assert) {
var testModel = new AbstractModel({
"_id": 1,
"_rev": 1,
"foo": "bar",
"hello": "world"
}),
- restCallArg;
+ restCallArg,
+ done = assert.async();
testModel.url = "/crestResource";
@@ -162,21 +171,22 @@ define([
testModel.destroy().then(function () {
restCallArg = ServiceInvoker.restCall.args[0][0]; // first invocation, first argument
- QUnit.equal(restCallArg.url, "/crestResource/1?", "correct url used to delete model");
- QUnit.equal(restCallArg.type, "DELETE", "correct method used to DELETE model");
-
+ assert.equal(restCallArg.url, "/crestResource/1?", "correct url used to delete model");
+ assert.equal(restCallArg.type, "DELETE", "correct method used to DELETE model");
ServiceInvoker.restCall.restore();
+ done();
});
});
- QUnit.test("patch operations", function () {
+ QUnit.test("patch operations", function (assert) {
var testModel = new AbstractModel({
"_id": 1,
"_rev": 1,
"foo": "bar",
"hello": "world"
}),
- restCallArg;
+ restCallArg,
+ done = assert.async();
testModel.url = "/crestResource";
@@ -186,16 +196,15 @@ define([
testModel.save({"foo": "baz"}, {patch: true}).then(function () {
restCallArg = ServiceInvoker.restCall.args[0][0]; // first invocation, first argument
-
- QUnit.equal(restCallArg.url, "/crestResource/1?", "correct url used to patch model");
- QUnit.equal(restCallArg.type, "PATCH", "correct method used to patch model");
- QUnit.equal(restCallArg.data, '[{"operation":"replace","field":"/foo","value":"baz"}]', "correct patch content provided");
-
+ assert.equal(restCallArg.url, "/crestResource/1?", "correct url used to patch model");
+ assert.equal(restCallArg.type, "PATCH", "correct method used to patch model");
+ assert.equal(restCallArg.data, '[{"operation":"replace","field":"/foo","value":"baz"}]', "correct patch content provided");
ServiceInvoker.restCall.restore();
+ done();
});
});
- QUnit.test("custom get method to support JSONPointer", function () {
+ QUnit.test("custom get method to support JSONPointer", function (assert) {
var testModel = new AbstractModel({
"_id": 1,
"_rev": 1,
@@ -204,9 +213,9 @@ define([
"hello": "world"
}
});
- QUnit.equal(testModel.get("simpleKey"), "simpleValue", "basic get behavior used to get simple value");
- QUnit.equal(testModel.get("/simpleKey"), "simpleValue", "jsonpointer used to get simple value");
- QUnit.equal(testModel.get("/foo/hello"), "world", "jsonpointer used to get deeply-nested value");
+ assert.equal(testModel.get("simpleKey"), "simpleValue", "basic get behavior used to get simple value");
+ assert.equal(testModel.get("/simpleKey"), "simpleValue", "jsonpointer used to get simple value");
+ assert.equal(testModel.get("/foo/hello"), "world", "jsonpointer used to get deeply-nested value");
})
});
diff --git a/forgerock-ui-commons/src/test/qunit/Base64.js b/forgerock-ui-commons/src/test/qunit/Base64.js
index 7bfc3e8b..67fbcd2e 100644
--- a/forgerock-ui-commons/src/test/qunit/Base64.js
+++ b/forgerock-ui-commons/src/test/qunit/Base64.js
@@ -12,64 +12,66 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
+ "qunit",
"org/forgerock/commons/ui/common/util/Base64",
"org/forgerock/commons/ui/common/util/Mime"
-], function (Base64, Mime) {
+], function (QUnit, Base64, Mime) {
QUnit.module('Base64 Functions');
- QUnit.test("Base64.encodeUTF8", function () {
+ QUnit.test("Base64.encodeUTF8", function (assert) {
var input = "パスワードパスワード";
- QUnit.strictEqual(Base64.encodeUTF8(input), "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJ",
+ assert.strictEqual(Base64.encodeUTF8(input), "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJ",
"Incorrect base-64 encoding");
});
- QUnit.test("Base64.encodeUTF8 - 2 pad chars", function() {
+ QUnit.test("Base64.encodeUTF8 - 2 pad chars", function(assert) {
var input = "パスワードパスワードx";
- QUnit.strictEqual(Base64.encodeUTF8(input), "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJeA==",
+ assert.strictEqual(Base64.encodeUTF8(input), "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJeA==",
"Incorrect base-64 encoding - 2 pad char case");
});
- QUnit.test("Base64.encodeUTF8 - 1 pad char", function() {
+ QUnit.test("Base64.encodeUTF8 - 1 pad char", function(assert) {
var input = "パスワードパスワードxx";
- QUnit.strictEqual(Base64.encodeUTF8(input), "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJeHg=",
+ assert.strictEqual(Base64.encodeUTF8(input), "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJeHg=",
"Incorrect base-64 encoding - 1 pad char case");
});
- QUnit.test("Base64.decodeUTF8", function() {
+ QUnit.test("Base64.decodeUTF8", function(assert) {
var input = "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJ";
- QUnit.strictEqual(Base64.decodeUTF8(input), "パスワードパスワード",
+ assert.strictEqual(Base64.decodeUTF8(input), "パスワードパスワード",
"Incorrect base-64 decoding");
});
- QUnit.test("Base64.decodeUTF8 - 1 pad char", function() {
+ QUnit.test("Base64.decodeUTF8 - 1 pad char", function(assert) {
var input = "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJeHg=";
- QUnit.strictEqual(Base64.decodeUTF8(input), "パスワードパスワードxx",
+ assert.strictEqual(Base64.decodeUTF8(input), "パスワードパスワードxx",
"Incorrect base-64 decoding");
});
- QUnit.test("Base64.decodeUTF8 - 2 pad chars", function() {
+ QUnit.test("Base64.decodeUTF8 - 2 pad chars", function(assert) {
var input = "44OR44K544Ov44O844OJ44OR44K544Ov44O844OJeA==";
- QUnit.strictEqual(Base64.decodeUTF8(input), "パスワードパスワードx",
+ assert.strictEqual(Base64.decodeUTF8(input), "パスワードパスワードx",
"Incorrect base-64 decoding");
});
- QUnit.test("Base64.encodeUTF8/decodeUTF8 - various punctuation characters", function() {
+ QUnit.test("Base64.encodeUTF8/decodeUTF8 - various punctuation characters", function(assert) {
var input = "43uin 98e2 + 343_ {} 43qafdgfREER\'FDj ionk/.,<>`fj iod Hdfjl";
- QUnit.strictEqual(Base64.decodeUTF8(Base64.encodeUTF8(input)), input,
+ assert.strictEqual(Base64.decodeUTF8(Base64.encodeUTF8(input)), input,
"Unable to round-trip Base64 special characters");
});
- QUnit.test("Mime.encodeHeader", function() {
+ QUnit.test("Mime.encodeHeader", function(assert) {
var input = "パスワードパスワード";
- QUnit.strictEqual(Mime.encodeHeader(input), "=?UTF-8?B?44OR44K544Ov44O844OJ44OR44K544Ov44O844OJ?=",
+ assert.strictEqual(Mime.encodeHeader(input), "=?UTF-8?B?44OR44K544Ov44O844OJ44OR44K544Ov44O844OJ?=",
"Incorrect Mime encoding in header");
});
});
diff --git a/forgerock-ui-commons/src/test/qunit/ObjectUtil.js b/forgerock-ui-commons/src/test/qunit/ObjectUtil.js
index e973ac02..04797456 100644
--- a/forgerock-ui-commons/src/test/qunit/ObjectUtil.js
+++ b/forgerock-ui-commons/src/test/qunit/ObjectUtil.js
@@ -12,85 +12,87 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
/*globals QUnit */
define([
"lodash",
+ "qunit",
"org/forgerock/commons/ui/common/util/ObjectUtil"
-], function (_, ObjectUtil) {
+], function (_, QUnit, ObjectUtil) {
QUnit.module('ObjectUtil Functions');
- QUnit.test("toJSONPointerMap", function () {
+ QUnit.test("toJSONPointerMap", function (assert) {
var jsonMap = ObjectUtil.toJSONPointerMap({"c": 2, "a": {"b": ['x','y','z',true], "d": undefined }});
- QUnit.equal(jsonMap["/c"], '2', "toJSONPointerMap correctly flattens complex object");
- QUnit.ok(_.isEqual(jsonMap["/a/b"], ['x','y','z',true]),
+ assert.equal(jsonMap["/c"], '2', "toJSONPointerMap correctly flattens complex object");
+ assert.ok(_.isEqual(jsonMap["/a/b"], ['x','y','z',true]),
"toJSONPointerMap correctly returns a list when it encounters an array");
- QUnit.ok(!_.has(jsonMap, '/d'), "undefined value not included in map produced by toJSONPointerMap");
+ assert.ok(!_.has(jsonMap, '/d'), "undefined value not included in map produced by toJSONPointerMap");
});
- QUnit.test("getValueFromPointer", function () {
+ QUnit.test("getValueFromPointer", function (assert) {
var testObject = {
testSet: ["apple", "pear"],
testMap: {"foo":"bar", "hello": "world"}
};
- QUnit.equal(ObjectUtil.getValueFromPointer(testObject, "/testMap/foo"), "bar", "/testMap/foo");
- QUnit.ok(
+ assert.equal(ObjectUtil.getValueFromPointer(testObject, "/testMap/foo"), "bar", "/testMap/foo");
+ assert.ok(
_.isEqual(ObjectUtil.getValueFromPointer(testObject, "/testSet"),
["apple", "pear"],
"/testSet"));
- QUnit.equal(ObjectUtil.getValueFromPointer(testObject, "/test2"), undefined, "/test2");
- QUnit.equal(ObjectUtil.getValueFromPointer(testObject, "/"), testObject, "/");
+ assert.equal(ObjectUtil.getValueFromPointer(testObject, "/test2"), undefined, "/test2");
+ assert.equal(ObjectUtil.getValueFromPointer(testObject, "/"), testObject, "/");
});
- QUnit.test("isEqualSet", function () {
- QUnit.ok(ObjectUtil.isEqualSet([1], [1]), "Simple set equality");
- QUnit.ok(!ObjectUtil.isEqualSet([1], [1,3]), "Simple set inequality");
- QUnit.ok(ObjectUtil.isEqualSet([3,1], [1,3]), "Set equality regardless of order");
- QUnit.ok(ObjectUtil.isEqualSet([3,{a:1},1], [1,3,{a:1}]), "Set equality with complex items");
- QUnit.ok(!ObjectUtil.isEqualSet([3,{a:1},1], [1,3,{a:2}]),
+ QUnit.test("isEqualSet", function (assert) {
+ assert.ok(ObjectUtil.isEqualSet([1], [1]), "Simple set equality");
+ assert.ok(!ObjectUtil.isEqualSet([1], [1,3]), "Simple set inequality");
+ assert.ok(ObjectUtil.isEqualSet([3,1], [1,3]), "Set equality regardless of order");
+ assert.ok(ObjectUtil.isEqualSet([3,{a:1},1], [1,3,{a:1}]), "Set equality with complex items");
+ assert.ok(!ObjectUtil.isEqualSet([3,{a:1},1], [1,3,{a:2}]),
"Set inequality with differing complex items");
- QUnit.ok(ObjectUtil.isEqualSet([3,{a:1},['b','a'],1], [1,3,{a:1},['a','b']]),
+ assert.ok(ObjectUtil.isEqualSet([3,{a:1},['b','a'],1], [1,3,{a:1},['a','b']]),
"Set equality with complex objects, regardless of order, and with nested sets");
});
- QUnit.test("findItemsNotInSet", function () {
- QUnit.ok(_.isEqual(ObjectUtil.findItemsNotInSet([1,2,3],[2,3]), [1]), "Simple difference found");
- QUnit.ok(_.isEqual(ObjectUtil.findItemsNotInSet([1,2,3],[2,3,1]), []),
+ QUnit.test("findItemsNotInSet", function (assert) {
+ assert.ok(_.isEqual(ObjectUtil.findItemsNotInSet([1,2,3],[2,3]), [1]), "Simple difference found");
+ assert.ok(_.isEqual(ObjectUtil.findItemsNotInSet([1,2,3],[2,3,1]), []),
"No differences found despite order differences");
- QUnit.ok(_.isEqual(ObjectUtil.findItemsNotInSet([1,{a:1},3],[3,1,{a:2}]), [{a:1}]),
+ assert.ok(_.isEqual(ObjectUtil.findItemsNotInSet([1,{a:1},3],[3,1,{a:2}]), [{a:1}]),
"Complex item difference recognized");
- QUnit.ok(_.isEqual(ObjectUtil.findItemsNotInSet([1,{b:2,a:1},3],[3,1,{a:1,b:2}]), []),
+ assert.ok(_.isEqual(ObjectUtil.findItemsNotInSet([1,{b:2,a:1},3],[3,1,{a:1,b:2}]), []),
"Complex item equality recognized, regardless of order");
});
- QUnit.test("walkDefinedPath", function () {
+ QUnit.test("walkDefinedPath", function (assert) {
var testObject = {test:["apple", {"foo":"bar", "hello": "world"}]};
- QUnit.equal(ObjectUtil.walkDefinedPath(testObject, "/test/0"), "/test/0", "/test/0");
- QUnit.equal(ObjectUtil.walkDefinedPath(testObject, "/test/3/foo"), "/test/3", "/test/3/foo");
- QUnit.equal(ObjectUtil.walkDefinedPath(testObject, "/missing"), "/missing", "/missing");
- QUnit.equal(ObjectUtil.walkDefinedPath(testObject, "/missing/bar"), "/missing", "/missing/bar");
- QUnit.equal(ObjectUtil.walkDefinedPath({ } , "/foo"), "/foo", "/foo with empty object");
- QUnit.equal(ObjectUtil.walkDefinedPath({ foo: undefined } , "/foo"),
+ assert.equal(ObjectUtil.walkDefinedPath(testObject, "/test/0"), "/test/0", "/test/0");
+ assert.equal(ObjectUtil.walkDefinedPath(testObject, "/test/3/foo"), "/test/3", "/test/3/foo");
+ assert.equal(ObjectUtil.walkDefinedPath(testObject, "/missing"), "/missing", "/missing");
+ assert.equal(ObjectUtil.walkDefinedPath(testObject, "/missing/bar"), "/missing", "/missing/bar");
+ assert.equal(ObjectUtil.walkDefinedPath({ } , "/foo"), "/foo", "/foo with empty object");
+ assert.equal(ObjectUtil.walkDefinedPath({ foo: undefined } , "/foo"),
"/foo",
"/foo as a property with undefined as the value");
- QUnit.equal(ObjectUtil.walkDefinedPath({ foo: null }, "/foo/bar"),
+ assert.equal(ObjectUtil.walkDefinedPath({ foo: null }, "/foo/bar"),
"/foo",
"/foo as a property with null as the value");
- QUnit.equal(ObjectUtil.walkDefinedPath({ foo: {bar:null} } , "/foo/bar"),
+ assert.equal(ObjectUtil.walkDefinedPath({ foo: {bar:null} } , "/foo/bar"),
"/foo/bar",
"/foo/bar as a property with null as the value");
});
- QUnit.test("generatePatchSet", function () {
+ QUnit.test("generatePatchSet", function (assert) {
var patchDef = ObjectUtil.generatePatchSet({"a": 1, "b": 2}, {"a": 1});
- QUnit.ok(patchDef.length === 1 && patchDef[0].operation === "add" &&
+ assert.ok(patchDef.length === 1 && patchDef[0].operation === "add" &&
patchDef[0].field === "/b" && patchDef[0].value === 2,
"Simple field addition returned for patchDef");
patchDef = ObjectUtil.generatePatchSet({"a": 1, "b": 2}, {"c": 1});
- QUnit.equal(patchDef.length, 3,
+ assert.equal(patchDef.length, 3,
"Expected operation count for removal of one attribute and addition of two others");
patchDef = ObjectUtil.generatePatchSet({
@@ -98,7 +100,7 @@ define([
}, {
"setItems": [{"sub": 1}, {"sub": 2}]
});
- QUnit.ok(patchDef.length === 1 && patchDef[0].operation === "remove" &&
+ assert.ok(patchDef.length === 1 && patchDef[0].operation === "remove" &&
patchDef[0].field === "/setItems" && _.isEqual(patchDef[0].value, {"sub": 1}),
"Removal of value from set based on value of item");
@@ -109,22 +111,22 @@ define([
"setItems": [{"sub": 3}, {"sub": 2}]
});
- QUnit.ok(patchDef.length === 1 && patchDef[0].operation === "add" &&
+ assert.ok(patchDef.length === 1 && patchDef[0].operation === "add" &&
patchDef[0].field === "/setItems/-" && _.isEqual(patchDef[0].value, {"sub": 4}),
"Addition of value to set");
patchDef = ObjectUtil.generatePatchSet({manager:{_ref: "a/b/c"}},{});
- QUnit.ok(patchDef.length === 1 && patchDef[0].operation === "add" &&
+ assert.ok(patchDef.length === 1 && patchDef[0].operation === "add" &&
patchDef[0].field === "/manager" && _.isEqual(patchDef[0].value, {_ref: "a/b/c"}),
"Addition of whole new complex property results in full map added");
patchDef = ObjectUtil.generatePatchSet({manager:{_ref: "a/b/c"}},{manager:null});
- QUnit.ok(patchDef.length === 1 && patchDef[0].operation === "replace" &&
+ assert.ok(patchDef.length === 1 && patchDef[0].operation === "replace" &&
patchDef[0].field === "/manager" && _.isEqual(patchDef[0].value, {_ref: "a/b/c"}),
"Replacement of null value with whole new complex property results in full map added");
patchDef = ObjectUtil.generatePatchSet({manager:{_ref: "a/b/d"}},{manager:{_ref: "a/b/c"}});
- QUnit.ok(patchDef.length === 1 && patchDef[0].operation === "replace" &&
+ assert.ok(patchDef.length === 1 && patchDef[0].operation === "replace" &&
patchDef[0].field === "/manager/_ref" && patchDef[0].value === "a/b/d",
"Replacement of simple value in nested map");
});
diff --git a/forgerock-ui-commons/src/test/qunit/Queue.js b/forgerock-ui-commons/src/test/qunit/Queue.js
index 0606952c..17bc7ec4 100644
--- a/forgerock-ui-commons/src/test/qunit/Queue.js
+++ b/forgerock-ui-commons/src/test/qunit/Queue.js
@@ -12,23 +12,25 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
+ "qunit",
"org/forgerock/commons/ui/common/util/Queue"
-], function (Queue) {
+], function (QUnit, Queue) {
QUnit.module('Queue Functions');
- QUnit.test("core operations", function () {
+ QUnit.test("core operations", function (assert) {
var q = new Queue(["a","b"]);
- QUnit.equal(q.peek(), "a");
- QUnit.equal(q.remove(), "a");
- QUnit.equal(q.remove(), "b");
+ assert.equal(q.peek(), "a");
+ assert.equal(q.remove(), "a");
+ assert.equal(q.remove(), "b");
q.add("c");
- QUnit.equal(q.remove(), "c");
- QUnit.equal(q.peek(), undefined);
- QUnit.equal(q.remove(), undefined);
+ assert.equal(q.remove(), "c");
+ assert.equal(q.peek(), undefined);
+ assert.equal(q.remove(), undefined);
});
diff --git a/forgerock-ui-commons/src/test/qunit/UIUtils.js b/forgerock-ui-commons/src/test/qunit/UIUtils.js
index 88ea7f55..832646b7 100644
--- a/forgerock-ui-commons/src/test/qunit/UIUtils.js
+++ b/forgerock-ui-commons/src/test/qunit/UIUtils.js
@@ -12,16 +12,18 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
"lodash",
"handlebars",
+ "qunit",
"org/forgerock/commons/ui/common/util/UIUtils"
-], function (_, Handlebars, UIUtils) {
+], function (_, Handlebars, QUnit, UIUtils) {
QUnit.module('UIUtils Functions');
- QUnit.test("Static Select", function () {
+ QUnit.test("Static Select", function (assert) {
var template = Handlebars.compile("");
var testHTML = template({"testVal": "2"});
- QUnit.equal($(testHTML).val(), "2", "2 option selected");
+ assert.equal($(testHTML).val(), "2", "2 option selected");
testHTML = template({"testVal": "text/html"});
- QUnit.equal($(testHTML).val(), "text/html", "text/html option selected");
+ assert.equal($(testHTML).val(), "text/html", "text/html option selected");
testHTML = template({"testVal": "tick'test"});
- QUnit.equal($(testHTML).val(), "tick'test", "tick'test option selected");
+ assert.equal($(testHTML).val(), "tick'test", "tick'test option selected");
testHTML = template({"testVal": "less")
.append("")
.append("");
@@ -42,7 +44,7 @@ define([
}
});
- QUnit.test("bindValidators", function () {
+ QUnit.test("bindValidators", function (assert) {
var callbackFunction = sinon.spy(),
extraAfterValidatorsFunction = sinon.spy();
@@ -52,12 +54,12 @@ define([
ValidatorsManager.bindValidators(container, callbackFunction);
- QUnit.equal(ValidatorsManager.bindValidatorsForField.callCount, container.find(":input").length,
+ assert.equal(ValidatorsManager.bindValidatorsForField.callCount, container.find(":input").length,
"bindValidatorsForField called once for each element in provided container");
- QUnit.ok(callbackFunction.calledOnce, "callback function provided to bindValidators invoked once");
+ assert.ok(callbackFunction.calledOnce, "callback function provided to bindValidators invoked once");
- QUnit.ok(extraAfterValidatorsFunction.calledOnce && extraAfterValidatorsFunction.calledWithExactly(container, callbackFunction),
+ assert.ok(extraAfterValidatorsFunction.calledOnce && extraAfterValidatorsFunction.calledWithExactly(container, callbackFunction),
"function injected into afterBindValidators called once (with expected arguments) after bindValidators");
// remove the spy we pushed onto the end
@@ -67,7 +69,7 @@ define([
ValidatorsManager.bindValidatorsForField.restore();
});
- QUnit.test("bindValidatorsForField", function () {
+ QUnit.test("bindValidatorsForField", function (assert) {
var field = container.find("#test"),
eventsList;
@@ -75,32 +77,34 @@ define([
eventsList = _.sortBy(_.keys($._data(field[0]).events));
- QUnit.ok(_.isEqual(eventsList, ["blur", "change", "custom", "keyup", "paste", "validate"]),
+ assert.ok(_.isEqual(eventsList, ["blur", "change", "custom", "keyup", "paste", "validate"]),
"custom and default events all bound to specified input field");
});
- QUnit.asyncTest("evaluateValidator", function () {
- var field = container.find("#test");
+ QUnit.test("evaluateValidator", function (assert) {
+ var field = container.find("#test"),
+ done = assert.async();
field.val("");
ValidatorsManager.evaluateValidator("testValidatorMethod", field, container)
.then(function (failures) {
- QUnit.ok(failures.length === 1 && failures[0] === "DOES NOT PASS");
+ assert.ok(failures.length === 1 && failures[0] === "DOES NOT PASS");
})
.then(function () {
field.val("GOOD");
return ValidatorsManager.evaluateValidator("testValidatorMethod", field, container);
})
.then(function (failures) {
- QUnit.ok(!failures);
- QUnit.start();
+ assert.ok(!failures);
+ done();
});
});
- QUnit.asyncTest("evaluateDependentFields", function () {
+ QUnit.test("evaluateDependentFields", function (assert) {
var primary = container.find("#test"),
dependent = container.find("#dependent"),
- failureMessages = [];
+ failureMessages = [],
+ done = assert.async();
primary.val("GOOD");
dependent.val("BAD");
@@ -115,25 +119,26 @@ define([
ValidatorsManager.evaluateDependentFields(primary, container)
.then(function () {
- QUnit.equal(dependent.attr("data-validation-status"), "error");
- QUnit.ok(failureMessages.length === 1 && failureMessages[0] === "DOES NOT PASS");
+ assert.equal(dependent.attr("data-validation-status"), "error");
+ assert.ok(failureMessages.length === 1 && failureMessages[0] === "DOES NOT PASS");
})
.then(function () {
dependent.val("GOOD");
return ValidatorsManager.evaluateDependentFields(primary, container);
})
.then(function () {
- QUnit.equal(dependent.attr("data-validation-status"), "ok");
- QUnit.equal(failureMessages.length, 0);
- QUnit.start();
+ assert.equal(dependent.attr("data-validation-status"), "ok");
+ assert.equal(failureMessages.length, 0);
+ done();
});
});
- QUnit.asyncTest("evaluateAllValidatorsForField", function () {
+ QUnit.test("evaluateAllValidatorsForField", function (assert) {
var primary = container.find("#test"),
dependent = container.find("#dependent"),
- failureMessages = [];
+ failureMessages = [],
+ done = assert.async();
primary.val("BAD");
dependent.val("BAD");
@@ -148,28 +153,28 @@ define([
ValidatorsManager.evaluateAllValidatorsForField(primary, container)
.then(function () {
- QUnit.equal(primary.attr("data-validation-status"), "error");
- QUnit.equal(dependent.attr("data-validation-status"), "error");
- QUnit.ok(failureMessages.length === 1 && failureMessages[0] === "DOES NOT PASS");
+ assert.equal(primary.attr("data-validation-status"), "error");
+ assert.equal(dependent.attr("data-validation-status"), "error");
+ assert.ok(failureMessages.length === 1 && failureMessages[0] === "DOES NOT PASS");
})
.then(function () {
primary.val("GOOD");
return ValidatorsManager.evaluateAllValidatorsForField(primary, container);
})
.then(function () {
- QUnit.equal(primary.attr("data-validation-status"), "ok");
- QUnit.equal(dependent.attr("data-validation-status"), "error");
- QUnit.ok(failureMessages.length === 1 && failureMessages[0] === "DOES NOT PASS");
+ assert.equal(primary.attr("data-validation-status"), "ok");
+ assert.equal(dependent.attr("data-validation-status"), "error");
+ assert.ok(failureMessages.length === 1 && failureMessages[0] === "DOES NOT PASS");
})
.then(function () {
dependent.val("GOOD");
return ValidatorsManager.evaluateAllValidatorsForField(primary, container);
})
.then(function () {
- QUnit.equal(primary.attr("data-validation-status"), "ok");
- QUnit.equal(dependent.attr("data-validation-status"), "ok");
- QUnit.equal(failureMessages.length, 0);
- QUnit.start();
+ assert.equal(primary.attr("data-validation-status"), "ok");
+ assert.equal(dependent.attr("data-validation-status"), "ok");
+ assert.equal(failureMessages.length, 0);
+ done();
});
});
diff --git a/forgerock-ui-commons/src/test/qunit/form2js.js b/forgerock-ui-commons/src/test/qunit/form2js.js
index 5374eb7b..08a28463 100644
--- a/forgerock-ui-commons/src/test/qunit/form2js.js
+++ b/forgerock-ui-commons/src/test/qunit/form2js.js
@@ -12,27 +12,29 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
+ "qunit",
"form2js",
"js2form"
-], function ($, form2js, js2form) {
+], function ($, QUnit, form2js, js2form) {
QUnit.module('form2js usage');
- QUnit.test("boolean fields", function () {
+ QUnit.test("boolean fields", function (assert) {
var form = $('')
$("#qunit-fixture").append(form);
js2form(form[0], {testBool: true});
- QUnit.equal(form.find("[name=testBool]").prop("checked"), true);
- QUnit.equal(form2js(form[0]).testBool, true);
+ assert.equal(form.find("[name=testBool]").prop("checked"), true);
+ assert.equal(form2js(form[0]).testBool, true);
js2form(form[0], {testBool: false});
- QUnit.equal(form.find("[name=testBool]").prop("checked"), false);
- QUnit.equal(form2js(form[0]).testBool, false);
+ assert.equal(form.find("[name=testBool]").prop("checked"), false);
+ assert.equal(form2js(form[0]).testBool, false);
});
});
diff --git a/forgerock-ui-external-libs/pom.xml b/forgerock-ui-external-libs/pom.xml
index cb26d6d7..4c4fd6d4 100644
--- a/forgerock-ui-external-libs/pom.xml
+++ b/forgerock-ui-external-libs/pom.xml
@@ -43,7 +43,18 @@
wget
- https://code.jquery.com/jquery-2.1.1.min.js
+ https://code.jquery.com/jquery-3.5.1.min.js
+ ${project.basedir}/target/external
+
+
+
+ download-jquery-migrate
+ process-resources
+
+ wget
+
+
+ https://code.jquery.com/jquery-migrate-3.3.0.js
${project.basedir}/target/external
@@ -76,7 +87,7 @@
wget
- https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.14/require.min.js
+ https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js
${project.basedir}/target/external
@@ -362,7 +373,7 @@
wget
- https://cdnjs.cloudflare.com/ajax/libs/qunit/1.15.0/qunit.js
+ https://cdnjs.cloudflare.com/ajax/libs/qunit/2.10.0/qunit.js
${project.basedir}/target/external
@@ -373,7 +384,7 @@
wget
- https://cdnjs.cloudflare.com/ajax/libs/qunit/1.15.0/qunit.css
+ https://cdnjs.cloudflare.com/ajax/libs/qunit/2.10.0/qunit.css
${project.basedir}/target/external
@@ -414,15 +425,30 @@
install-file
- ${basedir}/target/external/jquery-2.1.1.min.js
+ ${basedir}/target/external/jquery-3.5.1.min.js
jp.openam.commons.ui.libs
jquery
- 2.1.1
+ 3.5.1
js
true
min
+
+ install-jquery-migrate
+ process-resources
+
+ install-file
+
+
+ ${basedir}/target/external/jquery-migrate-3.3.0.js
+ jp.openam.commons.ui.libs
+ jquery-migrate
+ 3.3.0
+ js
+ true
+
+
install-lodash
process-resources
@@ -464,7 +490,7 @@
${basedir}/target/external/require.min.js
jp.openam.commons.ui.libs
requirejs
- 2.1.14
+ 2.3.6
js
true
min
@@ -904,7 +930,7 @@
${basedir}/target/external/qunit.js
jp.openam.commons.ui.libs
qunit
- 1.15.0
+ 2.10.0
js
true
@@ -919,7 +945,7 @@
${basedir}/target/external/qunit.css
jp.openam.commons.ui.libs
qunit
- 1.15.0
+ 2.10.0
css
true
diff --git a/forgerock-ui-mock/Gruntfile.js b/forgerock-ui-mock/Gruntfile.js
index 7d3c8b95..95754919 100644
--- a/forgerock-ui-mock/Gruntfile.js
+++ b/forgerock-ui-mock/Gruntfile.js
@@ -12,6 +12,7 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
module.exports = function (grunt) {
@@ -22,6 +23,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-eslint");
grunt.loadNpmTasks('grunt-notify');
grunt.loadNpmTasks("grunt-sync");
+ grunt.loadNpmTasks('grunt-contrib-connect');
var targetDirectory = "target/www",
testTargetDirectory = "target/test",
@@ -77,7 +79,26 @@ module.exports = function (grunt) {
}
},
qunit: {
- all: [testTargetDirectory + "/index.html"]
+ options: {
+ puppeteer: {
+ args: ['--no-sandbox']
+ }
+ },
+ all: {
+ options: {
+ urls: [
+ 'http://localhost:8000/test/index.html'
+ ]
+ }
+ }
+ },
+ connect: {
+ server: {
+ options: {
+ port: 8000,
+ base: 'target'
+ }
+ }
},
requirejs: {
/**
@@ -159,8 +180,8 @@ module.exports = function (grunt) {
}
});
- grunt.registerTask("build", ["eslint", "less", "requirejs", "sync:test", "qunit"]);
- grunt.registerTask("build-dev", ["less", "sync", "qunit"]);
+ grunt.registerTask("build", ["eslint", "less", "requirejs", "sync:test", "connect", "qunit"]);
+ grunt.registerTask("build-dev", ["less", "sync", "connect", "qunit"]);
grunt.registerTask("dev", ["build-dev", "watch"]);
grunt.registerTask("default", "dev");
};
diff --git a/forgerock-ui-mock/package.json b/forgerock-ui-mock/package.json
index 5f557d09..58f5df63 100644
--- a/forgerock-ui-mock/package.json
+++ b/forgerock-ui-mock/package.json
@@ -9,12 +9,14 @@
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-less": "1.0.1",
- "grunt-contrib-qunit": "0.4.0",
- "grunt-contrib-requirejs": "0.4.4",
+ "grunt-contrib-qunit": "3.1.0",
+ "grunt-contrib-connect": "2.1.0",
+ "grunt-contrib-requirejs": "1.0.0",
"grunt-contrib-watch": "0.6.1",
"grunt-eslint": "17.3.1",
"grunt-notify": "0.4.3",
"grunt-sync": "0.4.1",
- "less-plugin-clean-css": "1.5.1"
+ "less-plugin-clean-css": "1.5.1",
+ "requirejs": "2.3.6"
}
}
diff --git a/forgerock-ui-mock/src/main/js/main.js b/forgerock-ui-mock/src/main/js/main.js
index 2066dd57..b153b722 100644
--- a/forgerock-ui-mock/src/main/js/main.js
+++ b/forgerock-ui-mock/src/main/js/main.js
@@ -12,6 +12,7 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
require.config({
@@ -45,7 +46,8 @@ require.config({
js2form: "libs/js2form-2.0-769718a",
form2js: "libs/form2js-2.0-769718a",
spin: "libs/spin-2.0.1-min",
- jquery: "libs/jquery-2.1.1-min",
+ jquery: "libs/jquery-3.5.1-min",
+ "jquery-migrate": "libs/jquery-migrate-3.3.0",
xdate: "libs/xdate-0.8-min",
doTimeout: "libs/jquery.ba-dotimeout-1.0-min",
handlebars: "libs/handlebars-4.0.5",
@@ -56,6 +58,10 @@ require.config({
},
shim: {
+ "jquery-migrate": {
+ deps: ["jquery"],
+ exports: "jQuery"
+ },
sinon: {
exports: "sinon"
},
diff --git a/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/util/ThemeManager.js b/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/util/ThemeManager.js
index 026b46dd..0fb404ca 100644
--- a/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/util/ThemeManager.js
+++ b/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/util/ThemeManager.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/util/Constants",
"org/forgerock/commons/ui/common/main/Configuration"
diff --git a/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/examples/ExamplesView.js b/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/examples/ExamplesView.js
index d528a2c5..dc27da0f 100644
--- a/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/examples/ExamplesView.js
+++ b/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/examples/ExamplesView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"libs/codemirror-4.10/lib/codemirror",
"libs/codemirror-4.10/mode/xml/xml",
diff --git a/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/UserModel.js b/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/UserModel.js
index 9aec6d8f..30920f79 100644
--- a/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/UserModel.js
+++ b/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/UserModel.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"underscore",
"org/forgerock/commons/ui/common/main/AbstractModel",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/login/InternalLoginHelper.js b/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/login/InternalLoginHelper.js
index a505c447..101c2152 100644
--- a/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/login/InternalLoginHelper.js
+++ b/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/login/InternalLoginHelper.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/mock/ui/user/UserModel",
"org/forgerock/commons/ui/common/main/EventManager",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/forgerock-ui-mock/src/main/resources/index.html b/forgerock-ui-mock/src/main/resources/index.html
index a7056038..b48b7bd7 100644
--- a/forgerock-ui-mock/src/main/resources/index.html
+++ b/forgerock-ui-mock/src/main/resources/index.html
@@ -23,7 +23,7 @@
-
+