foo[]
' ); model.change( writer => { - expect( writer.batch.deltas ).to.length( 0 ); + expect( writer.batch.operations ).to.length( 0 ); editor.execute( 'enter' ); - expect( writer.batch.deltas ).to.length.above( 0 ); + expect( writer.batch.operations ).to.length.above( 0 ); } ); } ); - it( 'creates InsertDelta if enter is at the beginning of block', () => { + it( 'creates InsertOperation if enter is at the beginning of block', () => { setData( model, '[]foo
' ); editor.execute( 'enter' ); - const deltas = Array.from( doc.history.getDeltas() ); + const ops = doc.history.getOperations(); - expect( deltas[ deltas.length - 1 ] ).to.be.instanceof( InsertDelta ); + expect( ops[ ops.length - 1 ] ).to.be.instanceof( InsertOperation ); } ); - it( 'creates InsertDelta if enter is at the end of block', () => { + it( 'creates InsertOperation if enter is at the end of block', () => { setData( model, 'foo[]
' ); editor.execute( 'enter' ); - const deltas = Array.from( doc.history.getDeltas() ); + const operations = Array.from( doc.history.getOperations() ); - expect( deltas[ deltas.length - 1 ] ).to.be.instanceof( InsertDelta ); + expect( operations[ operations.length - 1 ] ).to.be.instanceof( InsertOperation ); } ); } ); diff --git a/tests/shiftentercommand.js b/tests/shiftentercommand.js index 26bbb17..42ace28 100644 --- a/tests/shiftentercommand.js +++ b/tests/shiftentercommand.js @@ -4,7 +4,7 @@ */ import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor'; -import InsertDelta from '@ckeditor/ckeditor5-engine/src/model/delta/insertdelta'; +import InsertOperation from '@ckeditor/ckeditor5-engine/src/model/operation/insertoperation'; import { getData, setData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model'; import ShiftEnter from '../src/shiftenter'; @@ -49,30 +49,30 @@ describe( 'ShiftEnterCommand', () => { setData( model, 'foo[]
' ); model.change( writer => { - expect( writer.batch.deltas ).to.length( 0 ); + expect( writer.batch.operations ).to.length( 0 ); editor.execute( 'shiftEnter' ); - expect( writer.batch.deltas ).to.length.above( 0 ); + expect( writer.batch.operations ).to.length.above( 0 ); } ); } ); - it( 'creates InsertDelta if soft enter is at the beginning of block', () => { + it( 'creates InsertOperation if soft enter is at the beginning of block', () => { setData( model, '[]foo
' ); editor.execute( 'shiftEnter' ); - const deltas = Array.from( doc.history.getDeltas() ); + const operations = Array.from( doc.history.getOperations() ); - expect( deltas[ deltas.length - 1 ] ).to.be.instanceof( InsertDelta ); + expect( operations[ operations.length - 1 ] ).to.be.instanceof( InsertOperation ); } ); - it( 'creates InsertDelta if soft enter is at the end of block', () => { + it( 'creates InsertOperation if soft enter is at the end of block', () => { setData( model, 'foo[]
' ); editor.execute( 'shiftEnter' ); - const deltas = Array.from( doc.history.getDeltas() ); + const operations = Array.from( doc.history.getOperations() ); - expect( deltas[ deltas.length - 1 ] ).to.be.instanceof( InsertDelta ); + expect( operations[ operations.length - 1 ] ).to.be.instanceof( InsertOperation ); } ); } ); @@ -295,7 +295,7 @@ describe( 'ShiftEnterCommand', () => { model.change( () => { setData( model, 'F[oo
F[oo.
B]ar.
' ); + model.change( () => { + setData( model, 'F[oo.
B]ar.
' ); - expect( command.isEnabled ).to.equal( false ); + // Refresh it manually because we're in the middle of a change block. + command.refresh(); + + expect( command.isEnabled ).to.equal( false ); + } ); } ); it( 'should be disabled for non-collapsed selection which ends in element inside a block limit element', () => { - setData( model, 'Fo[o.
Bar].
Fo[o.
Bar].