Updated the manual tests.

brucelin · Apr 15, 2021 · e6e84d7 · e6e84d7
1 parent 489bdbe
commit e6e84d7
Show file tree

Hide file tree

Showing 42 changed files with 75 additions and 113 deletions.
diff --git a/packages/ckeditor5-ckfinder/tests/manual/ckfinder.js b/packages/ckeditor5-ckfinder/tests/manual/ckfinder.js
@@ -17,7 +17,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet, ImageUpload, CKFinderUploadAdapter, CKFinder ],
 		toolbar: [ 'heading', '|', 'undo', 'redo', 'ckfinder' ],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		ckfinder: {
 			// eslint-disable-next-line max-len

diff --git a/packages/ckeditor5-clipboard/tests/manual/dragdrop.js b/packages/ckeditor5-clipboard/tests/manual/dragdrop.js
@@ -194,14 +194,9 @@ ClassicEditor
 			contentToolbar: [ 'tableColumn', 'tableRow', 'mergeTableCells' ]
 		},
 		image: {
-			styles: [
-				'alignCenter',
-				'alignLeft',
-				'alignRight'
-			],
 			toolbar: [
 				'imageTextAlternative', '|',
-				'imageStyle:alignLeft', 'imageStyle:alignCenter', 'imageStyle:alignRight', '|',
+				'imageStyle:inline', 'imageStyle:wrapText', 'imageStyle:breakText', '|',
 				'resizeImage'
 			]
 		},

diff --git a/packages/ckeditor5-core/tests/manual/readonly.js b/packages/ckeditor5-core/tests/manual/readonly.js
@@ -15,7 +15,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet, BalloonToolbar ],
 		toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		balloonToolbar: [ 'bold', 'italic', 'link' ]
 	} )

diff --git a/packages/ckeditor5-easy-image/tests/manual/easyimage.js b/packages/ckeditor5-easy-image/tests/manual/easyimage.js
@@ -33,7 +33,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [

diff --git a/packages/ckeditor5-editor-balloon/tests/manual/ballooneditor.js b/packages/ckeditor5-editor-balloon/tests/manual/ballooneditor.js
@@ -23,7 +23,7 @@ function initEditors() {
 				plugins: [ ArticlePluginSet ],
 				toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote' ],
 				image: {
-					toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+					toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 				}
 			} )
 			.then( editor => {

diff --git a/packages/ckeditor5-editor-balloon/tests/manual/memory.js b/packages/ckeditor5-editor-balloon/tests/manual/memory.js
@@ -44,6 +44,7 @@ function initEditors() {
 				},
 				image: {
 					toolbar: [
+						'imageStyle:inline',
 						'imageStyle:full',
 						'imageStyle:side',
 						'|',

diff --git a/packages/ckeditor5-editor-classic/tests/manual/memory.js b/packages/ckeditor5-editor-classic/tests/manual/memory.js
@@ -38,6 +38,7 @@ function initEditor() {
 			},
 			image: {
 				toolbar: [
+					'imageStyle:inline',
 					'imageStyle:full',
 					'imageStyle:side',
 					'|',

diff --git a/packages/ckeditor5-editor-decoupled/tests/manual/memory.js b/packages/ckeditor5-editor-decoupled/tests/manual/memory.js
@@ -40,6 +40,7 @@ function initEditor() {
 			},
 			image: {
 				toolbar: [
+					'imageStyle:inline',
 					'imageStyle:full',
 					'imageStyle:side',
 					'|',

diff --git a/packages/ckeditor5-editor-inline/tests/manual/memory.js b/packages/ckeditor5-editor-inline/tests/manual/memory.js
@@ -44,6 +44,7 @@ function initEditors() {
 				},
 				image: {
 					toolbar: [
+						'imageStyle:inline',
 						'imageStyle:full',
 						'imageStyle:side',
 						'|',

diff --git a/packages/ckeditor5-engine/tests/manual/tickets/1088/1.js b/packages/ckeditor5-engine/tests/manual/tickets/1088/1.js
@@ -26,6 +26,7 @@ ClassicEditor
 		},
 		image: {
 			toolbar: [
+				'imageStyle:inline',
 				'imageStyle:full',
 				'imageStyle:side',
 				'|',

diff --git a/packages/ckeditor5-horizontal-line/tests/manual/horizontalline.js b/packages/ckeditor5-horizontal-line/tests/manual/horizontalline.js
@@ -29,16 +29,12 @@ ClassicEditor
 			'horizontalLine'
 		],
 		image: {
-			styles: [
-				'full',
-				'alignLeft',
-				'alignRight'
-			],
 			toolbar: [
-				'imageStyle:alignLeft',
-				'imageStyle:full',
-				'imageStyle:alignRight',
+				'imageStyle:inline',
+				'imageStyle:wrapText',
+				'imageStyle:breakText',
 				'|',
+				'toggleImageCaption',
 				'imageTextAlternative'
 			]
 		},

diff --git a/packages/ckeditor5-image/tests/manual/caption.js b/packages/ckeditor5-image/tests/manual/caption.js
@@ -13,7 +13,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet ],
 		toolbar: [ 'heading', '|', 'undo', 'redo', 'bold', 'italic', 'bulletedList', 'numberedList' ],
 		image: {
-			toolbar: [ 'toggleImageCaption', '|', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'toggleImageCaption', '|', 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		}
 	} )
 	.then( editor => {

diff --git a/packages/ckeditor5-image/tests/manual/imageblock.js b/packages/ckeditor5-image/tests/manual/imageblock.js
@@ -65,7 +65,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ],
+			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ],
 			insert: {
 				integrations: [
 					'insertImageViaUrl',

diff --git a/packages/ckeditor5-image/tests/manual/imageinline.js b/packages/ckeditor5-image/tests/manual/imageinline.js
@@ -67,7 +67,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ],
+			toolbar: [ 'imageStyle:inline', 'imageStyle:wrapText', '|', 'imageTextAlternative' ],
 			insert: {
 				integrations: [
 					'insertImageViaUrl',

diff --git a/packages/ckeditor5-image/tests/manual/imageinsertviaurl.js b/packages/ckeditor5-image/tests/manual/imageinsertviaurl.js
@@ -31,7 +31,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ],
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ],
 			insert: {
 				integrations: [
 					'insertImageViaUrl',

diff --git a/packages/ckeditor5-image/tests/manual/imageresize.js b/packages/ckeditor5-image/tests/manual/imageresize.js
@@ -29,12 +29,7 @@ const commonConfig = {
 	toolbar: [ 'heading', '|', 'bold', 'italic', 'link',
 		'bulletedList', 'numberedList', 'blockQuote', 'insertTable', 'undo', 'redo', 'outdent', 'indent' ],
 	image: {
-		toolbar: [ 'imageStyle:alignLeft', 'imageStyle:alignCenter', 'imageStyle:alignRight', '|', 'resizeImage' ],
-		styles: [
-			'alignLeft',
-			'alignCenter',
-			'alignRight'
-		]
+		toolbar: [ 'imageStyle:inline', 'imageStyle:wrapText', 'imageStyle:breakText', '|', 'toggleImageCaption', 'resizeImage' ]
 	},
 	table: {
 		contentToolbar: [ 'tableColumn', 'tableRow', 'mergeTableCells' ],

diff --git a/packages/ckeditor5-image/tests/manual/imageresizebuttons.js b/packages/ckeditor5-image/tests/manual/imageresizebuttons.js
@@ -56,12 +56,7 @@ const imageConfig1 = {
 			value: '75'
 		}
 	],
-	toolbar: [ 'imageStyle:alignLeft', 'imageStyle:alignCenter', 'imageStyle:alignRight', '|', 'resizeImage' ],
-	styles: [
-		'alignLeft',
-		'alignCenter',
-		'alignRight'
-	]
+	toolbar: [ 'imageStyle:inline', 'imageStyle:wrapText', 'imageStyle:breakText', '|', 'toggleImageCaption', 'resizeImage' ]
 };
 
 const config1 = {
@@ -100,17 +95,13 @@ const imageConfig2 = {
 		}
 	],
 	toolbar: [
-		'imageStyle:alignLeft',
-		'imageStyle:full',
-		'imageStyle:side', '|',
+		'imageStyle:inline',
+		'imageStyle:wrapText',
+		'imageStyle:breakText',
+		'imageStyle:side', '|', // Purposely using side image to make sure it works well with both style types.
 		'resizeImage:50',
 		'resizeImage:75',
 		'resizeImage:original'
-	],
-	styles: [
-		'full',
-		'alignLeft',
-		'side' // Purposely using side image instead right aligned image to make sure it works well with both style types.
 	]
 };
 

diff --git a/packages/ckeditor5-image/tests/manual/imageresizepx.js b/packages/ckeditor5-image/tests/manual/imageresizepx.js
@@ -31,12 +31,7 @@ const commonConfig = {
 		'bulletedList', 'numberedList', 'blockQuote', 'insertTable', 'undo', 'redo', 'outdent', 'indent' ],
 	image: {
 		resizeUnit: 'px',
-		toolbar: [ 'imageStyle:alignLeft', 'imageStyle:alignCenter', 'imageStyle:alignRight', '|', 'resizeImage' ],
-		styles: [
-			'alignLeft',
-			'alignCenter',
-			'alignRight'
-		]
+		toolbar: [ 'imageStyle:inline', 'imageStyle:wrapText', 'imageStyle:breakText', '|', 'toggleImageCaption', 'resizeImage' ]
 	},
 	cloudServices: CS_CONFIG
 };

diff --git a/packages/ckeditor5-image/tests/manual/imagestyle.js b/packages/ckeditor5-image/tests/manual/imagestyle.js
@@ -65,6 +65,7 @@ async function startEditors() {
 				groups: []
 			},
 			toolbar: [
+				'imageStyle:inline',
 				'imageStyle:full',
 				'imageStyle:side',
 				'|',
@@ -74,30 +75,9 @@ async function startEditors() {
 		}
 	} );
 
-	window.editorFormatting = await ClassicEditor.create( document.querySelector( '#editor-formatting' ), {
-		cloudServices: CS_CONFIG,
-		plugins: PLUGINS_CONFIG,
-		toolbar: TOOLBAR_CONFIG,
-		image: {
-			styles: {
-				arrangements: [ 'alignLeft', 'alignCenter', 'alignRight' ],
-				groups: []
-			},
-			toolbar: [
-				'imageStyle:alignLeft',
-				'imageStyle:alignCenter',
-				'imageStyle:alignRight',
-				'|',
-				'toggleImageCaption',
-				'imageTextAlternative'
-			]
-		}
-	} );
-
 	CKEditorInspector.attach( {
 		inline: window.editorInline,
-		semantic: window.editorSemantic,
-		formatting: window.editorFormatting
+		semantic: window.editorSemantic
 	} );
 }
 
diff --git a/packages/ckeditor5-image/tests/manual/imagetypetoggle.js b/packages/ckeditor5-image/tests/manual/imagetypetoggle.js
@@ -69,7 +69,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ],
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ],
 			insert: {
 				integrations: [
 					'insertImageViaUrl',

diff --git a/packages/ckeditor5-image/tests/manual/imageupload.js b/packages/ckeditor5-image/tests/manual/imageupload.js
@@ -32,7 +32,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		}
 	} )
 	.then( editor => {

diff --git a/packages/ckeditor5-image/tests/manual/resizing-images-in-tables.js b/packages/ckeditor5-image/tests/manual/resizing-images-in-tables.js
@@ -47,11 +47,11 @@ async function createEditor( element, resizeUnit ) {
 			image: {
 				resizeUnit,
 				toolbar: [
-					'toggleImageCaption', '|',
 					'imageStyle:inline',
 					'imageStyle:wrapText',
 					'imageStyle:breakText',
 					'|',
+					'toggleImageCaption',
 					'imageTextAlternative', '|',
 					'resizeImage'
 				]

diff --git a/packages/ckeditor5-indent/tests/manual/indent-block-classes.js b/packages/ckeditor5-indent/tests/manual/indent-block-classes.js
@@ -29,7 +29,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [

diff --git a/packages/ckeditor5-indent/tests/manual/indent-block.js b/packages/ckeditor5-indent/tests/manual/indent-block.js
@@ -30,7 +30,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		},
 		heading: {
 			options: [

diff --git a/packages/ckeditor5-link/tests/manual/linkimage.js b/packages/ckeditor5-link/tests/manual/linkimage.js
@@ -31,7 +31,14 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative', '|', 'linkImage' ]
+			toolbar: [
+				'imageStyle:inline',
+				'imageStyle:wrapText',
+				'imageStyle:breakText',
+				'toggleImageCaption',
+				'imageTextAlternative', '|',
+				'linkImage'
+			]
 		},
 		table: {
 			contentToolbar: [

diff --git a/packages/ckeditor5-markdown-gfm/tests/manual/markdown.js b/packages/ckeditor5-markdown-gfm/tests/manual/markdown.js
@@ -45,7 +45,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [ 'tableColumn', 'tableRow', 'mergeTableCells', 'tableProperties', 'tableCellProperties' ],

diff --git a/packages/ckeditor5-mention/tests/manual/mention-asynchronous.js b/packages/ckeditor5-mention/tests/manual/mention-asynchronous.js
@@ -25,7 +25,7 @@ ClassicEditor
 			'|', 'undo', 'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [ 'tableColumn', 'tableRow', 'mergeTableCells' ],

diff --git a/packages/ckeditor5-mention/tests/manual/mention.js b/packages/ckeditor5-mention/tests/manual/mention.js
@@ -147,7 +147,7 @@ ClassicEditor
 			'|', 'undo', 'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [ 'tableColumn', 'tableRow', 'mergeTableCells' ],

diff --git a/packages/ckeditor5-page-break/tests/manual/pagebreak.js b/packages/ckeditor5-page-break/tests/manual/pagebreak.js
@@ -29,15 +29,10 @@ ClassicEditor
 			'pageBreak'
 		],
 		image: {
-			styles: [
-				'full',
-				'alignLeft',
-				'alignRight'
-			],
 			toolbar: [
-				'imageStyle:alignLeft',
-				'imageStyle:full',
-				'imageStyle:alignRight',
+				'imageStyle:inline',
+				'imageStyle:wrapText',
+				'imageStyle:breakText',
 				'|',
 				'imageTextAlternative'
 			]

diff --git a/packages/ckeditor5-restricted-editing/tests/manual/restrictedediting.js b/packages/ckeditor5-restricted-editing/tests/manual/restrictedediting.js
@@ -42,7 +42,7 @@ async function startStandardEditingMode() {
 			'restrictedEditingException', '|', 'undo', 'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [

diff --git a/packages/ckeditor5-special-characters/tests/manual/specialcharacters.js b/packages/ckeditor5-special-characters/tests/manual/specialcharacters.js
@@ -39,16 +39,12 @@ ClassicEditor
 			'specialCharacters'
 		],
 		image: {
-			styles: [
-				'full',
-				'alignLeft',
-				'alignRight'
-			],
 			toolbar: [
-				'imageStyle:alignLeft',
-				'imageStyle:full',
-				'imageStyle:alignRight',
+				'imageStyle:inline',
+				'imageStyle:wrapText',
+				'imageStyle:breakText',
 				'|',
+				'toggleImageCaption',
 				'imageTextAlternative'
 			]
 		},