[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Properly escape IDs in getSelector() to handle weird IDs #35566

Merged
merged 11 commits into from
Nov 7, 2022
Merged

Properly escape IDs in getSelector() to handle weird IDs #35566

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5181d60
style: pass linter
Dec 18, 2021
507b0d6
test(tab): added UTest to ensure we also close #31099
Dec 18, 2021
70b14e6
test(getSelector): use new codepath only if CSS.escape() is available…
Dec 25, 2021
99e63e9
Update js/tests/unit/tab.spec.js
pierresouchay Jan 12, 2022
8434e06
Updated js/tests/unit/collapse.js after rebase to include HTML5 IDs
Jan 31, 2022
637913d
Properly use CSS.escape() when selector is complex
Aug 23, 2022
d902d55
Added Utest to validate that complex selectors do properly work
Aug 23, 2022
a6bf1e3
Increase bundle size for ./dist/js/bootstrap.bundle.min.js
Nov 7, 2022
332cd26
properly handle selectors with attributes and quotes
Nov 7, 2022
a3c20fd
Update .bundlewatch.config.json
GeoSot Nov 7, 2022
a48a16a
Update js/src/util/index.js
GeoSot Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added Utest to validate that complex selectors do properly work
  • Loading branch information
Pierre Souchay committed Nov 7, 2022
commit d902d5597442a7ccbdc43f085240f943473c606f
140 changes: 140 additions & 0 deletions js/tests/unit/util/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,146 @@ describe('Util', () => {
})
})

<<<<<<< HEAD
=======
describe('getSelectorFromElement', () => {
it('should get selector from data-bs-target', () => {
fixtureEl.innerHTML = [
'<div id="test" data-bs-target=".target"></div>',
'<div class="target"></div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getSelectorFromElement(testEl)).toEqual('.target')
})

it('should get selector from href if no data-bs-target set', () => {
fixtureEl.innerHTML = [
'<a id="test" href=".target"></a>',
'<div class="target"></div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getSelectorFromElement(testEl)).toEqual('.target')
})

it('should get selector from href if data-bs-target equal to #', () => {
fixtureEl.innerHTML = [
'<a id="test" data-bs-target="#" href=".target"></a>',
'<div class="target"></div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getSelectorFromElement(testEl)).toEqual('.target')
})

it('should return null if a selector from a href is a url without an anchor', () => {
fixtureEl.innerHTML = [
'<a id="test" data-bs-target="#" href="foo/bar.html"></a>',
'<div class="target"></div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getSelectorFromElement(testEl)).toBeNull()
})

it('should return the anchor if a selector from a href is a url', () => {
fixtureEl.innerHTML = [
'<a id="test" data-bs-target="#" href="foo/bar.html#target"></a>',
'<div id="target"></div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getSelectorFromElement(testEl)).toEqual('#target')
})

it('should return null if selector not found', () => {
fixtureEl.innerHTML = '<a id="test" href=".target"></a>'

const testEl = fixtureEl.querySelector('#test')

expect(Util.getSelectorFromElement(testEl)).toBeNull()
})

it('should return null if no selector', () => {
fixtureEl.innerHTML = '<div></div>'

const testEl = fixtureEl.querySelector('div')

expect(Util.getSelectorFromElement(testEl)).toBeNull()
})
})

describe('getElementFromSelector', () => {
it('should get element from data-bs-target', () => {
fixtureEl.innerHTML = [
'<div id="test" data-bs-target=".target"></div>',
'<div class="target"></div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getElementFromSelector(testEl)).toEqual(fixtureEl.querySelector('.target'))
})

it('should get element from href if no data-bs-target set', () => {
fixtureEl.innerHTML = [
'<a id="test" href=".target"></a>',
'<div class="target"></div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getElementFromSelector(testEl)).toEqual(fixtureEl.querySelector('.target'))
})

it('should get element with id starting with int', () => {
fixtureEl.innerHTML = [
'<a id="test" href="#42/weird/id"></a>',
'<div id="42/weird/id"></div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getElementFromSelector(testEl)).toEqual(fixtureEl.querySelector('#' + CSS.escape('42/weird/id')))
})

it('should get complex elements with numbers in IDs', () => {
fixtureEl.innerHTML = [
'<a id="test" data-bs-target=".foo #2foo">a test</a>',
'<div class="foo">',
'<a class="mytarget" id="2foo" href="#42/weird/id"></a>',
'</div>'
].join('')

const testEl = fixtureEl.querySelector('#test')

expect(Util.getElementFromSelector(testEl)).toEqual(fixtureEl.querySelector(".mytarget"))
})

it('should return null if element not found', () => {
fixtureEl.innerHTML = '<a id="test" href=".target"></a>'

const testEl = fixtureEl.querySelector('#test')

expect(Util.getElementFromSelector(testEl)).toBeNull()
})

it('should return null if no selector', () => {
fixtureEl.innerHTML = '<div></div>'

const testEl = fixtureEl.querySelector('div')

expect(Util.getElementFromSelector(testEl)).toBeNull()
})
})

>>>>>>> b50233dbc (Added Utest to validate that complex selectors do properly work)
describe('getTransitionDurationFromElement', () => {
it('should get transition from element', () => {
fixtureEl.innerHTML = '<div style="transition: all 300ms ease-out;"></div>'
Expand Down