|
|
@@ -7,7 +7,8 @@
|
|
|
|
|
|
import Paragraph from '/ckeditor5/paragraph/paragraph.js';
|
|
|
import VirtualTestEditor from '/tests/ckeditor5/_utils/virtualtesteditor.js';
|
|
|
-import { getData } from '/tests/engine/_utils/model.js';
|
|
|
+import { getData as getModelData } from '/tests/engine/_utils/model.js';
|
|
|
+import { getData as getViewData } from '/tests/engine/_utils/view.js';
|
|
|
|
|
|
describe( 'Paragraph feature', () => {
|
|
|
let editor, doc;
|
|
|
@@ -32,24 +33,35 @@ describe( 'Paragraph feature', () => {
|
|
|
expect( doc.schema.check( { name: '$inline', inside: 'paragraph' } ) ).to.be.true;
|
|
|
} );
|
|
|
|
|
|
- it( 'should convert paragraph', () => {
|
|
|
- editor.setData( '<p>foobar</p>' );
|
|
|
+ describe( 'data pipeline conversions', () => {
|
|
|
+ it( 'should convert paragraph', () => {
|
|
|
+ editor.setData( '<p>foobar</p>' );
|
|
|
|
|
|
- expect( getData( doc, { withoutSelection: true } ) ).to.equal( '<paragraph>foobar</paragraph>' );
|
|
|
- expect( editor.getData() ).to.equal( '<p>foobar</p>' );
|
|
|
- } );
|
|
|
+ expect( getModelData( doc, { withoutSelection: true } ) ).to.equal( '<paragraph>foobar</paragraph>' );
|
|
|
+ expect( editor.getData() ).to.equal( '<p>foobar</p>' );
|
|
|
+ } );
|
|
|
+
|
|
|
+ it( 'should convert paragraph only', () => {
|
|
|
+ editor.setData( '<p>foo<b>baz</b>bar</p>' );
|
|
|
+
|
|
|
+ expect( getModelData( doc, { withoutSelection: true } ) ).to.equal( '<paragraph>foobazbar</paragraph>' );
|
|
|
+ expect( editor.getData() ).to.equal( '<p>foobazbar</p>' );
|
|
|
+ } );
|
|
|
|
|
|
- it( 'should convert paragraph only', () => {
|
|
|
- editor.setData( '<p>foo<b>baz</b>bar</p>' );
|
|
|
+ it( 'should convert multiple paragraphs', () => {
|
|
|
+ editor.setData( '<p>foo</p><p>baz</p>' );
|
|
|
|
|
|
- expect( getData( doc, { withoutSelection: true } ) ).to.equal( '<paragraph>foobazbar</paragraph>' );
|
|
|
- expect( editor.getData() ).to.equal( '<p>foobazbar</p>' );
|
|
|
+ expect( getModelData( doc, { withoutSelection: true } ) ).to.equal( '<paragraph>foo</paragraph><paragraph>baz</paragraph>' );
|
|
|
+ expect( editor.getData() ).to.equal( '<p>foo</p><p>baz</p>' );
|
|
|
+ } );
|
|
|
} );
|
|
|
|
|
|
- it( 'should convert multiple paragraphs', () => {
|
|
|
- editor.setData( '<p>foo</p><p>baz</p>' );
|
|
|
+ describe( 'editing pipeline conversion', () => {
|
|
|
+ it( 'should convert paragraph', () => {
|
|
|
+ // Workaround for setting model data: https://github.com/ckeditor/ckeditor5-engine/issues/455
|
|
|
+ editor.setData( '<p>foo</p><p>bar</p>' );
|
|
|
|
|
|
- expect( getData( doc, { withoutSelection: true } ) ).to.equal( '<paragraph>foo</paragraph><paragraph>baz</paragraph>' );
|
|
|
- expect( editor.getData() ).to.equal( '<p>foo</p><p>baz</p>' );
|
|
|
+ expect( getViewData( editor.editing.view, { withoutSelection: true } ) ).to.equal( '<p>foo</p><p>bar</p>' );
|
|
|
+ } );
|
|
|
} );
|
|
|
} );
|