aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gui-editors/gui-editor-apex/src/main/webapp/js/ApexContextAlbumEditForm.js4
-rw-r--r--gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js28
-rw-r--r--gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js29
3 files changed, 58 insertions, 3 deletions
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/ApexContextAlbumEditForm.js b/gui-editors/gui-editor-apex/src/main/webapp/js/ApexContextAlbumEditForm.js
index 9534a99..23d138d 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/ApexContextAlbumEditForm.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/ApexContextAlbumEditForm.js
@@ -1,7 +1,7 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2022 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
* ============LICENSE_END=========================================================
*/
import {keyInformationTab_reset} from "./ApexKeyInformationTab";
-const {ajax_delete, ajax_getWithKeyInfo, ajax_get} = require("./ApexAjax");
+const {ajax_delete, ajax_getWithKeyInfo, ajax_get, ajax_post, ajax_put} = require("./ApexAjax");
const {contextAlbumTab_reset} = require("./ApexContextAlbumTab");
const {apexUtils_removeElement, apexUtils_emptyElement, scrollToTop, apexUtils_areYouSure} = require("./ApexUtils");
const {dropdownList} = require("./dropdownList");
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js
index 8bc3ed0..8d2976d 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js
@@ -136,9 +136,35 @@ test('Test Generate Description Pressed', () => {
test('Test editContextAlbumForm_cancelPressed', () => {
jest.spyOn(apexUtils, 'apexUtils_removeElement').mockReturnValue(null);
- jest.spyOn(document, 'getElementById').mockReturnValue(null);
+ const mock = jest.spyOn(document, 'getElementById').mockReturnValue(null);
jest.spyOn(contextAlbumTab_reset, 'contextAlbumTab_reset').mockReturnValue(null);
const mock_activate = jest.fn(mod.editContextAlbumForm_cancelPressed);
mock_activate();
expect(mock_activate).toBeCalled();
+ mock.mockRestore();
});
+
+test('Test Submit Pressed with page', () => {
+ global.window.restRootURL = () => 'http://localhost'
+ const jqXHR = { status: 200, responseText: "" };
+ $.ajax = jest.fn().mockImplementation((args) => {
+ args.success(data, null, jqXHR);
+ });
+ jest.spyOn(keyInformationTab_reset, 'keyInformationTab_reset').mockReturnValueOnce(null);
+ jest.spyOn(apexUtils, 'apexUtils_removeElement').mockReturnValue(null);
+ jest.spyOn(contextAlbumTab_reset, 'contextAlbumTab_reset').mockReturnValueOnce(null);
+
+ document.documentElement.innerHTML = '<html><head></head><body>' +
+ '<div id="editContextAlbumFormDiv"></div>' +
+ '</body></html>';
+ let documentSpy = jest.spyOn(document, 'getElementById');
+ let elementMock = document.getElementById("editContextAlbumFormDiv");
+ elementMock.value = 'APPLICATION';
+ elementMock.selectedOption = {"name": "schemaName", "version": "schemaVers"};
+ elementMock.checked = false;
+ elementMock.setAttribute("createEditOrView", "CREATE");
+ documentSpy.mockReturnValue(elementMock);
+ const mock_activate = jest.fn(mod.editContextAlbumForm_submitPressed);
+ mock_activate();
+ expect(mock_activate).toBeCalled();
+}); \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js
index b9982f5..e9fcc9b 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js
@@ -177,3 +177,32 @@ test('Test editTaskForm_submitPressed', () => {
mock_activate();
expect(mock_activate).toBeCalled();
});
+
+test('Test editTaskForm_submitPressed with page', () => {
+ const jqXHR = { status: 200, responseText: "" };
+ $.ajax = jest.fn().mockImplementation((args) => {
+ args.success(data, null, jqXHR);
+ });
+ jest.spyOn(apexTaskTab, 'taskTab_reset').mockReturnValueOnce(null);
+ jest.spyOn(keyInformationTab_reset, 'keyInformationTab_reset').mockReturnValueOnce(null);
+ jest.spyOn(apexUtils, 'apexUtils_removeElement').mockReturnValueOnce(null);
+
+ document.documentElement.innerHTML = '<html><head></head><body>' +
+ '<table id="editTaskFormInputFieldsTable" value="v0">' +
+ '<tr class="table" inputfield_id="a1" outputfield_id="b1" param_id="c1" context_id="d1" value="v1"><td>cell1</td><td>cell2</td></tr>' +
+ '<tr class="table" inputfield_id="a2" outputfield_id="b2" param_id="c2" context_id="d2" value="v2"><td>cell3</td><td>cell4</td></tr>' +
+ '<tr class="table" inputfield_id="a3" outputfield_id="b3" param_id="c3" context_id="d3" value="v3"><td>cell5</td><td>cell6</td></tr>' +
+ '</table>' +
+ '</body></html>';
+ let documentSpy = jest.spyOn(document, 'getElementById');
+ let elementMock = document.getElementById("editTaskFormInputFieldsTable");
+ elementMock.value = 'notNullValue';
+ elementMock.selectedOption = {"name": "name1", "version": "version1"};
+ elementMock.checked = {"name": "nameOpt", "version": "versionOpt"};
+ elementMock.setAttribute("createEditOrView", "EDIT")
+ documentSpy.mockReturnValue(elementMock);
+
+ const mock_activate = jest.fn(mod.editTaskForm_submitPressed);
+ mock_activate();
+ expect(mock_activate).toBeCalled();
+});