etherpad-lite/src/tests/backend/specs/contentcollector.js

'use strict';

/*
 * While importexport tests target the `setHTML` API endpoint, which is nearly identical to what
 * happens when a user manually imports a document via the UI, the contentcollector tests here don't
 * use rehype to process the document. Rehype removes spaces and newĺines were applicable, so the
 * expected results here can differ from importexport.js.
 *
 * If you add tests here, please also add them to importexport.js
 */

const AttributePool = require('../../../static/js/AttributePool');
const Changeset = require('../../../static/js/Changeset');
const assert = require('assert').strict;
const attributes = require('../../../static/js/attributes');
const contentcollector = require('../../../static/js/contentcollector');
const jsdom = require('jsdom');

// All test case `wantAlines` values must only refer to attributes in this list so that the
// attribute numbers do not change due to changes in pool insertion order.
const knownAttribs = [
  ['insertorder', 'first'],
  ['italic', 'true'],
  ['list', 'bullet1'],
  ['list', 'bullet2'],
  ['list', 'number1'],
  ['list', 'number2'],
  ['lmkr', '1'],
  ['start', '1'],
  ['start', '2'],
];

const testCases = [
  {
    description: 'Simple',
    html: '<html><body><p>foo</p></body></html>',
    wantAlines: ['+3'],
    wantText: ['foo'],
  },
  {
    description: 'Line starts with asterisk',
    html: '<html><body><p>*foo</p></body></html>',
    wantAlines: ['+4'],
    wantText: ['*foo'],
  },
  {
    description: 'Complex nested Li',
    html: '<!doctype html><html><body><ol><li>one</li><li><ol><li>1.1</li></ol></li><li>two</li></ol></body></html>',
    wantAlines: [
      '*0*4*6*7+1+3',
      '*0*5*6*8+1+3',
      '*0*4*6*8+1+3',
    ],
    wantText: [
      '*one', '*1.1', '*two',
    ],
  },
  {
    description: 'Complex list of different types',
    html: '<!doctype html><html><body><ul class="bullet"><li>one</li><li>two</li><li>0</li><li>1</li><li>2<ul class="bullet"><li>3</li><li>4</li></ul></li></ul><ol class="number"><li>item<ol class="number"><li>item1</li><li>item2</li></ol></li></ol></body></html>',
    wantAlines: [
      '*0*2*6+1+3',
      '*0*2*6+1+3',
      '*0*2*6+1+1',
      '*0*2*6+1+1',
      '*0*2*6+1+1',
      '*0*3*6+1+1',
      '*0*3*6+1+1',
      '*0*4*6*7+1+4',
      '*0*5*6*8+1+5',
      '*0*5*6*8+1+5',
    ],
    wantText: [
      '*one',
      '*two',
      '*0',
      '*1',
      '*2',
      '*3',
      '*4',
      '*item',
      '*item1',
      '*item2',
    ],
  },
  {
    description: 'Tests if uls properly get attributes',
    html: '<html><body><ul><li>a</li><li>b</li></ul><div>div</div><p>foo</p></body></html>',
    wantAlines: [
      '*0*2*6+1+1',
      '*0*2*6+1+1',
      '+3',
      '+3',
    ],
    wantText: ['*a', '*b', 'div', 'foo'],
  },
  {
    description: 'Tests if indented uls properly get attributes',
    html: '<html><body><ul><li>a</li><ul><li>b</li></ul><li>a</li></ul><p>foo</p></body></html>',
    wantAlines: [
      '*0*2*6+1+1',
      '*0*3*6+1+1',
      '*0*2*6+1+1',
      '+3',
    ],
    wantText: ['*a', '*b', '*a', 'foo'],
  },
  {
    description: 'Tests if ols properly get line numbers when in a normal OL',
    html: '<html><body><ol><li>a</li><li>b</li><li>c</li></ol><p>test</p></body></html>',
    wantAlines: [
      '*0*4*6*7+1+1',
      '*0*4*6*7+1+1',
      '*0*4*6*7+1+1',
      '+4',
    ],
    wantText: ['*a', '*b', '*c', 'test'],
    noteToSelf: 'Ensure empty P does not induce line attribute marker, wont this break the editor?',
  },
  {
    description: 'A single completely empty line break within an ol should reset count if OL is closed off..',
    html: '<html><body><ol><li>should be 1</li></ol><p>hello</p><ol><li>should be 1</li><li>should be 2</li></ol><p></p></body></html>',
    wantAlines: [
      '*0*4*6*7+1+b',
      '+5',
      '*0*4*6*8+1+b',
      '*0*4*6*8+1+b',
      '',
    ],
    wantText: ['*should be 1', 'hello', '*should be 1', '*should be 2', ''],
    noteToSelf: "Shouldn't include attribute marker in the <p> line",
  },
  {
    description: 'A single <p></p> should create a new line',
    html: '<html><body><p></p><p></p></body></html>',
    wantAlines: ['', ''],
    wantText: ['', ''],
    noteToSelf: '<p></p>should create a line break but not break numbering',
  },
  {
    description: 'Tests if ols properly get line numbers when in a normal OL #2',
    html: '<html><body>a<ol><li>b<ol><li>c</li></ol></ol>notlist<p>foo</p></body></html>',
    wantAlines: [
      '+1',
      '*0*4*6*7+1+1',
      '*0*5*6*8+1+1',
      '+7',
      '+3',
    ],
    wantText: ['a', '*b', '*c', 'notlist', 'foo'],
    noteToSelf: 'Ensure empty P does not induce line attribute marker, wont this break the editor?',
  },
  {
    description: 'First item being an UL then subsequent being OL will fail',
    html: '<html><body><ul><li>a<ol><li>b</li><li>c</li></ol></li></ul></body></html>',
    wantAlines: ['+1', '*0*1*2*3+1+1', '*0*4*2*5+1+1'],
    wantText: ['a', '*b', '*c'],
    noteToSelf: 'Ensure empty P does not induce line attribute marker, wont this break the editor?',
    disabled: true,
  },
  {
    description: 'A single completely empty line break within an ol should NOT reset count',
    html: '<html><body><ol><li>should be 1</li><p></p><li>should be 2</li><li>should be 3</li></ol><p></p></body></html>',
    wantAlines: [],
    wantText: ['*should be 1', '*should be 2', '*should be 3'],
    noteToSelf: "<p></p>should create a line break but not break numbering -- This is what I can't get working!",
    disabled: true,
  },
  {
    description: 'Content outside body should be ignored',
    html: '<html><head><title>title</title><style></style></head><body>empty<br></body></html>',
    wantAlines: ['+5'],
    wantText: ['empty'],
  },
  {
    description: 'Multiple spaces should be preserved',
    html: '<html><body>Text with  more   than    one space.<br></body></html>',
    wantAlines: ['+10'],
    wantText: ['Text with  more   than    one space.'],
  },
  {
    description: 'non-breaking and normal space should be preserved',
    html: '<html><body>Text&nbsp;with&nbsp; more&nbsp;&nbsp;&nbsp;than   &nbsp;one space.<br></body></html>',
    wantAlines: ['+10'],
    wantText: ['Text with  more   than    one space.'],
  },
  {
    description: 'Multiple nbsp should be preserved',
    html: '<html><body>&nbsp;&nbsp;<br></body></html>',
    wantAlines: ['+2'],
    wantText: ['  '],
  },
  {
    description: 'Multiple nbsp between words ',
    html: '<html><body>&nbsp;&nbsp;word1&nbsp;&nbsp;word2&nbsp;&nbsp;&nbsp;word3<br></body></html>',
    wantAlines: ['+m'],
    wantText: ['  word1  word2   word3'],
  },
  {
    description: 'A non-breaking space preceded by a normal space',
    html: '<html><body> &nbsp;word1 &nbsp;word2 &nbsp;word3<br></body></html>',
    wantAlines: ['+l'],
    wantText: ['  word1  word2  word3'],
  },
  {
    description: 'A non-breaking space followed by a normal space',
    html: '<html><body>&nbsp; word1&nbsp; word2&nbsp; word3<br></body></html>',
    wantAlines: ['+l'],
    wantText: ['  word1  word2  word3'],
  },
  {
    description: 'Don\'t collapse spaces that follow a newline',
    html: '<!doctype html><html><body>something<br>             something<br></body></html>',
    wantAlines: ['+9', '+m'],
    wantText: ['something', '             something'],
  },
  {
    description: 'Don\'t collapse spaces that follow a empty paragraph',
    html: '<!doctype html><html><body>something<p></p>             something<br></body></html>',
    wantAlines: ['+9', '', '+m'],
    wantText: ['something', '', '             something'],
  },
  {
    description: 'Don\'t collapse spaces that preceed/follow a newline',
    html: '<html><body>something            <br>             something<br></body></html>',
    wantAlines: ['+l', '+m'],
    wantText: ['something            ', '             something'],
  },
  {
    description: 'Don\'t collapse spaces that preceed/follow a empty paragraph',
    html: '<html><body>something            <p></p>             something<br></body></html>',
    wantAlines: ['+l', '', '+m'],
    wantText: ['something            ', '', '             something'],
  },
  {
    description: 'Don\'t collapse non-breaking spaces that follow a newline',
    html: '<html><body>something<br>&nbsp;&nbsp;&nbsp;something<br></body></html>',
    wantAlines: ['+9', '+c'],
    wantText: ['something', '   something'],
  },
  {
    description: 'Don\'t collapse non-breaking spaces that follow a paragraph',
    html: '<html><body>something<p></p>&nbsp;&nbsp;&nbsp;something<br></body></html>',
    wantAlines: ['+9', '', '+c'],
    wantText: ['something', '', '   something'],
  },
  {
    description: 'Preserve all spaces when multiple are present',
    html: '<html><body>Need <span> more </span> space<i>  s </i> !<br></body></html>',
    wantAlines: ['+h*1+4+2'],
    wantText: ['Need  more  space  s  !'],
  },
  {
    description: 'Newlines and multiple spaces across newlines should be preserved',
    html: `
      <html><body>Need
          <span> more </span>
          space
          <i>  s </i>
          !<br></body></html>`,
    wantAlines: ['+19*1+4+b'],
    wantText: ['Need           more           space            s           !'],
  },
  {
    description: 'Multiple new lines at the beginning should be preserved',
    html: '<html><body><br><br><p></p><p></p>first line<br><br>second line<br></body></html>',
    wantAlines: ['', '', '', '', '+a', '', '+b'],
    wantText: ['', '', '', '', 'first line', '', 'second line'],
  },
  {
    description: 'A paragraph with multiple lines should not loose spaces when lines are combined',
    html: `<html><body><p>
а б в г ґ д е є ж з и і ї й к л м н о
п р с т у ф х ц ч ш щ ю я ь</p>
</body></html>`,
    wantAlines: ['+1t'],
    wantText: ['а б в г ґ д е є ж з и і ї й к л м н о п р с т у ф х ц ч ш щ ю я ь'],
  },
  {
    description: 'lines in preformatted text should be kept intact',
    html: `<html><body><p>
а б в г ґ д е є ж з и і ї й к л м н о</p><pre>multiple
lines
in
pre
</pre><p>п р с т у ф х ц ч ш щ ю я
ь</p>
</body></html>`,
    wantAlines: ['+11', '+8', '+5', '+2', '+3', '+r'],
    wantText: [
      'а б в г ґ д е є ж з и і ї й к л м н о',
      'multiple',
      'lines',
      'in',
      'pre',
      'п р с т у ф х ц ч ш щ ю я ь',
    ],
  },
  {
    description: 'pre should be on a new line not preceded by a space',
    html: `<html><body><p>
    1
</p><pre>preline
</pre></body></html>`,
    wantAlines: ['+6', '+7'],
    wantText: ['    1 ', 'preline'],
  },
  {
    description: 'Preserve spaces on the beginning and end of a element',
    html: '<html><body>Need<span> more </span>space<i> s </i>!<br></body></html>',
    wantAlines: ['+f*1+3+1'],
    wantText: ['Need more space s !'],
  },
  {
    description: 'Preserve spaces outside elements',
    html: '<html><body>Need <span>more</span> space <i>s</i> !<br></body></html>',
    wantAlines: ['+g*1+1+2'],
    wantText: ['Need more space s !'],
  },
  {
    description: 'Preserve spaces at the end of an element',
    html: '<html><body>Need <span>more </span>space <i>s </i>!<br></body></html>',
    wantAlines: ['+g*1+2+1'],
    wantText: ['Need more space s !'],
  },
  {
    description: 'Preserve spaces at the start of an element',
    html: '<html><body>Need<span> more</span> space<i> s</i> !<br></body></html>',
    wantAlines: ['+f*1+2+2'],
    wantText: ['Need more space s !'],
  },
];

describe(__filename, function () {
  for (const tc of testCases) {
    describe(tc.description, function () {
      let apool;
      let result;

      before(async function () {
        if (tc.disabled) return this.skip();
        const {window: {document}} = new jsdom.JSDOM(tc.html);
        apool = new AttributePool();
        // To reduce test fragility, the attribute pool is seeded with `knownAttribs`, and all
        // attributes in `tc.wantAlines` must be in `knownAttribs`. (This guarantees that attribute
        // numbers do not change if the attribute processing code changes.)
        for (const attrib of knownAttribs) apool.putAttrib(attrib);
        for (const aline of tc.wantAlines) {
          const opIter = Changeset.opIterator(aline);
          while (opIter.hasNext()) {
            const op = opIter.next();
            for (const n of attributes.decodeAttribString(op.attribs)) {
              assert(n < knownAttribs.length);
            }
          }
        }
        const cc = contentcollector.makeContentCollector(true, null, apool);
        cc.collectContent(document.body);
        result = cc.finish();
      });

      it('text matches', async function () {
        assert.deepEqual(result.lines, tc.wantText);
      });

      it('alines match', async function () {
        assert.deepEqual(result.lineAttribs, tc.wantAlines);
      });

      it('attributes are sorted in canonical order', async function () {
        const gotAttribs = [];
        const wantAttribs = [];
        for (const aline of result.lineAttribs) {
          const gotAlineAttribs = [];
          gotAttribs.push(gotAlineAttribs);
          const wantAlineAttribs = [];
          wantAttribs.push(wantAlineAttribs);
          const opIter = Changeset.opIterator(aline);
          while (opIter.hasNext()) {
            const op = opIter.next();
            const gotOpAttribs = [...attributes.attribsFromString(op.attribs, apool)];
            gotAlineAttribs.push(gotOpAttribs);
            wantAlineAttribs.push(attributes.sort([...gotOpAttribs]));
          }
        }
        assert.deepEqual(gotAttribs, wantAttribs);
      });
    });
  }
});
-												cc tests: enable second nestedOL test

											
										
										
											2020-12-18 06:40:33 +01:00
+								'use strict';
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								/*
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								 * While importexport tests target the `setHTML` API endpoint, which is nearly identical to what
 								 * happens when a user manually imports a document via the UI, the contentcollector tests here don't
 								 * use rehype to process the document. Rehype removes spaces and newĺines were applicable, so the
 								 * expected results here can differ from importexport.js.
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								 *
 								 * If you add tests here, please also add them to importexport.js
 								 */
-												cc tests: enable second nestedOL test

											
										
										
											2020-12-18 06:40:33 +01:00
-												restructure: move bin/ and tests/ to src/

Also add symlinks from the old `bin/` and `tests/` locations to avoid
breaking scripts and other tools.

Motivations:

  * Scripts and tests no longer have to do dubious things like:

        require('ep_etherpad-lite/node_modules/foo')

    to access packages installed as dependencies in
    `src/package.json`.

  * Plugins can access the backend test helper library in a non-hacky
    way:

        require('ep_etherpad-lite/tests/backend/common')

  * We can delete the top-level `package.json` without breaking our
    ability to lint the files in `bin/` and `tests/`.

    Deleting the top-level `package.json` has downsides: It will cause
    `npm` to print warnings whenever plugins are installed, npm will
    no longer be able to enforce a plugin's peer dependency on
    ep_etherpad-lite, and npm will keep deleting the
    `node_modules/ep_etherpad-lite` symlink that points to `../src`.

    But there are significant upsides to deleting the top-level
    `package.json`: It will drastically speed up plugin installation
    because `npm` doesn't have to recursively walk the dependencies in
    `src/package.json`. Also, deleting the top-level `package.json`
    avoids npm's horrible dependency hoisting behavior (where it moves
    stuff from `src/node_modules/` to the top-level `node_modules/`
    directory). Dependency hoisting causes numerous mysterious
    problems such as silent failures in `npm outdated` and `npm
    update`. Dependency hoisting also breaks plugins that do:

        require('ep_etherpad-lite/node_modules/foo')

											
										
										
											2021-02-03 12:08:43 +00:00
+								const AttributePool = require('../../../static/js/AttributePool');
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								const Changeset = require('../../../static/js/Changeset');
-												tests: Use `assert.deepEqual()` to simplify equality checks

											
										
										
											2021-01-24 01:34:28 -05:00
+								const assert = require('assert').strict;
-												Changeset: Migrate to the new attribute API

											
										
										
											2021-11-19 00:51:25 -05:00
+								const attributes = require('../../../static/js/attributes');
-												restructure: move bin/ and tests/ to src/

Also add symlinks from the old `bin/` and `tests/` locations to avoid
breaking scripts and other tools.

Motivations:

  * Scripts and tests no longer have to do dubious things like:

        require('ep_etherpad-lite/node_modules/foo')

    to access packages installed as dependencies in
    `src/package.json`.

  * Plugins can access the backend test helper library in a non-hacky
    way:

        require('ep_etherpad-lite/tests/backend/common')

  * We can delete the top-level `package.json` without breaking our
    ability to lint the files in `bin/` and `tests/`.

    Deleting the top-level `package.json` has downsides: It will cause
    `npm` to print warnings whenever plugins are installed, npm will
    no longer be able to enforce a plugin's peer dependency on
    ep_etherpad-lite, and npm will keep deleting the
    `node_modules/ep_etherpad-lite` symlink that points to `../src`.

    But there are significant upsides to deleting the top-level
    `package.json`: It will drastically speed up plugin installation
    because `npm` doesn't have to recursively walk the dependencies in
    `src/package.json`. Also, deleting the top-level `package.json`
    avoids npm's horrible dependency hoisting behavior (where it moves
    stuff from `src/node_modules/` to the top-level `node_modules/`
    directory). Dependency hoisting causes numerous mysterious
    problems such as silent failures in `npm outdated` and `npm
    update`. Dependency hoisting also breaks plugins that do:

        require('ep_etherpad-lite/node_modules/foo')

											
										
										
											2021-02-03 12:08:43 +00:00
+								const contentcollector = require('../../../static/js/contentcollector');
-												HTML import: Replace cheerio with jsdom to simplify contentcollector

Cheerio provides jQuery-like objects but they wrap DOM Node-like
objects that are not 100% API compatible with the DOM spec. Because of
this, contentcollector, which is used in browsers and in Node.js
during HTML import, has until now needed to support two different
APIs. This commit modifies HTML import to use jsdom instead of cheerio
and simplifies contentcollector.

											
										
										
											2021-01-24 01:08:08 -05:00
+								const jsdom = require('jsdom');
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								// All test case `wantAlines` values must only refer to attributes in this list so that the
 								// attribute numbers do not change due to changes in pool insertion order.
 								const knownAttribs = [
 								  ['insertorder', 'first'],
 								  ['italic', 'true'],
 								  ['list', 'bullet1'],
 								  ['list', 'bullet2'],
 								  ['list', 'number1'],
 								  ['list', 'number2'],
 								  ['lmkr', '1'],
 								  ['start', '1'],
 								  ['start', '2'],
 								];
 								const testCases = [
 								  {
 								    description: 'Simple',
 								    html: '<html><body><p>foo</p></body></html>',
 								    wantAlines: ['+3'],
 								    wantText: ['foo'],
 								  },
 								  {
 								    description: 'Line starts with asterisk',
 								    html: '<html><body><p>*foo</p></body></html>',
 								    wantAlines: ['+4'],
 								    wantText: ['*foo'],
 								  },
 								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'Complex nested Li',
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								    html: '<!doctype html><html><body><ol><li>one</li><li><ol><li>1.1</li></ol></li><li>two</li></ol></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: [
 								      '*0*4*6*7+1+3',
 								      '*0*5*6*8+1+3',
 								      '*0*4*6*8+1+3',
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								    ],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: [
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								      '*one', '*1.1', '*two',
 								    ],
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'Complex list of different types',
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								    html: '<!doctype html><html><body><ul class="bullet"><li>one</li><li>two</li><li>0</li><li>1</li><li>2<ul class="bullet"><li>3</li><li>4</li></ul></li></ul><ol class="number"><li>item<ol class="number"><li>item1</li><li>item2</li></ol></li></ol></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: [
 								      '*0*2*6+1+3',
 								      '*0*2*6+1+3',
 								      '*0*2*6+1+1',
 								      '*0*2*6+1+1',
 								      '*0*2*6+1+1',
 								      '*0*3*6+1+1',
 								      '*0*3*6+1+1',
 								      '*0*4*6*7+1+4',
 								      '*0*5*6*8+1+5',
 								      '*0*5*6*8+1+5',
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								    ],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: [
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								      '*one',
 								      '*two',
 								      '*0',
 								      '*1',
 								      '*2',
 								      '*3',
 								      '*4',
 								      '*item',
 								      '*item1',
 								      '*item2',
 								    ],
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'Tests if uls properly get attributes',
 								    html: '<html><body><ul><li>a</li><li>b</li></ul><div>div</div><p>foo</p></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: [
 								      '*0*2*6+1+1',
 								      '*0*2*6+1+1',
 								      '+3',
 								      '+3',
 								    ],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['*a', '*b', 'div', 'foo'],
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'Tests if indented uls properly get attributes',
 								    html: '<html><body><ul><li>a</li><ul><li>b</li></ul><li>a</li></ul><p>foo</p></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: [
 								      '*0*2*6+1+1',
 								      '*0*3*6+1+1',
 								      '*0*2*6+1+1',
 								      '+3',
 								    ],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['*a', '*b', '*a', 'foo'],
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'Tests if ols properly get line numbers when in a normal OL',
 								    html: '<html><body><ol><li>a</li><li>b</li><li>c</li></ol><p>test</p></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: [
 								      '*0*4*6*7+1+1',
 								      '*0*4*6*7+1+1',
 								      '*0*4*6*7+1+1',
 								      '+4',
 								    ],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['*a', '*b', '*c', 'test'],
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    noteToSelf: 'Ensure empty P does not induce line attribute marker, wont this break the editor?',
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'A single completely empty line break within an ol should reset count if OL is closed off..',
 								    html: '<html><body><ol><li>should be 1</li></ol><p>hello</p><ol><li>should be 1</li><li>should be 2</li></ol><p></p></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: [
 								      '*0*4*6*7+1+b',
 								      '+5',
 								      '*0*4*6*8+1+b',
 								      '*0*4*6*8+1+b',
 								      '',
 								    ],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['*should be 1', 'hello', '*should be 1', '*should be 2', ''],
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    noteToSelf: "Shouldn't include attribute marker in the <p> line",
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'A single <p></p> should create a new line',
 								    html: '<html><body><p></p><p></p></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['', ''],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['', ''],
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    noteToSelf: '<p></p>should create a line break but not break numbering',
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
 								    description: 'Tests if ols properly get line numbers when in a normal OL #2',
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    html: '<html><body>a<ol><li>b<ol><li>c</li></ol></ol>notlist<p>foo</p></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: [
 								      '+1',
 								      '*0*4*6*7+1+1',
 								      '*0*5*6*8+1+1',
 								      '+7',
 								      '+3',
 								    ],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['a', '*b', '*c', 'notlist', 'foo'],
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    noteToSelf: 'Ensure empty P does not induce line attribute marker, wont this break the editor?',
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'First item being an UL then subsequent being OL will fail',
 								    html: '<html><body><ul><li>a<ol><li>b</li><li>c</li></ol></li></ul></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+1', '*0*1*2*3+1+1', '*0*4*2*5+1+1'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['a', '*b', '*c'],
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    noteToSelf: 'Ensure empty P does not induce line attribute marker, wont this break the editor?',
 								    disabled: true,
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    description: 'A single completely empty line break within an ol should NOT reset count',
 								    html: '<html><body><ol><li>should be 1</li><p></p><li>should be 2</li><li>should be 3</li></ol><p></p></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: [],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['*should be 1', '*should be 2', '*should be 3'],
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								    noteToSelf: "<p></p>should create a line break but not break numbering -- This is what I can't get working!",
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								    disabled: true,
 								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests: Ignore head tag on import / improved contentcollector tests

* fix accidental write to global variable
properly show pending tests
log test name in suite
better log output for received/expected strings

* cc tests: enable second nestedOL test

* ignore the head tag on import
											
										
										
											2020-12-18 10:37:37 +01:00
+								    description: 'Content outside body should be ignored',
 								    html: '<html><head><title>title</title><style></style></head><body>empty<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+5'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['empty'],
-												tests: Ignore head tag on import / improved contentcollector tests

* fix accidental write to global variable
properly show pending tests
log test name in suite
better log output for received/expected strings

* cc tests: enable second nestedOL test

* ignore the head tag on import
											
										
										
											2020-12-18 10:37:37 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Multiple spaces should be preserved',
 								    html: '<html><body>Text with  more   than    one space.<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+10'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['Text with  more   than    one space.'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'non-breaking and normal space should be preserved',
 								    html: '<html><body>Text&nbsp;with&nbsp; more&nbsp;&nbsp;&nbsp;than   &nbsp;one space.<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+10'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['Text with  more   than    one space.'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Multiple nbsp should be preserved',
 								    html: '<html><body>&nbsp;&nbsp;<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+2'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['  '],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Multiple nbsp between words ',
 								    html: '<html><body>&nbsp;&nbsp;word1&nbsp;&nbsp;word2&nbsp;&nbsp;&nbsp;word3<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+m'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['  word1  word2   word3'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												docs: fixed typos

											
										
										
											2021-02-03 00:30:07 +01:00
+								    description: 'A non-breaking space preceded by a normal space',
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    html: '<html><body> &nbsp;word1 &nbsp;word2 &nbsp;word3<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+l'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['  word1  word2  word3'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'A non-breaking space followed by a normal space',
 								    html: '<html><body>&nbsp; word1&nbsp; word2&nbsp; word3<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+l'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['  word1  word2  word3'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Don\'t collapse spaces that follow a newline',
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    html: '<!doctype html><html><body>something<br>             something<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+9', '+m'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['something', '             something'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Don\'t collapse spaces that follow a empty paragraph',
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    html: '<!doctype html><html><body>something<p></p>             something<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+9', '', '+m'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['something', '', '             something'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Don\'t collapse spaces that preceed/follow a newline',
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    html: '<html><body>something            <br>             something<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+l', '+m'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['something            ', '             something'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Don\'t collapse spaces that preceed/follow a empty paragraph',
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    html: '<html><body>something            <p></p>             something<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+l', '', '+m'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['something            ', '', '             something'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Don\'t collapse non-breaking spaces that follow a newline',
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    html: '<html><body>something<br>&nbsp;&nbsp;&nbsp;something<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+9', '+c'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['something', '   something'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Don\'t collapse non-breaking spaces that follow a paragraph',
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    html: '<html><body>something<p></p>&nbsp;&nbsp;&nbsp;something<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+9', '', '+c'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['something', '', '   something'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Preserve all spaces when multiple are present',
 								    html: '<html><body>Need <span> more </span> space<i>  s </i> !<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+h*1+4+2'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['Need  more  space  s  !'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Newlines and multiple spaces across newlines should be preserved',
 								    html: `
 								      <html><body>Need
 								          <span> more </span>
 								          space
 								          <i>  s </i>
 								          !<br></body></html>`,
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+19*1+4+b'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['Need           more           space            s           !'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Multiple new lines at the beginning should be preserved',
 								    html: '<html><body><br><br><p></p><p></p>first line<br><br>second line<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['', '', '', '', '+a', '', '+b'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['', '', '', '', 'first line', '', 'second line'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    description: 'A paragraph with multiple lines should not loose spaces when lines are combined',
 								    html: `<html><body><p>
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								а б в г ґ д е є ж з и і ї й к л м н о
 								п р с т у ф х ц ч ш щ ю я ь</p>
 								</body></html>`,
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+1t'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['а б в г ґ д е є ж з и і ї й к л м н о п р с т у ф х ц ч ш щ ю я ь'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    description: 'lines in preformatted text should be kept intact',
 								    html: `<html><body><p>
-												tests: Fix invalid HTML in contentcollector tests

The HTML spec does not permit `<pre>` as a child of `<p>`.

											
										
										
											2021-01-24 03:31:45 -05:00
+								а б в г ґ д е є ж з и і ї й к л м н о</p><pre>multiple
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								lines
 								in
 								pre
-												tests: Fix invalid HTML in contentcollector tests

The HTML spec does not permit `<pre>` as a child of `<p>`.

											
										
										
											2021-01-24 03:31:45 -05:00
+								</pre><p>п р с т у ф х ц ч ш щ ю я
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								ь</p>
 								</body></html>`,
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+11', '+8', '+5', '+2', '+3', '+r'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: [
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								      'а б в г ґ д е є ж з и і ї й к л м н о',
 								      'multiple',
 								      'lines',
 								      'in',
 								      'pre',
 								      'п р с т у ф х ц ч ш щ ю я ь',
 								    ],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												docs: fixed typos

											
										
										
											2021-02-03 00:30:07 +01:00
+								    description: 'pre should be on a new line not preceded by a space',
-												lint: Fix some straightforward ESLint errors

											
										
										
											2021-01-24 00:56:11 -05:00
+								    html: `<html><body><p>
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
-												tests: Fix invalid HTML in contentcollector tests

The HTML spec does not permit `<pre>` as a child of `<p>`.

											
										
										
											2021-01-24 03:31:45 -05:00
+								</p><pre>preline
 								</pre></body></html>`,
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+6', '+7'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['    1 ', 'preline'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Preserve spaces on the beginning and end of a element',
 								    html: '<html><body>Need<span> more </span>space<i> s </i>!<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+f*1+3+1'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['Need more space s !'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Preserve spaces outside elements',
 								    html: '<html><body>Need <span>more</span> space <i>s</i> !<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+g*1+1+2'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['Need more space s !'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Preserve spaces at the end of an element',
 								    html: '<html><body>Need <span>more </span>space <i>s </i>!<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+g*1+2+1'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['Need more space s !'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  {
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								    description: 'Preserve spaces at the start of an element',
 								    html: '<html><body>Need<span> more</span> space<i> s</i> !<br></body></html>',
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								    wantAlines: ['+f*1+2+2'],
-												tests: Replace "expected" with "want", "received" with "got"

"Got" and "want" are common terms for testing, plus this fixes a
spelling mistake ("received" was misspelled as "recieved").

											
										
										
											2021-01-24 01:54:14 -05:00
+								    wantText: ['Need more space s !'],
-												tests for spaces (#4594)


											
										
										
											2020-12-20 07:18:19 +01:00
+								  },
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								];
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								describe(__filename, function () {
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								  for (const tc of testCases) {
 								    describe(tc.description, function () {
 								      let apool;
 								      let result;
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								      before(async function () {
 								        if (tc.disabled) return this.skip();
 								        const {window: {document}} = new jsdom.JSDOM(tc.html);
 								        apool = new AttributePool();
 								        // To reduce test fragility, the attribute pool is seeded with `knownAttribs`, and all
 								        // attributes in `tc.wantAlines` must be in `knownAttribs`. (This guarantees that attribute
 								        // numbers do not change if the attribute processing code changes.)
 								        for (const attrib of knownAttribs) apool.putAttrib(attrib);
 								        for (const aline of tc.wantAlines) {
 								          const opIter = Changeset.opIterator(aline);
 								          while (opIter.hasNext()) {
 								            const op = opIter.next();
-												Changeset: Migrate to the new attribute API

											
										
										
											2021-11-19 00:51:25 -05:00
+								            for (const n of attributes.decodeAttribString(op.attribs)) {
 								              assert(n < knownAttribs.length);
 								            }
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								          }
 								        }
-												lint: Run `eslint --fix` on `bin/` and `tests/`

											
										
										
											2020-11-23 13:21:51 -05:00
+								        const cc = contentcollector.makeContentCollector(true, null, apool);
-												HTML import: Replace cheerio with jsdom to simplify contentcollector

Cheerio provides jQuery-like objects but they wrap DOM Node-like
objects that are not 100% API compatible with the DOM spec. Because of
this, contentcollector, which is used in browsers and in Node.js
during HTML import, has until now needed to support two different
APIs. This commit modifies HTML import to use jsdom instead of cheerio
and simplifies contentcollector.

											
										
										
											2021-01-24 01:08:08 -05:00
+								        cc.collectContent(document.body);
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								        result = cc.finish();
-												tests: Include the filename in the test output

Also some minor consistency cleanups.

											
										
										
											2020-10-09 18:19:46 -04:00
+								      });
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								      it('text matches', async function () {
 								        assert.deepEqual(result.lines, tc.wantText);
 								      });
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								      it('alines match', async function () {
 								        assert.deepEqual(result.lineAttribs, tc.wantAlines);
 								      });
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								      it('attributes are sorted in canonical order', async function () {
 								        const gotAttribs = [];
 								        const wantAttribs = [];
 								        for (const aline of result.lineAttribs) {
 								          const gotAlineAttribs = [];
 								          gotAttribs.push(gotAlineAttribs);
 								          const wantAlineAttribs = [];
 								          wantAttribs.push(wantAlineAttribs);
 								          const opIter = Changeset.opIterator(aline);
 								          while (opIter.hasNext()) {
 								            const op = opIter.next();
-												Changeset: Migrate to the new attribute API

											
										
										
											2021-11-19 00:51:25 -05:00
+								            const gotOpAttribs = [...attributes.attribsFromString(op.attribs, apool)];
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								            gotAlineAttribs.push(gotOpAttribs);
-												Changeset: Migrate to the new attribute API

											
										
										
											2021-11-19 00:51:25 -05:00
+								            wantAlineAttribs.push(attributes.sort([...gotOpAttribs]));
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								          }
 								        }
 								        assert.deepEqual(gotAttribs, wantAttribs);
 								      });
 								    });
-												tests/editor/ul/li/ol/import/export: Introduce contentcollector.js tests & various OL/UL/LI related bugfixes

1. Introduce contentcollector.js backend tests
1. Fix issue with OL LI items not being properly numbered after import
1. Fix issue with nested OL LI items being improperly numbered on export
1. Fix issue with new lines not being introduced after lists in on import #3961
1. Sanitize HTML on the way in (import)
1. Fix ExportHTML CSS because it needs to support OL > LI > OL not OL > OL [The latter being the correct format]
1. Fix backend tests.
											
										
										
											2020-06-05 20:54:16 +01:00
+								  }
-												tests: Refine contentcollector tests

											
										
										
											2021-11-19 05:16:11 -05:00
+								});