Explorar el Código

Merge branch 'master' into t/ckeditor5/1096

Piotrek Koszuliński hace 7 años
padre
commit
727fb0989c

+ 2 - 2
packages/ckeditor5-typing/package.json

@@ -32,8 +32,8 @@
     "lint-staged": "^7.0.0"
     "lint-staged": "^7.0.0"
   },
   },
   "engines": {
   "engines": {
-    "node": ">=6.9.0",
-    "npm": ">=3.0.0"
+    "node": ">=8.0.0",
+    "npm": ">=5.7.1"
   },
   },
   "author": "CKSource (http://cksource.com/)",
   "author": "CKSource (http://cksource.com/)",
   "license": "GPL-2.0-or-later",
   "license": "GPL-2.0-or-later",

+ 2 - 2
packages/ckeditor5-typing/tests/bogusbr-integration.js

@@ -64,7 +64,7 @@ describe( 'Typing – bogus BR integration', () => {
 			} );
 			} );
 
 
 			editor.model.document.once( 'change', () => {
 			editor.model.document.once( 'change', () => {
-				expect( editor.getData() ).to.equal( '<p>&nbsp;</p>' );
+				expect( editor.getData( { trim: 'none' } ) ).to.equal( '<p>&nbsp;</p>' );
 				done();
 				done();
 			}, { priority: 'low' } );
 			}, { priority: 'low' } );
 
 
@@ -82,7 +82,7 @@ describe( 'Typing – bogus BR integration', () => {
 			} );
 			} );
 
 
 			editor.model.document.once( 'change', () => {
 			editor.model.document.once( 'change', () => {
-				expect( editor.getData() ).to.equal( '<p>&nbsp;</p>' );
+				expect( editor.getData( { trim: 'none' } ) ).to.equal( '<p>&nbsp;</p>' );
 				done();
 				done();
 			}, { priority: 'low' } );
 			}, { priority: 'low' } );
 
 

+ 2 - 2
packages/ckeditor5-typing/tests/tickets/59.js

@@ -44,7 +44,7 @@ describe( 'Bug ckeditor5-typing#59', () => {
 			editor.execute( 'delete' );
 			editor.execute( 'delete' );
 		}
 		}
 
 
-		expect( editor.getData() ).to.equal( '<p>&nbsp;</p>' );
+		expect( editor.getData( { trim: 'none' } ) ).to.equal( '<p>&nbsp;</p>' );
 	} );
 	} );
 
 
 	// This is something that came to my mind after I worked on ckeditor/ckeditor5-engine#659.
 	// This is something that came to my mind after I worked on ckeditor/ckeditor5-engine#659.
@@ -60,6 +60,6 @@ describe( 'Bug ckeditor5-typing#59', () => {
 			editor.execute( 'bold' );
 			editor.execute( 'bold' );
 		}
 		}
 
 
-		expect( editor.getData() ).to.equal( '<p>&nbsp;</p>' );
+		expect( editor.getData( { trim: 'none' } ) ).to.equal( '<p>&nbsp;</p>' );
 	} );
 	} );
 } );
 } );