Browse Source

Removed unnecessary describe().

Piotrek Koszuliński 5 years ago
parent
commit
394816faca

+ 163 - 165
packages/ckeditor5-table/tests/tableselection-integration.js

@@ -19,193 +19,191 @@ import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
 import Input from '@ckeditor/ckeditor5-typing/src/input';
 import ViewText from '@ckeditor/ckeditor5-engine/src/view/text';
 
-describe( 'table selection', () => {
+describe( 'TableSelection - integration', () => {
 	let editor, model, tableSelection, modelRoot, element, viewDocument;
 
-	describe( 'TableSelection - input integration', () => {
-		afterEach( async () => {
-			element.remove();
-			await editor.destroy();
+	afterEach( async () => {
+		element.remove();
+		await editor.destroy();
+	} );
+
+	describe( 'on delete', () => {
+		beforeEach( async () => {
+			await setupEditor( [ Delete ] );
 		} );
 
-		describe( 'on delete', () => {
-			beforeEach( async () => {
-				await setupEditor( [ Delete ] );
+		it( 'should clear contents of the selected table cells and put selection in last cell on backward delete', () => {
+			tableSelection._setCellSelection(
+				modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
+				modelRoot.getNodeByPath( [ 0, 1, 1 ] )
+			);
+
+			const domEventData = new DomEventData( viewDocument, {
+				preventDefault: sinon.spy()
+			}, {
+				direction: 'backward',
+				unit: 'character',
+				sequence: 1
 			} );
+			viewDocument.fire( 'delete', domEventData );
 
-			it( 'should clear contents of the selected table cells and put selection in last cell on backward delete', () => {
-				tableSelection._setCellSelection(
-					modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
-					modelRoot.getNodeByPath( [ 0, 1, 1 ] )
-				);
-
-				const domEventData = new DomEventData( viewDocument, {
-					preventDefault: sinon.spy()
-				}, {
-					direction: 'backward',
-					unit: 'character',
-					sequence: 1
-				} );
-				viewDocument.fire( 'delete', domEventData );
+			assertEqualMarkup( getModelData( model ), modelTable( [
+				[ '', '', '13' ],
+				[ '', '[]', '23' ],
+				[ '31', '32', '33' ]
+			] ) );
+		} );
 
-				assertEqualMarkup( getModelData( model ), modelTable( [
-					[ '', '', '13' ],
-					[ '', '[]', '23' ],
-					[ '31', '32', '33' ]
-				] ) );
+		it( 'should clear contents of the selected table cells and put selection in last cell on forward delete', () => {
+			tableSelection._setCellSelection(
+				modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
+				modelRoot.getNodeByPath( [ 0, 1, 1 ] )
+			);
+
+			const domEventData = new DomEventData( viewDocument, {
+				preventDefault: sinon.spy()
+			}, {
+				direction: 'forward',
+				unit: 'character',
+				sequence: 1
 			} );
+			viewDocument.fire( 'delete', domEventData );
 
-			it( 'should clear contents of the selected table cells and put selection in last cell on forward delete', () => {
-				tableSelection._setCellSelection(
-					modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
-					modelRoot.getNodeByPath( [ 0, 1, 1 ] )
-				);
-
-				const domEventData = new DomEventData( viewDocument, {
-					preventDefault: sinon.spy()
-				}, {
-					direction: 'forward',
-					unit: 'character',
-					sequence: 1
-				} );
-				viewDocument.fire( 'delete', domEventData );
+			assertEqualMarkup( getModelData( model ), modelTable( [
+				[ '[]', '', '13' ],
+				[ '', '', '23' ],
+				[ '31', '32', '33' ]
+			] ) );
+		} );
 
-				assertEqualMarkup( getModelData( model ), modelTable( [
-					[ '[]', '', '13' ],
-					[ '', '', '23' ],
-					[ '31', '32', '33' ]
-				] ) );
+		it( 'should not interfere with default key handler if no table selection', () => {
+			setModelData( model, modelTable( [
+				[ '11[]', '12', '13' ],
+				[ '21', '22', '23' ],
+				[ '31', '32', '33' ]
+			] ) );
+
+			const domEventData = new DomEventData( viewDocument, {
+				preventDefault: sinon.spy()
+			}, {
+				direction: 'backward',
+				unit: 'character',
+				sequence: 1
 			} );
+			viewDocument.fire( 'delete', domEventData );
 
-			it( 'should not interfere with default key handler if no table selection', () => {
-				setModelData( model, modelTable( [
-					[ '11[]', '12', '13' ],
-					[ '21', '22', '23' ],
-					[ '31', '32', '33' ]
-				] ) );
-
-				const domEventData = new DomEventData( viewDocument, {
-					preventDefault: sinon.spy()
-				}, {
-					direction: 'backward',
-					unit: 'character',
-					sequence: 1
-				} );
-				viewDocument.fire( 'delete', domEventData );
+			assertEqualMarkup( getModelData( model ), modelTable( [
+				[ '1[]', '12', '13' ],
+				[ '21', '22', '23' ],
+				[ '31', '32', '33' ]
+			] ) );
+		} );
 
-				assertEqualMarkup( getModelData( model ), modelTable( [
-					[ '1[]', '12', '13' ],
-					[ '21', '22', '23' ],
-					[ '31', '32', '33' ]
-				] ) );
+		it( 'should work with any arbitrary selection passed to Model#deleteContent() (delete backwards)', () => {
+			const selection = model.createSelection( [
+				model.createRange(
+					model.createPositionFromPath( modelRoot, [ 0, 0, 0 ] ),
+					model.createPositionFromPath( modelRoot, [ 0, 0, 1 ] )
+				),
+				model.createRange(
+					model.createPositionFromPath( modelRoot, [ 0, 0, 1 ] ),
+					model.createPositionFromPath( modelRoot, [ 0, 0, 2 ] )
+				)
+			] );
+
+			model.change( writer => {
+				model.deleteContent( selection );
+				writer.setSelection( selection );
 			} );
 
-			it( 'should work with any arbitrary selection passed to Model#deleteContent() (delete backwards)', () => {
-				const selection = model.createSelection( [
-					model.createRange(
-						model.createPositionFromPath( modelRoot, [ 0, 0, 0 ] ),
-						model.createPositionFromPath( modelRoot, [ 0, 0, 1 ] )
-					),
-					model.createRange(
-						model.createPositionFromPath( modelRoot, [ 0, 0, 1 ] ),
-						model.createPositionFromPath( modelRoot, [ 0, 0, 2 ] )
-					)
-				] );
-
-				model.change( writer => {
-					model.deleteContent( selection );
-					writer.setSelection( selection );
-				} );
-
-				assertEqualMarkup( getModelData( model ), modelTable( [
-					[ '', '[]', '13' ],
-					[ '21', '22', '23' ],
-					[ '31', '32', '33' ]
-				] ) );
-			} );
+			assertEqualMarkup( getModelData( model ), modelTable( [
+				[ '', '[]', '13' ],
+				[ '21', '22', '23' ],
+				[ '31', '32', '33' ]
+			] ) );
+		} );
 
-			it( 'should work with any arbitrary selection passed to Model#deleteContent() (delete forwards)', () => {
-				const selection = model.createSelection( [
-					model.createRange(
-						model.createPositionFromPath( modelRoot, [ 0, 0, 0 ] ),
-						model.createPositionFromPath( modelRoot, [ 0, 0, 1 ] )
-					),
-					model.createRange(
-						model.createPositionFromPath( modelRoot, [ 0, 0, 1 ] ),
-						model.createPositionFromPath( modelRoot, [ 0, 0, 2 ] )
-					)
-				] );
-
-				model.change( writer => {
-					model.deleteContent( selection, {
-						direction: 'forward'
-					} );
-					writer.setSelection( selection );
+		it( 'should work with any arbitrary selection passed to Model#deleteContent() (delete forwards)', () => {
+			const selection = model.createSelection( [
+				model.createRange(
+					model.createPositionFromPath( modelRoot, [ 0, 0, 0 ] ),
+					model.createPositionFromPath( modelRoot, [ 0, 0, 1 ] )
+				),
+				model.createRange(
+					model.createPositionFromPath( modelRoot, [ 0, 0, 1 ] ),
+					model.createPositionFromPath( modelRoot, [ 0, 0, 2 ] )
+				)
+			] );
+
+			model.change( writer => {
+				model.deleteContent( selection, {
+					direction: 'forward'
 				} );
-
-				assertEqualMarkup( getModelData( model ), modelTable( [
-					[ '[]', '', '13' ],
-					[ '21', '22', '23' ],
-					[ '31', '32', '33' ]
-				] ) );
+				writer.setSelection( selection );
 			} );
+
+			assertEqualMarkup( getModelData( model ), modelTable( [
+				[ '[]', '', '13' ],
+				[ '21', '22', '23' ],
+				[ '31', '32', '33' ]
+			] ) );
 		} );
+	} );
 
-		describe( 'on user input', () => {
-			beforeEach( async () => {
-				await setupEditor( [ Input ] );
-			} );
+	describe( 'on user input', () => {
+		beforeEach( async () => {
+			await setupEditor( [ Input ] );
+		} );
 
-			it( 'should clear contents of the selected table cells and put selection in last cell on user input', () => {
-				tableSelection._setCellSelection(
-					modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
-					modelRoot.getNodeByPath( [ 0, 1, 1 ] )
-				);
-
-				viewDocument.fire( 'keydown', { keyCode: getCode( 'x' ) } );
-
-				// Mutate at the place where the document selection was put; it's more realistic
-				// than mutating at some arbitrary position.
-				const placeOfMutation = viewDocument.selection.getFirstRange().start.parent;
-
-				viewDocument.fire( 'mutations', [
-					{
-						type: 'children',
-						oldChildren: [],
-						newChildren: [ new ViewText( viewDocument, 'x' ) ],
-						node: placeOfMutation
-					}
-				] );
-
-				assertEqualMarkup( getModelData( model ), modelTable( [
-					[ '', '', '13' ],
-					[ '', 'x[]', '23' ],
-					[ '31', '32', '33' ]
-				] ) );
-			} );
+		it( 'should clear contents of the selected table cells and put selection in last cell on user input', () => {
+			tableSelection._setCellSelection(
+				modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
+				modelRoot.getNodeByPath( [ 0, 1, 1 ] )
+			);
+
+			viewDocument.fire( 'keydown', { keyCode: getCode( 'x' ) } );
+
+			// Mutate at the place where the document selection was put; it's more realistic
+			// than mutating at some arbitrary position.
+			const placeOfMutation = viewDocument.selection.getFirstRange().start.parent;
+
+			viewDocument.fire( 'mutations', [
+				{
+					type: 'children',
+					oldChildren: [],
+					newChildren: [ new ViewText( viewDocument, 'x' ) ],
+					node: placeOfMutation
+				}
+			] );
+
+			assertEqualMarkup( getModelData( model ), modelTable( [
+				[ '', '', '13' ],
+				[ '', 'x[]', '23' ],
+				[ '31', '32', '33' ]
+			] ) );
+		} );
 
-			it( 'should not interfere with default key handler if no table selection', () => {
-				viewDocument.fire( 'keydown', { keyCode: getCode( 'x' ) } );
-
-				// Mutate at the place where the document selection was put; it's more realistic
-				// than mutating at some arbitrary position.
-				const placeOfMutation = viewDocument.selection.getFirstRange().start.parent;
-
-				viewDocument.fire( 'mutations', [
-					{
-						type: 'children',
-						oldChildren: [],
-						newChildren: [ new ViewText( viewDocument, 'x' ) ],
-						node: placeOfMutation
-					}
-				] );
-
-				assertEqualMarkup( getModelData( model ), modelTable( [
-					[ 'x[]11', '12', '13' ],
-					[ '21', '22', '23' ],
-					[ '31', '32', '33' ]
-				] ) );
-			} );
+		it( 'should not interfere with default key handler if no table selection', () => {
+			viewDocument.fire( 'keydown', { keyCode: getCode( 'x' ) } );
+
+			// Mutate at the place where the document selection was put; it's more realistic
+			// than mutating at some arbitrary position.
+			const placeOfMutation = viewDocument.selection.getFirstRange().start.parent;
+
+			viewDocument.fire( 'mutations', [
+				{
+					type: 'children',
+					oldChildren: [],
+					newChildren: [ new ViewText( viewDocument, 'x' ) ],
+					node: placeOfMutation
+				}
+			] );
+
+			assertEqualMarkup( getModelData( model ), modelTable( [
+				[ 'x[]11', '12', '13' ],
+				[ '21', '22', '23' ],
+				[ '31', '32', '33' ]
+			] ) );
 		} );
 	} );
 

+ 88 - 91
packages/ckeditor5-table/tests/tableselection.js

@@ -37,110 +37,107 @@ describe( 'table selection', () => {
 	afterEach( async () => {
 		await editor.destroy();
 	} );
+	describe( 'selection by shift+click', () => {
+		it( 'should...', () => {
+			// tableSelection.startSelectingFrom( modelRoot.getNodeByPath( [ 0, 0, 0 ] ) );
+			// tableSelection.setSelectingTo( modelRoot.getNodeByPath( [ 0, 0, 1 ] ) );
+
+			// tableSelection.stopSelection();
+
+			// assertSelectedCells( model, [
+			// 	[ 1, 1, 0 ],
+			// 	[ 0, 0, 0 ],
+			// 	[ 0, 0, 0 ]
+			// ] );
+		} );
+	} );
+
+	describe( 'selection by mouse drag', () => {
+		it( 'should...', () => {
+			// tableSelection.startSelectingFrom( modelRoot.getNodeByPath( [ 0, 0, 0 ] ) );
+			// tableSelection.setSelectingTo( modelRoot.getNodeByPath( [ 0, 0, 1 ] ) );
 
-	describe( 'TableSelection', () => {
-		describe( 'selection by shift+click', () => {
-			it( 'should...', () => {
-				// tableSelection.startSelectingFrom( modelRoot.getNodeByPath( [ 0, 0, 0 ] ) );
-				// tableSelection.setSelectingTo( modelRoot.getNodeByPath( [ 0, 0, 1 ] ) );
+			// tableSelection.stopSelection();
 
-				// tableSelection.stopSelection();
+			// assertSelectedCells( model, [
+			// 	[ 1, 1, 0 ],
+			// 	[ 0, 0, 0 ],
+			// 	[ 0, 0, 0 ]
+			// ] );
+		} );
+	} );
 
-				// assertSelectedCells( model, [
-				// 	[ 1, 1, 0 ],
-				// 	[ 0, 0, 0 ],
-				// 	[ 0, 0, 0 ]
-				// ] );
-			} );
+	describe( 'getSelectedTableCells()', () => {
+		it( 'should return nothing if selection is not started', () => {
+			expect( tableSelection.getSelectedTableCells() ).to.be.null;
 		} );
 
-		describe( 'selection by mouse drag', () => {
-			it( 'should...', () => {
-				// tableSelection.startSelectingFrom( modelRoot.getNodeByPath( [ 0, 0, 0 ] ) );
-				// tableSelection.setSelectingTo( modelRoot.getNodeByPath( [ 0, 0, 1 ] ) );
+		it( 'should return two table cells', () => {
+			const firstCell = modelRoot.getNodeByPath( [ 0, 0, 0 ] );
+			const lastCell = modelRoot.getNodeByPath( [ 0, 0, 1 ] );
 
-				// tableSelection.stopSelection();
+			tableSelection._setCellSelection(
+				firstCell,
+				lastCell
+			);
 
-				// assertSelectedCells( model, [
-				// 	[ 1, 1, 0 ],
-				// 	[ 0, 0, 0 ],
-				// 	[ 0, 0, 0 ]
-				// ] );
-			} );
+			expect( Array.from( tableSelection.getSelectedTableCells() ) ).to.deep.equal( [
+				firstCell, lastCell
+			] );
 		} );
 
-		describe( 'getSelectedTableCells()', () => {
-			it( 'should return nothing if selection is not started', () => {
-				expect( tableSelection.getSelectedTableCells() ).to.be.null;
-			} );
-
-			it( 'should return two table cells', () => {
-				const firstCell = modelRoot.getNodeByPath( [ 0, 0, 0 ] );
-				const lastCell = modelRoot.getNodeByPath( [ 0, 0, 1 ] );
-
-				tableSelection._setCellSelection(
-					firstCell,
-					lastCell
-				);
-
-				expect( Array.from( tableSelection.getSelectedTableCells() ) ).to.deep.equal( [
-					firstCell, lastCell
-				] );
-			} );
-
-			it( 'should return four table cells for diagonal selection', () => {
-				const firstCell = modelRoot.getNodeByPath( [ 0, 0, 0 ] );
-				const lastCell = modelRoot.getNodeByPath( [ 0, 1, 1 ] );
-
-				tableSelection._setCellSelection(
-					firstCell,
-					lastCell
-				);
-
-				expect( Array.from( tableSelection.getSelectedTableCells() ) ).to.deep.equal( [
-					firstCell, modelRoot.getNodeByPath( [ 0, 0, 1 ] ), modelRoot.getNodeByPath( [ 0, 1, 0 ] ), lastCell
-				] );
-			} );
-
-			it( 'should return row table cells', () => {
-				const firstCell = modelRoot.getNodeByPath( [ 0, 0, 0 ] );
-				const lastCell = modelRoot.getNodeByPath( [ 0, 0, 2 ] );
-
-				tableSelection._setCellSelection(
-					firstCell,
-					lastCell
-				);
-
-				expect( Array.from( tableSelection.getSelectedTableCells() ) ).to.deep.equal( [
-					firstCell, modelRoot.getNodeByPath( [ 0, 0, 1 ] ), lastCell
-				] );
-			} );
-
-			it( 'should return column table cells', () => {
-				const firstCell = modelRoot.getNodeByPath( [ 0, 0, 1 ] );
-				const lastCell = modelRoot.getNodeByPath( [ 0, 2, 1 ] );
-
-				tableSelection._setCellSelection( firstCell, lastCell );
-
-				expect( Array.from( tableSelection.getSelectedTableCells() ) ).to.deep.equal( [
-					firstCell, modelRoot.getNodeByPath( [ 0, 1, 1 ] ), lastCell
-				] );
-			} );
+		it( 'should return four table cells for diagonal selection', () => {
+			const firstCell = modelRoot.getNodeByPath( [ 0, 0, 0 ] );
+			const lastCell = modelRoot.getNodeByPath( [ 0, 1, 1 ] );
+
+			tableSelection._setCellSelection(
+				firstCell,
+				lastCell
+			);
+
+			expect( Array.from( tableSelection.getSelectedTableCells() ) ).to.deep.equal( [
+				firstCell, modelRoot.getNodeByPath( [ 0, 0, 1 ] ), modelRoot.getNodeByPath( [ 0, 1, 0 ] ), lastCell
+			] );
 		} );
 
-		describe( 'getSelectionAsFragment()', () => {
-			it( 'should return undefined if no table cells are selected', () => {
-				expect( tableSelection.getSelectionAsFragment() ).to.be.null;
-			} );
+		it( 'should return row table cells', () => {
+			const firstCell = modelRoot.getNodeByPath( [ 0, 0, 0 ] );
+			const lastCell = modelRoot.getNodeByPath( [ 0, 0, 2 ] );
+
+			tableSelection._setCellSelection(
+				firstCell,
+				lastCell
+			);
+
+			expect( Array.from( tableSelection.getSelectedTableCells() ) ).to.deep.equal( [
+				firstCell, modelRoot.getNodeByPath( [ 0, 0, 1 ] ), lastCell
+			] );
+		} );
+
+		it( 'should return column table cells', () => {
+			const firstCell = modelRoot.getNodeByPath( [ 0, 0, 1 ] );
+			const lastCell = modelRoot.getNodeByPath( [ 0, 2, 1 ] );
+
+			tableSelection._setCellSelection( firstCell, lastCell );
+
+			expect( Array.from( tableSelection.getSelectedTableCells() ) ).to.deep.equal( [
+				firstCell, modelRoot.getNodeByPath( [ 0, 1, 1 ] ), lastCell
+			] );
+		} );
+	} );
+
+	describe( 'getSelectionAsFragment()', () => {
+		it( 'should return undefined if no table cells are selected', () => {
+			expect( tableSelection.getSelectionAsFragment() ).to.be.null;
+		} );
 
-			it( 'should return document fragment for selected table cells', () => {
-				tableSelection._setCellSelection(
-					modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
-					modelRoot.getNodeByPath( [ 0, 1, 1 ] )
-				);
+		it( 'should return document fragment for selected table cells', () => {
+			tableSelection._setCellSelection(
+				modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
+				modelRoot.getNodeByPath( [ 0, 1, 1 ] )
+			);
 
-				expect( tableSelection.getSelectionAsFragment() ).to.be.instanceOf( DocumentFragment );
-			} );
+			expect( tableSelection.getSelectionAsFragment() ).to.be.instanceOf( DocumentFragment );
 		} );
 	} );
 } );