Skip to content

Commit 9733234

Browse files
committed
Revert "Generalize tests for both list types"
This reverts commit 88b1a76.
1 parent 68a6950 commit 9733234

File tree

1 file changed

+15
-40
lines changed

1 file changed

+15
-40
lines changed

test/test.js

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ describe('markdown-toolbar-element', function () {
3232
toolbar.querySelector(selector).click()
3333
}
3434

35-
function assertNormalizedList(str, ordered = false) {
36-
let listIndex = 0
37-
const stringToCompare = ordered
38-
? str.replace('- ', (matched, index, original) => {
39-
++listIndex
40-
return `${listIndex}. `
41-
})
42-
: str
43-
assert.equal(stringToCompare, visualValue())
44-
}
45-
4635
function visualValue() {
4736
const textarea = document.querySelector('textarea')
4837
const before = textarea.value.slice(0, textarea.selectionStart)
@@ -495,63 +484,49 @@ describe('markdown-toolbar-element', function () {
495484
})
496485
})
497486

498-
function listTests(toolbarItem, orderedList) {
487+
describe('unordered list', function () {
499488
it('turns line into list if cursor at end of line', function () {
500489
setVisualValue('One\nTwo|\nThree\n')
501-
clickToolbar(toolbarItem)
502-
assertNormalizedList('One\n\n- Two|\n\nThree\n', orderedList)
490+
clickToolbar('md-unordered-list')
491+
assert.equal('One\n\n- Two|\n\nThree\n', visualValue())
503492
})
504493

505494
it('turns line into list if cursor at end of document', function () {
506495
setVisualValue('One\nTwo\nThree|')
507-
clickToolbar(toolbarItem)
508-
assertNormalizedList('One\nTwo\n\n- Three|', orderedList)
496+
clickToolbar('md-unordered-list')
497+
assert.equal('One\nTwo\n\n- Three|', visualValue())
509498
})
510499

511500
it('turns line into list if cursor at beginning of line', function () {
512501
setVisualValue('One\n|Two\nThree\n')
513-
clickToolbar(toolbarItem)
514-
assertNormalizedList('One\n\n- |Two\n\nThree\n', orderedList)
502+
clickToolbar('md-unordered-list')
503+
assert.equal('One\n\n- |Two\n\nThree\n', visualValue())
515504
})
516505

517506
it('turns line into list if cursor at middle of line', function () {
518507
setVisualValue('One\nT|wo\nThree\n')
519-
clickToolbar(toolbarItem)
520-
assertNormalizedList('One\n\n- T|wo\n\nThree\n', orderedList)
521-
})
522-
523-
it('turns selection into list if line is selected', function () {
524-
setVisualValue('One\n|Two|\nThree\n')
525-
clickToolbar(toolbarItem)
526-
assertNormalizedList('One\n\n- |Two|\n\nThree\n', orderedList)
508+
clickToolbar('md-unordered-list')
509+
assert.equal('One\n\n- T|wo\n\nThree\n', visualValue())
527510
})
528511

529512
it('turns line into list if partial line is selected', function () {
530513
setVisualValue('One\nT|w|o\nThree\n')
531-
clickToolbar(toolbarItem)
532-
assertNormalizedList('One\n\n- T|w|o\n\nThree\n', orderedList)
514+
clickToolbar('md-unordered-list')
515+
assert.equal('One\n\n- T|w|o\n\nThree\n', visualValue())
533516
})
534517

535518
it('turns two lines into list if two lines are selected', function () {
536519
setVisualValue('|One\nTwo|\nThree\n')
537-
clickToolbar(toolbarItem)
538-
assertNormalizedList('|- One\n- Two|\n\nThree\n', orderedList)
520+
clickToolbar('md-unordered-list')
521+
assert.equal('|- One\n- Two|\n\nThree\n', visualValue())
539522
})
540523

541524
it('turns two lines into list if 2 lines are partially selected', function () {
542525
setVisualValue('O|ne\nTw|o\nThree\n')
543-
clickToolbar(toolbarItem)
544-
assertNormalizedList('- O|ne\n- Tw|o\n\nThree\n', orderedList)
526+
clickToolbar('md-unordered-list')
527+
assert.equal('- O|ne\n- Tw|o\n\nThree\n', visualValue())
545528
})
546529
// TODO: Add undo test for all of this
547-
}
548-
549-
describe('unordered list', function () {
550-
listTests('md-unordered-list', false)
551-
})
552-
553-
describe('ordered list', function () {
554-
listTests('md-ordered-list', true)
555530
})
556531

557532
describe('lists', function () {

0 commit comments

Comments
 (0)