Fix counter continue in highlighted-fence-replacer.tsx (#943)

Signed-off-by: Tilman Vatteroth <tilman.vatteroth@tu-dortmund.de>
This commit is contained in:
Tilman Vatteroth 2021-01-13 11:52:06 +01:00 committed by GitHub
parent 7be64bc582
commit 9f6b1a9a46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 197 additions and 117 deletions

View file

@ -1,98 +0,0 @@
/*
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
describe('Code', () => {
beforeEach(() => {
cy.visit('/n/test', {
onBeforeLoad (win: Window): void {
cy.spy(win.navigator.clipboard, 'writeText').as('copy')
}
})
cy.get('.btn.active.btn-outline-secondary > i.fa-columns')
.should('exist')
cy.get('.CodeMirror')
.click()
.get('textarea')
.as('codeinput')
})
describe('without = doesn\'t show gutter', () => {
it('without wrapLines active', () => {
cy.get('@codeinput')
.fill('```javascript \nlet x = 0\n```')
cy.get('.markdown-body > pre > code')
.should('have.class', 'hljs')
})
it('with wrapLines active', () => {
cy.get('@codeinput')
.fill('```javascript!\nlet x = 0\n```')
cy.get('.markdown-body > pre > code')
.should('have.class', 'hljs')
.should('have.class', 'wrapLines')
})
})
describe('with = shows gutter', () => {
it('without wrapLines active', () => {
cy.get('@codeinput')
.fill('```javascript=\nlet x = 0\n```')
cy.get('.markdown-body > pre > code')
.should('have.class', 'hljs')
.should('have.class', 'showGutter')
cy.get('.markdown-body > pre > code > span')
.should('have.class', 'linenumber')
.should('have.attr', 'data-line-number', '1')
})
it('with wrapLines active', () => {
cy.get('@codeinput')
.fill('```javascript=! \nlet x = 0\n```')
cy.get('.markdown-body > pre > code')
.should('have.class', 'hljs')
.should('have.class', 'showGutter')
.should('have.class', 'wrapLines')
cy.get('.markdown-body > pre > code > span')
.should('have.class', 'linenumber')
.should('have.attr', 'data-line-number', '1')
})
})
describe('with = shows gutter and number is used as startline', () => {
it('without wrapLines active', () => {
cy.get('@codeinput')
.fill('```javascript=100\nlet x = 0\n```')
cy.get('.markdown-body > pre > code')
.should('have.class', 'hljs')
.should('have.class', 'showGutter')
cy.get('.markdown-body > pre > code > span')
.should('have.class', 'linenumber')
.should('have.attr', 'data-line-number', '100')
})
it('with wrapLines active', () => {
cy.get('@codeinput')
.fill('```javascript=100! \nlet x = 0\n```')
cy.get('.markdown-body > pre > code')
.should('have.class', 'hljs')
.should('have.class', 'showGutter')
.should('have.class', 'wrapLines')
cy.get('.markdown-body > pre > code > span')
.should('have.class', 'linenumber')
.should('have.attr', 'data-line-number', '100')
})
})
it('has a button', () => {
cy.get('@codeinput')
.fill('```javascript \nlet x = 0\n```')
cy.get('.markdown-body > pre > div > button > i')
.should('have.class', 'fa-files-o')
.click()
cy.get('@copy').should('be.calledWithExactly', 'let x = 0\n')
})
})

View file

@ -0,0 +1,171 @@
/*
* SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file)
*
* SPDX-License-Identifier: AGPL-3.0-only
*/
describe('Code', () => {
beforeEach(() => {
cy.visit('/n/test', {
onBeforeLoad (win: Window): void {
cy.spy(win.navigator.clipboard, 'writeText').as('copy')
}
})
cy.get('.btn.active.btn-outline-secondary > i.fa-columns')
.should('exist')
cy.get('.CodeMirror ')
.click()
cy.get('.CodeMirror textarea')
.as('codeinput')
})
describe('with just the language', () => {
it('doesn\'t show a gutter', () => {
cy.get('@codeinput')
.fill('```javascript \nlet x = 0\n```')
cy.get('.markdown-body > pre > code.hljs')
.should('be.visible')
.should('not.have.class', 'showGutter')
cy.get('.markdown-body > pre > code.hljs > .linenumber')
.should('not.be.visible')
})
describe('and line wrapping', () => {
it('doesn\'t show a gutter', () => {
cy.get('@codeinput')
.fill('```javascript! \nlet x = 0\n```')
cy.get('.markdown-body > pre > code.hljs')
.should('be.visible')
.should('not.have.class', 'showGutter')
.should('have.class', 'wrapLines')
cy.get('.markdown-body > pre > code.hljs > .linenumber')
.should('not.be.visible')
})
})
})
describe('with the language and show gutter', () => {
it('shows the correct line number', () => {
cy.get('@codeinput')
.fill('```javascript= \nlet x = 0\n```')
cy.get('.markdown-body > pre > code.hljs')
.should('be.visible')
.should('have.class', 'showGutter')
cy.get('.markdown-body > pre > code.hljs > .linenumber')
.should('be.visible')
.text()
.should('eq', '1')
})
describe('and line wrapping', () => {
it('shows the correct line number', () => {
cy.get('@codeinput')
.fill('```javascript=! \nlet x = 0\n```')
cy.get('.markdown-body > pre > code.hljs')
.should('be.visible')
.should('have.class', 'showGutter')
.should('have.class', 'wrapLines')
cy.get('.markdown-body > pre > code.hljs > .linenumber')
.should('be.visible')
.text()
.should('eq', '1')
})
})
})
describe('with the language, show gutter with a start number', () => {
it('shows the correct line number', () => {
cy.get('@codeinput')
.fill('```javascript=100 \nlet x = 0\n```')
cy.get('.markdown-body > pre > code.hljs')
.should('be.visible')
.should('have.class', 'showGutter')
cy.get('.markdown-body > pre > code.hljs > .linenumber')
.should('be.visible')
.text()
.should('eq', '100')
})
it('shows the correct line number and continues in another codeblock', () => {
cy.get('@codeinput')
.fill('```javascript=100 \nlet x = 0\nlet y = 1\n```\n\n```javascript=+\nlet y = 2\n```\n')
cy.get('.markdown-body > pre > code.hljs')
.should('be.visible')
.should('have.class', 'showGutter')
.first()
.find('.linenumber')
.first()
.should('be.visible')
.text()
.should('eq', '100')
cy.get('.markdown-body > pre > code.hljs')
.first()
.find('.linenumber')
.last()
.should('be.visible')
.text()
.should('eq', '101')
cy.get('.markdown-body > pre > code.hljs')
.last()
.find('.linenumber')
.first()
.should('be.visible')
.text()
.should('eq', '102')
})
describe('and line wrapping', () => {
it('shows the correct line number', () => {
cy.get('@codeinput')
.fill('```javascript=100! \nlet x = 0\n```')
cy.get('.markdown-body > pre > code.hljs')
.should('be.visible')
.should('have.class', 'showGutter')
.should('have.class', 'wrapLines')
cy.get('.markdown-body > pre > code.hljs > .linenumber')
.should('be.visible')
.text()
.should('eq', '100')
})
it('shows the correct line number and continues in another codeblock', () => {
cy.get('@codeinput')
.fill('```javascript=100! \nlet x = 0\nlet y = 1\n```\n\n```javascript=+\nlet y = 2\n```\n')
cy.get('.markdown-body > pre > code.hljs')
.should('be.visible')
.should('have.class', 'showGutter')
.should('have.class', 'wrapLines')
.first()
.find('.linenumber')
.first()
.should('be.visible')
.text()
.should('eq', '100')
cy.get('.markdown-body > pre > code.hljs')
.first()
.find('.linenumber')
.last()
.should('be.visible')
.text()
.should('eq', '101')
cy.get('.markdown-body > pre > code.hljs')
.last()
.find('.linenumber')
.first()
.should('be.visible')
.text()
.should('eq', '102')
})
})
})
it('has a working copy button', () => {
cy.get('@codeinput')
.fill('```javascript \nlet x = 0\n```')
cy.get('.markdown-body > pre > div > button > i')
.should('have.class', 'fa-files-o')
.click()
cy.get('@copy').should('be.calledWithExactly', 'let x = 0\n')
})
})