Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Tests: Fix engine tests after adding writer.updateMarker() and changi…
Browse files Browse the repository at this point in the history 
…ng writer.setMarker() API.
  • Loading branch information
@jodator
jodator committed Mar 28, 2018
1 parent a514ea7 commit 4d01075
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 48 deletions.
16 changes: 8 additions & 8 deletions tests/controller/editingcontroller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ describe( 'EditingController', () => {
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

expect( getViewData( editing.view, { withoutSelection: true } ) )
Expand All @@ -246,7 +246,7 @@ describe( 'EditingController', () => {
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

model.change( writer => {
Expand All @@ -261,13 +261,13 @@ describe( 'EditingController', () => {
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

const range2 = new ModelRange( new ModelPosition( modelRoot, [ 0, 0 ] ), new ModelPosition( modelRoot, [ 0, 2 ] ) );

model.change( writer => {
writer.setMarker( 'marker', range2 );
writer.updateMarker( 'marker', range2 );
} );

expect( getViewData( editing.view, { withoutSelection: true } ) )
Expand All @@ -278,7 +278,7 @@ describe( 'EditingController', () => {
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
writer.insertText( 'xyz', new ModelPosition( modelRoot, [ 1, 0 ] ) );
} );

Expand All @@ -290,7 +290,7 @@ describe( 'EditingController', () => {
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

model.change( writer => {
Expand All @@ -308,7 +308,7 @@ describe( 'EditingController', () => {
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

model.change( writer => {
Expand All @@ -326,7 +326,7 @@ describe( 'EditingController', () => {
const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 0, 3 ] ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

model.change( writer => {
Expand Down
62 changes: 35 additions & 27 deletions tests/conversion/downcast-converters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,9 @@ describe( 'downcast-helpers', () => {

model.change( writer => {
writer.insertText( 'foo', modelRoot, 0 );
writer.setMarker( 'search', ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 ) );

const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 );
writer.setMarker( 'search', range, { usingOperation: false } );
} );

expectResult( 'f<marker-search></marker-search>o<marker-search></marker-search>o' );
Expand All @@ -463,7 +465,8 @@ describe( 'downcast-helpers', () => {

model.change( writer => {
writer.insertText( 'foo', modelRoot, 0 );
writer.setMarker( 'search', ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 );
writer.setMarker( 'search', range, { usingOperation: false } );
} );

expectResult( 'f<search></search>o<search></search>o' );
Expand All @@ -484,7 +487,8 @@ describe( 'downcast-helpers', () => {

model.change( writer => {
writer.insertText( 'foo', modelRoot, 0 );
writer.setMarker( 'search', ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 );
writer.setMarker( 'search', range, { usingOperation: false } );
} );

expectResult( 'f<span data-marker="search"></span>o<span data-marker="search"></span>o' );
Expand All @@ -502,7 +506,8 @@ describe( 'downcast-helpers', () => {

model.change( writer => {
writer.insertText( 'foo', modelRoot, 0 );
writer.setMarker( 'search', ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 );
writer.setMarker( 'search', range, { usingOperation: false } );
} );

expectResult( 'f<span data-marker="search" data-start="true"></span>o<span data-marker="search" data-start="false"></span>o' );
Expand All @@ -517,7 +522,8 @@ describe( 'downcast-helpers', () => {

model.change( writer => {
writer.insertText( 'foo', modelRoot, 0 );
writer.setMarker( 'comment', ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 );
writer.setMarker( 'comment', range, { usingOperation: false } );
} );

expectResult( '<span class="comment">foo</span>' );
Expand All @@ -531,7 +537,8 @@ describe( 'downcast-helpers', () => {

model.change( writer => {
writer.insertText( 'foo', modelRoot, 0 );
writer.setMarker( 'comment', ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 );
writer.setMarker( 'comment', range, { usingOperation: false } );
} );

expectResult( '<span class="new-comment">foo</span>' );
Expand All @@ -553,7 +560,8 @@ describe( 'downcast-helpers', () => {

model.change( writer => {
writer.insertText( 'foo', modelRoot, 0 );
writer.setMarker( 'comment:abc', ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 );
writer.setMarker( 'comment:abc', range, { usingOperation: false } );
} );

expectResult( '<span class="comment comment-abc">foo</span>' );
Expand Down Expand Up @@ -924,7 +932,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeUIElement( creator ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo<span class="marker"></span>bar</p></div>' );
Expand All @@ -948,7 +956,7 @@ describe( 'downcast-converters', () => {
}, { priority: 'high' } );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
Expand All @@ -960,7 +968,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeUIElement( () => null ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
Expand All @@ -985,7 +993,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeUIElement( creator ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) )
Expand All @@ -1005,7 +1013,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeUIElement( creator ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) )
Expand All @@ -1031,7 +1039,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeUIElement( creator ) );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal(
Expand All @@ -1056,7 +1064,7 @@ describe( 'downcast-converters', () => {
}, { priority: 'high' } );

model.change( writer => {
writer.setMarker( 'marker', range );
writer.setMarker( 'marker', range, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
Expand Down Expand Up @@ -1268,7 +1276,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeHighlight( highlightDescriptor ) );

model.change( writer => {
writer.setMarker( 'marker', markerRange );
writer.setMarker( 'marker', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal(
Expand Down Expand Up @@ -1301,7 +1309,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeHighlight( newDescriptor ), { priority: 'high' } );

model.change( writer => {
writer.setMarker( 'marker', markerRange );
writer.setMarker( 'marker', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal(
Expand All @@ -1328,7 +1336,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeHighlight( () => null ), { priority: 'high' } );

model.change( writer => {
writer.setMarker( 'marker', markerRange );
writer.setMarker( 'marker', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
Expand All @@ -1350,7 +1358,7 @@ describe( 'downcast-converters', () => {
markerRange = ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 0 );

model.change( () => {
model.markers._set( 'marker', markerRange );
model.markers._set( 'marker', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
Expand Down Expand Up @@ -1379,7 +1387,7 @@ describe( 'downcast-converters', () => {
const p2 = modelRoot.getChild( 1 );

model.change( writer => {
writer.setMarker( 'markerFoo', ModelRange.createFromParentsAndOffsets( p1, 0, p1, 3 ) );
writer.setMarker( 'markerFoo', ModelRange.createFromParentsAndOffsets( p1, 0, p1, 3 ), { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal(
Expand All @@ -1392,7 +1400,7 @@ describe( 'downcast-converters', () => {
);

model.change( writer => {
writer.setMarker( 'markerBar', ModelRange.createFromParentsAndOffsets( p1, 1, p2, 2 ) );
writer.setMarker( 'markerBar', ModelRange.createFromParentsAndOffsets( p1, 1, p2, 2 ), { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal(
Expand All @@ -1411,7 +1419,7 @@ describe( 'downcast-converters', () => {
);

model.change( writer => {
writer.setMarker( 'markerXyz', ModelRange.createFromParentsAndOffsets( p1, 2, p2, 3 ) );
writer.setMarker( 'markerXyz', ModelRange.createFromParentsAndOffsets( p1, 2, p2, 3 ), { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal(
Expand Down Expand Up @@ -1485,13 +1493,13 @@ describe( 'downcast-converters', () => {
const markerRange = ModelRange.createFromParentsAndOffsets( p1, 3, p2, 0 );

model.change( writer => {
writer.setMarker( 'marker', markerRange );
writer.setMarker( 'marker', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );

model.change( writer => {
writer.removeMarker( 'marker', markerRange );
writer.removeMarker( 'marker', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
Expand Down Expand Up @@ -1539,7 +1547,7 @@ describe( 'downcast-converters', () => {

it( 'should use addHighlight and removeHighlight on elements and not convert children nodes', () => {
model.change( writer => {
writer.setMarker( 'marker', markerRange );
writer.setMarker( 'marker', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal(
Expand All @@ -1565,7 +1573,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker', removeHighlight( newDescriptor ), { priority: 'high' } );

model.change( writer => {
writer.setMarker( 'marker', markerRange );
writer.setMarker( 'marker', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal(
Expand Down Expand Up @@ -1600,7 +1608,7 @@ describe( 'downcast-converters', () => {
} );

model.change( writer => {
writer.setMarker( 'marker2', markerRange );
writer.setMarker( 'marker2', markerRange, { usingOperation: false } );
} );
} );

Expand All @@ -1610,7 +1618,7 @@ describe( 'downcast-converters', () => {
dispatcher.on( 'removeMarker:marker2', removeHighlight( () => null ) );

model.change( writer => {
writer.setMarker( 'marker2', markerRange );
writer.setMarker( 'marker2', markerRange, { usingOperation: false } );
} );

expect( viewToString( viewRoot ) ).to.equal( '<div><div>foo</div></div>' );
Expand Down
12 changes: 8 additions & 4 deletions tests/conversion/downcast-selection-converters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ describe( 'downcast-selection-converters', () => {
setModelData( model, 'fo<$text bold="true">ob</$text>ar' );

model.change( writer => {
marker = writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 );
marker = writer.setMarker( 'marker', range, { usingOperation: false } );
writer.setSelection( new ModelRange( ModelPosition.createAt( modelRoot, 3 ) ) );
} );

Expand All @@ -221,7 +222,8 @@ describe( 'downcast-selection-converters', () => {
setModelData( model, 'fo<$text bold="true">ob</$text>ar' );

model.change( writer => {
marker = writer.setMarker( 'marker', ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 );
marker = writer.setMarker( 'marker', range, { usingOperation: false } );
writer.setSelection( new ModelRange( ModelPosition.createAt( modelRoot, 3 ) ) );
writer.removeSelectionAttribute( 'bold' );
} );
Expand Down Expand Up @@ -249,7 +251,8 @@ describe( 'downcast-selection-converters', () => {
setModelData( model, 'foobar' );

model.change( writer => {
marker = writer.setMarker( 'marker2', ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 );
marker = writer.setMarker( 'marker2', range, { usingOperation: false } );
writer.setSelection( new ModelRange( ModelPosition.createAt( modelRoot, 3 ) ) );
} );

Expand All @@ -274,7 +277,8 @@ describe( 'downcast-selection-converters', () => {
setModelData( model, 'foobar' );

model.change( writer => {
marker = writer.setMarker( 'marker3', ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 ) );
const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 );
marker = writer.setMarker( 'marker3', range, { usingOperation: false } );
writer.setSelection( new ModelRange( ModelPosition.createAt( modelRoot, 3 ) ) );
} );

Expand Down
10 changes: 5 additions & 5 deletions tests/conversion/downcastdispatcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ describe( 'DowncastDispatcher', () => {
writer.setSelection(
new ModelRange( new ModelPosition( root, [ 1 ] ), new ModelPosition( root, [ 1 ] ) )
);
writer.setMarker( 'name', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ) );
writer.setMarker( 'name', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ), { usingOperation: false } );
} );

sinon.spy( dispatcher, 'fire' );
Expand All @@ -360,7 +360,7 @@ describe( 'DowncastDispatcher', () => {

it( 'should not fire events for markers for non-collapsed selection', () => {
model.change( writer => {
writer.setMarker( 'name', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ) );
writer.setMarker( 'name', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ), { usingOperation: false } );
} );

sinon.spy( dispatcher, 'fire' );
Expand Down Expand Up @@ -400,7 +400,7 @@ describe( 'DowncastDispatcher', () => {
};

model.change( writer => {
writer.setMarker( 'name', ModelRange.createFromParentsAndOffsets( root, 0, root, 1 ) );
writer.setMarker( 'name', ModelRange.createFromParentsAndOffsets( root, 0, root, 1 ), { usingOperation: false } );
writer.setSelection( ModelRange.createFromParentsAndOffsets( caption, 1, caption, 1 ) );
} );
sinon.spy( dispatcher, 'fire' );
Expand All @@ -417,8 +417,8 @@ describe( 'DowncastDispatcher', () => {
writer.setSelection(
new ModelRange( new ModelPosition( root, [ 1 ] ), new ModelPosition( root, [ 1 ] ) )
);
writer.setMarker( 'foo', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ) );
writer.setMarker( 'bar', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ) );
writer.setMarker( 'foo', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ), { usingOperation: false } );
writer.setMarker( 'bar', ModelRange.createFromParentsAndOffsets( root, 0, root, 2 ), { usingOperation: false } );
} );

sinon.spy( dispatcher, 'fire' );
Expand Down
Loading

0 comments on commit 4d01075

Please sign in to comment.