From 81b580accc3e0c48fb96f668be63680d9f055acd Mon Sep 17 00:00:00 2001 From: Andrea Parmeggiani Date: Thu, 19 Dec 2019 20:34:53 +0100 Subject: [PATCH 1/5] Update modal-custom.html --- .../Magento/Ui/view/base/web/templates/modal/modal-custom.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/templates/modal/modal-custom.html b/app/code/Magento/Ui/view/base/web/templates/modal/modal-custom.html index 5e7fd11dbf693..7d7d4b6ae88cb 100644 --- a/app/code/Magento/Ui/view/base/web/templates/modal/modal-custom.html +++ b/app/code/Magento/Ui/view/base/web/templates/modal/modal-custom.html @@ -27,7 +27,7 @@

+ data-role="subTitle"> <%= data.subTitle %> <% } %> From 75b6674a6dbaa6ddce5ca4d11e48e8f787210280 Mon Sep 17 00:00:00 2001 From: Andrea Parmeggiani Date: Thu, 19 Dec 2019 20:37:20 +0100 Subject: [PATCH 2/5] Modal subTitle fix --- .../Magento/Ui/view/base/web/templates/modal/modal-popup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/templates/modal/modal-popup.html b/app/code/Magento/Ui/view/base/web/templates/modal/modal-popup.html index 53661ed8df87f..08376964eee63 100644 --- a/app/code/Magento/Ui/view/base/web/templates/modal/modal-popup.html +++ b/app/code/Magento/Ui/view/base/web/templates/modal/modal-popup.html @@ -27,7 +27,7 @@

+ data-role="subTitle"> <%= data.subTitle %> <% } %> From a1212509c813239ef8ab0236d623414831bbac12 Mon Sep 17 00:00:00 2001 From: Nazar Klovanych Date: Mon, 20 Jan 2020 12:37:34 +0200 Subject: [PATCH 3/5] cover changes with jasmine test --- .../Magento/Ui/base/js/modal/modal.test.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js index 8b00ecd3a2aed..ddf9c82bd1886 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js @@ -10,18 +10,34 @@ define([ 'use strict'; describe('ui/js/modal/modal', function () { - var element = $('
some element
'), + + var element = $('
Element
'), modal = element.modal({}).data('mage-modal'); + $(element).append('

Title

' + + ''); + it('Check for modal definition', function () { expect(modal).toBeDefined(); }); + it('Show/hide function check', function () { expect(element.trigger('openModal')).toBe(element); expect(element.trigger('closeModal')).toBe(element); }); + it('Integration: modal created on page', function () { expect($(modal).length).toEqual(1); }); + + it('Verify stTitle() method set title', function () { + var newTitle = 'New modal title'; + + modal.setTitle(newTitle); + expect($(modal.options.modalTitle).text()).toBe(newTitle); + expect($(modal.options.modalTitle).find(modal.options.modalSubTitle).length).toBe(1); + }); }); }); From fcce5b8592f884bec431767d903150137a1a6c6e Mon Sep 17 00:00:00 2001 From: Nazar Klovanych Date: Mon, 20 Jan 2020 13:03:54 +0200 Subject: [PATCH 4/5] fix typo --- .../tests/app/code/Magento/Ui/base/js/modal/modal.test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js index ddf9c82bd1886..ccfad86c6cfb0 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js @@ -32,12 +32,12 @@ define([ expect($(modal).length).toEqual(1); }); - it('Verify stTitle() method set title', function () { + it('Verify setTitle() method set title', function () { var newTitle = 'New modal title'; modal.setTitle(newTitle); - expect($(modal.options.modalTitle).text()).toBe(newTitle); - expect($(modal.options.modalTitle).find(modal.options.modalSubTitle).length).toBe(1); + expect($(modal.options.modalTitle).text()).toContain(newTitle); + expect($(modal.options.modalTitle).find(modal.options.modalSubTitle).length).toBe(2); }); }); }); From 435c3fe27964a15729ecbc2ebbafe04b34412faf Mon Sep 17 00:00:00 2001 From: Nazar Klovanych Date: Mon, 10 Feb 2020 09:42:21 +0200 Subject: [PATCH 5/5] remove fixtures after test --- .../Magento/Ui/base/js/modal/modal.test.js | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js index ccfad86c6cfb0..3625d0898e942 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js @@ -11,13 +11,24 @@ define([ describe('ui/js/modal/modal', function () { - var element = $('
Element
'), + var element, + modal; + + beforeEach(function () { + element = $('
Element
'); modal = element.modal({}).data('mage-modal'); - $(element).append('

Title

' + - ''); + $(element).append('

Title

' + + ''); + }); + + afterEach(function () { + $('.modal-title').remove(); + $('#element').remove(); + + }); it('Check for modal definition', function () { expect(modal).toBeDefined(); @@ -32,12 +43,12 @@ define([ expect($(modal).length).toEqual(1); }); - it('Verify setTitle() method set title', function () { + it('Verify set title', function () { var newTitle = 'New modal title'; modal.setTitle(newTitle); expect($(modal.options.modalTitle).text()).toContain(newTitle); - expect($(modal.options.modalTitle).find(modal.options.modalSubTitle).length).toBe(2); + expect($(modal.options.modalTitle).find(modal.options.modalSubTitle).length).toBe(1); }); }); });