mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 17:36:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge branch 'develop' into mochawesome

Browse source
This commit is contained in:
John McLear 2021-02-03 11:23:54 +00:00 • committed by GitHub
commit 7630e71957
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 1347 additions and 1020 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/backend/specs/contentcollector.js
View file

@ -140,7 +140,7 @@ const tests = {
wantText: [' word1 word2 word3'],
},
nonBreakingSpacePreceededBySpaceBetweenWords: {
description: 'A non-breaking space preceeded by a normal space',
description: 'A non-breaking space preceded by a normal space',
html: '<html><body> &nbsp;word1 &nbsp;word2 &nbsp;word3<br></body></html>',
wantLineAttribs: ['+l'],
wantText: [' word1 word2 word3'],
@ -240,7 +240,7 @@ pre
],
},
preIntroducesASpace: {
description: 'pre should be on a new line not preceeded by a space',
description: 'pre should be on a new line not preceded by a space',
html: `<html><body><p>
1
</p><pre>preline