8
0
Pārlūkot izejas kodu

Merge branch 'master' into t/ckeditor5/1096

Piotrek Koszuliński 6 gadi atpakaļ
vecāks
revīzija
c7c7d5f191

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

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

+ 1 - 1
packages/ckeditor5-enter/tests/shiftenter-integration.js

@@ -48,7 +48,7 @@ describe( 'ShiftEnter integration', () => {
 
 		editor.commands.get( 'shiftEnter' ).execute();
 
-		expect( editor.getData() ).to.equal( '<p><br>&nbsp;</p>' );
+		expect( editor.getData( { trim: 'none' } ) ).to.equal( '<p><br>&nbsp;</p>' );
 		expect( editor.ui.view.editable.element.innerHTML ).to.equal( '<p><br><br data-cke-filler="true"></p>' );
 	} );
 } );