Skip to content
This repository was archived by the owner on Dec 1, 2023. It is now read-only.

Commit 37afd3b

Browse files
Dale Alexander Webbmgcrea
authored andcommitted
test(modal): added unit tests for aside and modal z-index values
1 parent abedaa4 commit 37afd3b

File tree

3 files changed

+48
-2
lines changed

3 files changed

+48
-2
lines changed

src/aside/test/aside.spec.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,28 @@ describe('aside', function () {
256256
expect(bodyEl.find('.aside-backdrop').length).toBe(0);
257257
});
258258

259+
it('should show backdrop above a previous aside dialog using the z-index value', function() {
260+
var elm1 = compileDirective('default');
261+
var elm2 = compileDirective('default');
262+
263+
expect(bodyEl.find('.aside-backdrop').length).toBe(0);
264+
265+
angular.element(elm1[0]).triggerHandler('click');
266+
expect(bodyEl.find('.aside-backdrop').length).toBe(1);
267+
var backdrop1 = bodyEl.find('.aside-backdrop')[0];
268+
var aside1 = bodyEl.find('.aside')[0];
269+
270+
angular.element(elm2[0]).triggerHandler('click');
271+
expect(bodyEl.find('.aside-backdrop').length).toBe(2);
272+
var backdrop2 = bodyEl.find('.aside-backdrop')[0];
273+
var aside2 = bodyEl.find('.aside')[1];
274+
275+
expect(angular.element(backdrop1).css('z-index')).toBe('1040');
276+
expect(angular.element(aside1).css('z-index')).toBe('1050');
277+
expect(angular.element(backdrop2).css('z-index')).toBe('1060');
278+
expect(angular.element(aside2).css('z-index')).toBe('1070');
279+
});
280+
259281
});
260282

261283
describe('keyboard', function() {

src/modal/modal.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,10 @@ angular.module('mgcrea.ngStrap.modal', ['mgcrea.ngStrap.core', 'mgcrea.ngStrap.h
197197
$modal.hide = function() {
198198
if(!$modal.$isShown) return;
199199

200-
// decrement number of modals
201-
backdropCount--;
200+
if(options.backdrop) {
201+
// decrement number of modals
202+
backdropCount--;
203+
}
202204

203205
if(scope.$emit(options.prefixEvent + '.hide.before', $modal).defaultPrevented) {
204206
return;

src/modal/test/modal.spec.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,28 @@ describe('modal', function() {
671671
expect(bodyEl.find('.modal-backdrop').length).toBe(0);
672672
});
673673

674+
it('should show backdrop above a previous modal dialog using the z-index value', function() {
675+
var elm1 = compileDirective('default');
676+
var elm2 = compileDirective('default');
677+
678+
expect(bodyEl.find('.modal-backdrop').length).toBe(0);
679+
680+
angular.element(elm1[0]).triggerHandler('click');
681+
expect(bodyEl.find('.modal-backdrop').length).toBe(1);
682+
var backdrop1 = bodyEl.find('.modal-backdrop')[0];
683+
var modal1 = bodyEl.find('.modal')[0];
684+
685+
angular.element(elm2[0]).triggerHandler('click');
686+
expect(bodyEl.find('.modal-backdrop').length).toBe(2);
687+
var backdrop2 = bodyEl.find('.modal-backdrop')[0];
688+
var modal2 = bodyEl.find('.modal')[1];
689+
690+
expect(angular.element(backdrop1).css('z-index')).toBe('1040');
691+
expect(angular.element(modal1).css('z-index')).toBe('1050');
692+
expect(angular.element(backdrop2).css('z-index')).toBe('1060');
693+
expect(angular.element(modal2).css('z-index')).toBe('1070');
694+
});
695+
674696
});
675697

676698

0 commit comments

Comments
 (0)