diff --git a/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js b/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js index 0eecb1c31e7614a7b5ab39da54405e3d71e951da..409f532147fc2841d8ec1656c461454fec1122c4 100644 --- a/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js +++ b/frontend-js/src/main/js/gui/admin/EditGenomeDialog.js @@ -184,7 +184,7 @@ EditGenomeDialog.prototype.createGeneralTabContent = function () { var saveUserButton = Functions.createElement({ type: "button", - name: "saveUser", + name: "saveGenome", content: '<span class="ui-icon ui-icon-disk"></span> SAVE', onclick: function () { return self.onSaveClicked().then(function () { @@ -195,7 +195,7 @@ EditGenomeDialog.prototype.createGeneralTabContent = function () { }); var cancelButton = Functions.createElement({ type: "button", - name: "cancelProject", + name: "cancelGenome", content: '<span class="ui-icon ui-icon-cancel"></span> CANCEL', onclick: function () { return self.close(); diff --git a/frontend-js/src/test/js/gui/admin/EditGenomeDialog-test.js b/frontend-js/src/test/js/gui/admin/EditGenomeDialog-test.js index 3f2b343e53b2f0298c53b6e9fbecce251adce3af..2eb9151181c3a36920d5e7366c97a16e300efc7f 100644 --- a/frontend-js/src/test/js/gui/admin/EditGenomeDialog-test.js +++ b/frontend-js/src/test/js/gui/admin/EditGenomeDialog-test.js @@ -36,4 +36,29 @@ describe('EditGenomeDialog', function () { }); }); + describe('click cancel', function () { + it('new genome', function () { + var dialog; + var project; + var genome = new ReferenceGenome(); + return ServerConnector.getProject().then(function (result) { + project = result; + dialog = new EditGenomeDialog({ + element: testDiv, + project: project, + referenceGenome: genome, + customMap: null, + serverConnector: ServerConnector + }); + return dialog.init(); + }).then(function () { + return dialog.open(); + }).then(function () { + return $("[name=cancelGenome]", testDiv)[0].onclick(); + }).then(function () { + dialog.destroy(); + }); + }); + }); + }); diff --git a/frontend-js/src/test/js/helper.js b/frontend-js/src/test/js/helper.js index bb886842375a076532515e8536e94d5b89f3d109..351c01ae74e9af18472876c3471ac601e577d94c 100644 --- a/frontend-js/src/test/js/helper.js +++ b/frontend-js/src/test/js/helper.js @@ -488,6 +488,12 @@ Helper.prototype.loginWithoutAccess = function () { }; +/** + * + * @param {HTMLElement} element + * @param {string} eventType + * @returns {Promise} + */ Helper.prototype.triggerJqueryEvent = function (element, eventType) { var domElements = $("*"); var promises = []; @@ -499,6 +505,8 @@ Helper.prototype.triggerJqueryEvent = function (element, eventType) { var event = events[j]; var eventTargets = $(event.selector, domElement); for (var k = 0; k < eventTargets.length; k++) { + console.log(element); + console.log(eventTargets[k]); if (element === eventTargets[k]) { promises.push(event.handler.call(element)) }