Skip to content

Commit

Permalink
Tests: Unskipped tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
scofalik committed Aug 3, 2018
1 parent b4e34c1 commit f2bd243
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tests/deletecommand-integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ describe( 'DeleteCommand integration', () => {
assertOutput( '<paragraph>123456[]</paragraph><paragraph>78</paragraph>' );
} );

it.skip( 'merges elements (and group changes in batches) and rollbacks - non-collapsed selection', () => {
it( 'merges elements (and group changes in batches) and rollbacks - non-collapsed selection', () => {
setData( model, '<paragraph>12345[6</paragraph><paragraph>7]8</paragraph>' );

editor.execute( 'delete' );
Expand Down
14 changes: 9 additions & 5 deletions tests/utils/injectandroidbackspacemutationshandling.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe( 'injectAndroidBackspaceMutationsHandling', () => {
'<h2>Heading 1{}</h2><p>Paragraph</p><h3>Heading 2</h3>' );
} );

it.skip( 'should handle two entire blocks removal', () => {
it( 'should handle two entire blocks removal', () => {
// 1. Set selection to '<h2>{Heading 1</h2><p>Paragraph}</p><h3>Heading 2</h3>'.
model.change( writer => {
writer.setSelection(
Expand Down Expand Up @@ -151,7 +151,7 @@ describe( 'injectAndroidBackspaceMutationsHandling', () => {
'<h2>{Heading 1</h2><p>Paragraph}</p><h3>Heading 2</h3>' );
} );

it.skip( 'should handle two partially selected blocks removal', () => {
it( 'should handle two partially selected blocks removal', () => {
// 1. Set selection to '<h2>Hea{ding 1</h2><p>Paragraph}</p><h3>Heading 2</h3>'.
model.change( writer => {
writer.setSelection(
Expand Down Expand Up @@ -194,7 +194,7 @@ describe( 'injectAndroidBackspaceMutationsHandling', () => {
expectContentAfterUndo( modelContent, viewContent );
} );

it.skip( 'should handle blocks removal if selection ends on the boundary of inline element', () => {
it( 'should handle blocks removal if selection ends on the boundary of inline element', () => {
editor.setData( '<h2>Heading 1</h2><p>Paragraph</p><h3><em>Heading</em> 2</h3>' );

// 1. Set selection to '<h2>{Heading 1</h2><p>Paragraph</p><h3>]<i>Heading</i> 2</h3>'.
Expand Down Expand Up @@ -224,7 +224,7 @@ describe( 'injectAndroidBackspaceMutationsHandling', () => {
newChildren: [],
oldChildren: Array.from( viewRoot.getChild( 2 ).getChildren() ),
node: viewRoot.getChild( 2 )
}, { // `paragrpah` and `heading2` removal mutation
}, { // `paragraph` and `heading2` removal mutation
type: 'children',
newChildren: [ viewRoot.getChild( 0 ) ],
oldChildren: Array.from( viewRoot.getChildren() ),
Expand All @@ -242,7 +242,11 @@ describe( 'injectAndroidBackspaceMutationsHandling', () => {
expect( getModelData( model ) ).to.equal( '<heading1><$text italic="true">[]Heading</$text> 2</heading1>' );
expect( getViewData( view ) ).to.equal( '<h2><i>{}Heading</i> 2</h2>' );

expectContentAfterUndo( modelContent, viewContent );
// https://github.com/ckeditor/ckeditor5-undo/issues/89
expectContentAfterUndo(
'<heading1>[Heading 1</heading1><paragraph>Paragraph]</paragraph><heading2><$text italic="true">Heading</$text> 2</heading2>',
'<h2>{Heading 1</h2><p>Paragraph}</p><h3><i>Heading</i> 2</h3>'
);
} );

it( 'should handle selection changed by the user before `backspace` on block merging', () => {
Expand Down

0 comments on commit f2bd243

Please sign in to comment.