fix modal test to be sure we call getTransitionDurationFromElement
This commit is contained in:
parent
3c49467224
commit
b54ddfda83
|
@ -669,7 +669,7 @@ $(function () {
|
||||||
})
|
})
|
||||||
|
|
||||||
QUnit.test('transition duration should be the modal-dialog duration before triggering shown event', function (assert) {
|
QUnit.test('transition duration should be the modal-dialog duration before triggering shown event', function (assert) {
|
||||||
assert.expect(2)
|
assert.expect(1)
|
||||||
var done = assert.async()
|
var done = assert.async()
|
||||||
var style = [
|
var style = [
|
||||||
'<style>',
|
'<style>',
|
||||||
|
@ -694,22 +694,17 @@ $(function () {
|
||||||
'</div>'
|
'</div>'
|
||||||
].join('')
|
].join('')
|
||||||
|
|
||||||
var beginTimestamp = 0
|
|
||||||
var $modal = $(modalHTML).appendTo('#qunit-fixture')
|
var $modal = $(modalHTML).appendTo('#qunit-fixture')
|
||||||
var $modalDialog = $('.modal-dialog')
|
var expectedTransitionDuration = 300
|
||||||
var transitionDuration = Util.getTransitionDurationFromElement($modalDialog[0])
|
var spy = sinon.spy(Util, 'getTransitionDurationFromElement')
|
||||||
|
|
||||||
assert.strictEqual(transitionDuration, 300)
|
|
||||||
|
|
||||||
$modal.on('shown.bs.modal', function () {
|
$modal.on('shown.bs.modal', function () {
|
||||||
var diff = Date.now() - beginTimestamp
|
assert.ok(spy.returned(expectedTransitionDuration))
|
||||||
assert.ok(diff < 400)
|
|
||||||
$style.remove()
|
$style.remove()
|
||||||
|
spy.restore()
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
.bootstrapModal('show')
|
.bootstrapModal('show')
|
||||||
|
|
||||||
beginTimestamp = Date.now()
|
|
||||||
})
|
})
|
||||||
|
|
||||||
QUnit.test('should dispose modal', function (assert) {
|
QUnit.test('should dispose modal', function (assert) {
|
||||||
|
|
Loading…
Reference in New Issue