mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-13 09:04:14 +02:00
tests: tweak Jasmine's matchers usage
Use: * toBeNull * toEqual * toBeTrue * toBeFalse * toHaveSize * toHaveClass
This commit is contained in:
@@ -159,8 +159,8 @@ describe('Collapse', () => {
|
||||
}))
|
||||
|
||||
collapseEl2.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseEl2.classList.contains('show')).toEqual(true)
|
||||
expect(collapseEl1.classList.contains('show')).toEqual(false)
|
||||
expect(collapseEl2).toHaveClass('show')
|
||||
expect(collapseEl1).not.toHaveClass('show')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -212,7 +212,7 @@ describe('Collapse', () => {
|
||||
expect(collapseEl.style.height).toEqual('0px')
|
||||
})
|
||||
collapseEl.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseEl.classList.contains('show')).toEqual(true)
|
||||
expect(collapseEl).toHaveClass('show')
|
||||
expect(collapseEl.style.height).toEqual('')
|
||||
done()
|
||||
})
|
||||
@@ -232,7 +232,7 @@ describe('Collapse', () => {
|
||||
expect(collapseEl.style.width).toEqual('0px')
|
||||
})
|
||||
collapseEl.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseEl.classList.contains('show')).toEqual(true)
|
||||
expect(collapseEl).toHaveClass('show')
|
||||
expect(collapseEl.style.width).toEqual('')
|
||||
done()
|
||||
})
|
||||
@@ -257,8 +257,8 @@ describe('Collapse', () => {
|
||||
})
|
||||
|
||||
el1.addEventListener('shown.bs.collapse', () => {
|
||||
expect(el1.classList.contains('show')).toEqual(true)
|
||||
expect(el2.classList.contains('show')).toEqual(true)
|
||||
expect(el1).toHaveClass('show')
|
||||
expect(el2).toHaveClass('show')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -307,16 +307,16 @@ describe('Collapse', () => {
|
||||
const childCollapseEl2 = el('#childContent2')
|
||||
|
||||
parentCollapseEl.addEventListener('shown.bs.collapse', () => {
|
||||
expect(parentCollapseEl.classList.contains('show')).toEqual(true)
|
||||
expect(parentCollapseEl).toHaveClass('show')
|
||||
childBtn1.click()
|
||||
})
|
||||
childCollapseEl1.addEventListener('shown.bs.collapse', () => {
|
||||
expect(childCollapseEl1.classList.contains('show')).toEqual(true)
|
||||
expect(childCollapseEl1).toHaveClass('show')
|
||||
childBtn2.click()
|
||||
})
|
||||
childCollapseEl2.addEventListener('shown.bs.collapse', () => {
|
||||
expect(childCollapseEl2.classList.contains('show')).toEqual(true)
|
||||
expect(childCollapseEl1.classList.contains('show')).toEqual(false)
|
||||
expect(childCollapseEl2).toHaveClass('show')
|
||||
expect(childCollapseEl1).not.toHaveClass('show')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -359,7 +359,7 @@ describe('Collapse', () => {
|
||||
})
|
||||
|
||||
el.addEventListener('shown.bs.collapse', () => {
|
||||
expect(activeTabPane.classList.contains('show')).toEqual(true)
|
||||
expect(activeTabPane).toHaveClass('show')
|
||||
times++
|
||||
if (times === 2) {
|
||||
done()
|
||||
@@ -440,7 +440,7 @@ describe('Collapse', () => {
|
||||
})
|
||||
|
||||
collapseEl.addEventListener('hidden.bs.collapse', () => {
|
||||
expect(collapseEl.classList.contains('show')).toEqual(false)
|
||||
expect(collapseEl).not.toHaveClass('show')
|
||||
expect(collapseEl.style.height).toEqual('')
|
||||
done()
|
||||
})
|
||||
@@ -489,7 +489,7 @@ describe('Collapse', () => {
|
||||
|
||||
collapse.dispose()
|
||||
|
||||
expect(Collapse.getInstance(collapseEl)).toEqual(null)
|
||||
expect(Collapse.getInstance(collapseEl)).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -508,8 +508,8 @@ describe('Collapse', () => {
|
||||
spyOn(Event.prototype, 'preventDefault').and.callThrough()
|
||||
|
||||
triggerEl.addEventListener('click', event => {
|
||||
expect(event.target.isEqualNode(nestedTriggerEl)).toEqual(true)
|
||||
expect(event.delegateTarget.isEqualNode(triggerEl)).toEqual(true)
|
||||
expect(event.target.isEqualNode(nestedTriggerEl)).toBeTrue()
|
||||
expect(event.delegateTarget.isEqualNode(triggerEl)).toBeTrue()
|
||||
expect(Event.prototype.preventDefault).toHaveBeenCalled()
|
||||
done()
|
||||
})
|
||||
@@ -530,9 +530,9 @@ describe('Collapse', () => {
|
||||
|
||||
collapse2.addEventListener('shown.bs.collapse', () => {
|
||||
expect(trigger.getAttribute('aria-expanded')).toEqual('true')
|
||||
expect(trigger.classList.contains('collapsed')).toEqual(false)
|
||||
expect(collapse1.classList.contains('show')).toEqual(true)
|
||||
expect(collapse1.classList.contains('show')).toEqual(true)
|
||||
expect(trigger).not.toHaveClass('collapsed')
|
||||
expect(collapse1).toHaveClass('show')
|
||||
expect(collapse1).toHaveClass('show')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -552,9 +552,9 @@ describe('Collapse', () => {
|
||||
|
||||
collapse2.addEventListener('hidden.bs.collapse', () => {
|
||||
expect(trigger.getAttribute('aria-expanded')).toEqual('false')
|
||||
expect(trigger.classList.contains('collapsed')).toEqual(true)
|
||||
expect(collapse1.classList.contains('show')).toEqual(false)
|
||||
expect(collapse1.classList.contains('show')).toEqual(false)
|
||||
expect(trigger).toHaveClass('collapsed')
|
||||
expect(collapse1).not.toHaveClass('show')
|
||||
expect(collapse1).not.toHaveClass('show')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -575,8 +575,8 @@ describe('Collapse', () => {
|
||||
collapseTest1.addEventListener('shown.bs.collapse', () => {
|
||||
expect(link1.getAttribute('aria-expanded')).toEqual('true')
|
||||
expect(link2.getAttribute('aria-expanded')).toEqual('true')
|
||||
expect(link1.classList.contains('collapsed')).toEqual(false)
|
||||
expect(link2.classList.contains('collapsed')).toEqual(false)
|
||||
expect(link1).not.toHaveClass('collapsed')
|
||||
expect(link2).not.toHaveClass('collapsed')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -597,8 +597,8 @@ describe('Collapse', () => {
|
||||
collapseTest1.addEventListener('hidden.bs.collapse', () => {
|
||||
expect(link1.getAttribute('aria-expanded')).toEqual('false')
|
||||
expect(link2.getAttribute('aria-expanded')).toEqual('false')
|
||||
expect(link1.classList.contains('collapsed')).toEqual(true)
|
||||
expect(link2.classList.contains('collapsed')).toEqual(true)
|
||||
expect(link1).toHaveClass('collapsed')
|
||||
expect(link2).toHaveClass('collapsed')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -625,12 +625,12 @@ describe('Collapse', () => {
|
||||
const collapseTwo = fixtureEl.querySelector('#collapseTwo')
|
||||
|
||||
collapseOne.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseOne.classList.contains('show')).toEqual(true)
|
||||
expect(collapseTwo.classList.contains('show')).toEqual(false)
|
||||
expect(collapseOne).toHaveClass('show')
|
||||
expect(collapseTwo).not.toHaveClass('show')
|
||||
|
||||
collapseTwo.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseOne.classList.contains('show')).toEqual(false)
|
||||
expect(collapseTwo.classList.contains('show')).toEqual(true)
|
||||
expect(collapseOne).not.toHaveClass('show')
|
||||
expect(collapseTwo).toHaveClass('show')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -650,8 +650,8 @@ describe('Collapse', () => {
|
||||
const collapseEl = fixtureEl.querySelector('#collapsediv1')
|
||||
|
||||
collapseEl.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseEl.classList.contains('show')).toEqual(true)
|
||||
expect(target.checked).toEqual(true)
|
||||
expect(collapseEl).toHaveClass('show')
|
||||
expect(target.checked).toBeTrue()
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -684,21 +684,21 @@ describe('Collapse', () => {
|
||||
const collapseTwoEl = fixtureEl.querySelector('#collapseTwo')
|
||||
|
||||
collapseOneEl.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseOneEl.classList.contains('show')).toEqual(true)
|
||||
expect(triggerEl.classList.contains('collapsed')).toEqual(false)
|
||||
expect(collapseOneEl).toHaveClass('show')
|
||||
expect(triggerEl).not.toHaveClass('collapsed')
|
||||
expect(triggerEl.getAttribute('aria-expanded')).toEqual('true')
|
||||
|
||||
expect(collapseTwoEl.classList.contains('show')).toEqual(false)
|
||||
expect(triggerTwoEl.classList.contains('collapsed')).toEqual(true)
|
||||
expect(collapseTwoEl).not.toHaveClass('show')
|
||||
expect(triggerTwoEl).toHaveClass('collapsed')
|
||||
expect(triggerTwoEl.getAttribute('aria-expanded')).toEqual('false')
|
||||
|
||||
collapseTwoEl.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseOneEl.classList.contains('show')).toEqual(false)
|
||||
expect(triggerEl.classList.contains('collapsed')).toEqual(true)
|
||||
expect(collapseOneEl).not.toHaveClass('show')
|
||||
expect(triggerEl).toHaveClass('collapsed')
|
||||
expect(triggerEl.getAttribute('aria-expanded')).toEqual('false')
|
||||
|
||||
expect(collapseTwoEl.classList.contains('show')).toEqual(true)
|
||||
expect(triggerTwoEl.classList.contains('collapsed')).toEqual(false)
|
||||
expect(collapseTwoEl).toHaveClass('show')
|
||||
expect(triggerTwoEl).not.toHaveClass('collapsed')
|
||||
expect(triggerTwoEl.getAttribute('aria-expanded')).toEqual('true')
|
||||
done()
|
||||
})
|
||||
@@ -733,21 +733,21 @@ describe('Collapse', () => {
|
||||
}
|
||||
|
||||
function firstTest() {
|
||||
expect(collapseOneOne.classList.contains('show')).toEqual(true)
|
||||
expect(collapseOneTwo.classList.contains('show')).toEqual(true)
|
||||
expect(collapseOneOne).toHaveClass('show')
|
||||
expect(collapseOneTwo).toHaveClass('show')
|
||||
|
||||
expect(collapseTwoOne.classList.contains('show')).toEqual(false)
|
||||
expect(collapseTwoTwo.classList.contains('show')).toEqual(false)
|
||||
expect(collapseTwoOne).not.toHaveClass('show')
|
||||
expect(collapseTwoTwo).not.toHaveClass('show')
|
||||
|
||||
triggerTwo.click()
|
||||
}
|
||||
|
||||
function secondTest() {
|
||||
expect(collapseOneOne.classList.contains('show')).toEqual(false)
|
||||
expect(collapseOneTwo.classList.contains('show')).toEqual(false)
|
||||
expect(collapseOneOne).not.toHaveClass('show')
|
||||
expect(collapseOneTwo).not.toHaveClass('show')
|
||||
|
||||
expect(collapseTwoOne.classList.contains('show')).toEqual(true)
|
||||
expect(collapseTwoTwo.classList.contains('show')).toEqual(true)
|
||||
expect(collapseTwoOne).toHaveClass('show')
|
||||
expect(collapseTwoTwo).toHaveClass('show')
|
||||
done()
|
||||
}
|
||||
|
||||
@@ -815,9 +815,9 @@ describe('Collapse', () => {
|
||||
const nestedCollapseOne = fixtureEl.querySelector('#nestedCollapseOne')
|
||||
|
||||
function handlerCollapseOne() {
|
||||
expect(collapseOne.classList.contains('show')).toEqual(true)
|
||||
expect(collapseTwo.classList.contains('show')).toEqual(false)
|
||||
expect(nestedCollapseOne.classList.contains('show')).toEqual(false)
|
||||
expect(collapseOne).toHaveClass('show')
|
||||
expect(collapseTwo).not.toHaveClass('show')
|
||||
expect(nestedCollapseOne).not.toHaveClass('show')
|
||||
|
||||
nestedCollapseOne.addEventListener('shown.bs.collapse', handlerNestedCollapseOne)
|
||||
nestedTrigger.click()
|
||||
@@ -825,14 +825,14 @@ describe('Collapse', () => {
|
||||
}
|
||||
|
||||
function handlerNestedCollapseOne() {
|
||||
expect(collapseOne.classList.contains('show')).toEqual(true)
|
||||
expect(collapseTwo.classList.contains('show')).toEqual(false)
|
||||
expect(nestedCollapseOne.classList.contains('show')).toEqual(true)
|
||||
expect(collapseOne).toHaveClass('show')
|
||||
expect(collapseTwo).not.toHaveClass('show')
|
||||
expect(nestedCollapseOne).toHaveClass('show')
|
||||
|
||||
collapseTwo.addEventListener('shown.bs.collapse', () => {
|
||||
expect(collapseOne.classList.contains('show')).toEqual(false)
|
||||
expect(collapseTwo.classList.contains('show')).toEqual(true)
|
||||
expect(nestedCollapseOne.classList.contains('show')).toEqual(true)
|
||||
expect(collapseOne).not.toHaveClass('show')
|
||||
expect(collapseTwo).toHaveClass('show')
|
||||
expect(nestedCollapseOne).toHaveClass('show')
|
||||
done()
|
||||
})
|
||||
|
||||
@@ -860,33 +860,33 @@ describe('Collapse', () => {
|
||||
const target2 = fixtureEl.querySelector('#test2')
|
||||
|
||||
const target2Shown = () => {
|
||||
expect(trigger1.classList.contains('collapsed')).toEqual(false)
|
||||
expect(trigger1).not.toHaveClass('collapsed')
|
||||
expect(trigger1.getAttribute('aria-expanded')).toEqual('true')
|
||||
|
||||
expect(trigger2.classList.contains('collapsed')).toEqual(false)
|
||||
expect(trigger2).not.toHaveClass('collapsed')
|
||||
expect(trigger2.getAttribute('aria-expanded')).toEqual('true')
|
||||
|
||||
expect(trigger3.classList.contains('collapsed')).toEqual(false)
|
||||
expect(trigger3).not.toHaveClass('collapsed')
|
||||
expect(trigger3.getAttribute('aria-expanded')).toEqual('true')
|
||||
|
||||
target2.addEventListener('hidden.bs.collapse', () => {
|
||||
expect(trigger1.classList.contains('collapsed')).toEqual(false)
|
||||
expect(trigger1).not.toHaveClass('collapsed')
|
||||
expect(trigger1.getAttribute('aria-expanded')).toEqual('true')
|
||||
|
||||
expect(trigger2.classList.contains('collapsed')).toEqual(true)
|
||||
expect(trigger2).toHaveClass('collapsed')
|
||||
expect(trigger2.getAttribute('aria-expanded')).toEqual('false')
|
||||
|
||||
expect(trigger3.classList.contains('collapsed')).toEqual(false)
|
||||
expect(trigger3).not.toHaveClass('collapsed')
|
||||
expect(trigger3.getAttribute('aria-expanded')).toEqual('true')
|
||||
|
||||
target1.addEventListener('hidden.bs.collapse', () => {
|
||||
expect(trigger1.classList.contains('collapsed')).toEqual(true)
|
||||
expect(trigger1).toHaveClass('collapsed')
|
||||
expect(trigger1.getAttribute('aria-expanded')).toEqual('false')
|
||||
|
||||
expect(trigger2.classList.contains('collapsed')).toEqual(true)
|
||||
expect(trigger2).toHaveClass('collapsed')
|
||||
expect(trigger2.getAttribute('aria-expanded')).toEqual('false')
|
||||
|
||||
expect(trigger3.classList.contains('collapsed')).toEqual(true)
|
||||
expect(trigger3).toHaveClass('collapsed')
|
||||
expect(trigger3.getAttribute('aria-expanded')).toEqual('false')
|
||||
done()
|
||||
})
|
||||
@@ -961,7 +961,7 @@ describe('Collapse', () => {
|
||||
|
||||
const div = fixtureEl.querySelector('div')
|
||||
|
||||
expect(Collapse.getInstance(div)).toEqual(null)
|
||||
expect(Collapse.getInstance(div)).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -982,7 +982,7 @@ describe('Collapse', () => {
|
||||
|
||||
const div = fixtureEl.querySelector('div')
|
||||
|
||||
expect(Collapse.getInstance(div)).toEqual(null)
|
||||
expect(Collapse.getInstance(div)).toBeNull()
|
||||
expect(Collapse.getOrCreateInstance(div)).toBeInstanceOf(Collapse)
|
||||
})
|
||||
|
||||
@@ -991,13 +991,13 @@ describe('Collapse', () => {
|
||||
|
||||
const div = fixtureEl.querySelector('div')
|
||||
|
||||
expect(Collapse.getInstance(div)).toEqual(null)
|
||||
expect(Collapse.getInstance(div)).toBeNull()
|
||||
const collapse = Collapse.getOrCreateInstance(div, {
|
||||
toggle: false
|
||||
})
|
||||
expect(collapse).toBeInstanceOf(Collapse)
|
||||
|
||||
expect(collapse._config.toggle).toEqual(false)
|
||||
expect(collapse._config.toggle).toBeFalse()
|
||||
})
|
||||
|
||||
it('should return the instance when exists without given configuration', () => {
|
||||
@@ -1015,7 +1015,7 @@ describe('Collapse', () => {
|
||||
expect(collapse).toBeInstanceOf(Collapse)
|
||||
expect(collapse2).toEqual(collapse)
|
||||
|
||||
expect(collapse2._config.toggle).toEqual(false)
|
||||
expect(collapse2._config.toggle).toBeFalse()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
Reference in New Issue
Block a user