8
0
Просмотр исходного кода

Merge pull request #1594 from ckeditor/t/1592

Tests: Fixed broken manual tests. Closes #1592.
Aleksander Nowodzinski 7 лет назад
Родитель
Сommit
dc03131bb5

+ 1 - 1
packages/ckeditor5-engine/tests/manual/highlight.js

@@ -48,7 +48,7 @@ class FancyWidget extends Plugin {
 			model: 'fancywidget',
 			model: 'fancywidget',
 			view: ( modelItem, viewWriter ) => {
 			view: ( modelItem, viewWriter ) => {
 				const widgetElement = viewWriter.createContainerElement( 'figure', { class: 'fancy-widget' } );
 				const widgetElement = viewWriter.createContainerElement( 'figure', { class: 'fancy-widget' } );
-				viewWriter.insert( viewWriter.createPositionAt( widgetElement ), viewWriter.createText( 'widget' ) );
+				viewWriter.insert( viewWriter.createPositionAt( widgetElement, 0 ), viewWriter.createText( 'widget' ) );
 
 
 				return toWidget( widgetElement, viewWriter );
 				return toWidget( widgetElement, viewWriter );
 			}
 			}

+ 0 - 3
packages/ckeditor5-engine/tests/manual/markers.md

@@ -1,6 +1,3 @@
-@bender-ui: collapsed
-@bender-tags: ticket, 643, iteration5
-
 ### Markers integration [#643](https://github.com/ckeditor/ckeditor5-engine/issues/643)
 ### Markers integration [#643](https://github.com/ckeditor/ckeditor5-engine/issues/643)
 
 
 1. Write before, after and inside marked text.
 1. Write before, after and inside marked text.

+ 1 - 1
packages/ckeditor5-engine/tests/manual/selection.html

@@ -45,4 +45,4 @@
 	<p>baz</p>
 	<p>baz</p>
 </div>
 </div>
 <h2>Model contents:</h2>
 <h2>Model contents:</h2>
-<div id="model"></div>
+<pre id="model"></pre>

+ 2 - 0
packages/ckeditor5-engine/tests/manual/tickets/462/1.md

@@ -1,5 +1,7 @@
 ### Selection attributes conversion test [#462](https://github.com/ckeditor/ckeditor5-engine/issues/462)
 ### Selection attributes conversion test [#462](https://github.com/ckeditor/ckeditor5-engine/issues/462)
 
 
+Open the console. Watch the logged data.
+
 #### Test 1
 #### Test 1
 
 
 1. Put caret inside unstyled word.
 1. Put caret inside unstyled word.

+ 1 - 1
packages/ckeditor5-engine/tests/manual/tickets/ckeditor5-721/1.js

@@ -47,7 +47,7 @@ ClassicEditor
 					const b = writer.createAttributeElement( 'b' );
 					const b = writer.createAttributeElement( 'b' );
 					const div = writer.createContainerElement( 'div' );
 					const div = writer.createContainerElement( 'div' );
 
 
-					writer.insert( ViewPosition._createAt( div ), b );
+					writer.insert( ViewPosition._createAt( div, 0 ), b );
 
 
 					return toWidget( div, writer, { label: 'element label' } );
 					return toWidget( div, writer, { label: 'element label' } );
 				}
 				}

+ 2 - 2
packages/ckeditor5-engine/tests/view/manual/focus.js

@@ -28,8 +28,8 @@ view.change( writer => {
 	text1 = writer.createText( 'Foo bar baz' );
 	text1 = writer.createText( 'Foo bar baz' );
 	text2 = writer.createText( 'Foo bar baz' );
 	text2 = writer.createText( 'Foo bar baz' );
 
 
-	writer.insert( ViewPosition._createAt( editable1 ), text1 );
-	writer.insert( ViewPosition._createAt( editable2 ), text2 );
+	writer.insert( ViewPosition._createAt( editable1, 0 ), text1 );
+	writer.insert( ViewPosition._createAt( editable2, 0 ), text2 );
 } );
 } );
 
 
 document.getElementById( 'button1' ).addEventListener( 'click', () => {
 document.getElementById( 'button1' ).addEventListener( 'click', () => {

+ 3 - 3
packages/ckeditor5-engine/tests/view/manual/focusobserver.js

@@ -30,10 +30,10 @@ viewDocument.on( 'selectionChange', ( evt, data ) => {
 } );
 } );
 
 
 view.change( writer => {
 view.change( writer => {
-	writer.insert( writer.createPositionAt( editable1 ), writer.createText( 'First editable.' ) );
-	writer.insert( writer.createPositionAt( editable2 ), writer.createText( 'Second editable.' ) );
+	writer.insert( writer.createPositionAt( editable1, 0 ), writer.createText( 'First editable.' ) );
+	writer.insert( writer.createPositionAt( editable2, 0 ), writer.createText( 'Second editable.' ) );
 
 
-	writer.setSelection( editable1 );
+	writer.setSelection( editable1, 'end' );
 } );
 } );
 
 
 editable1.on( 'change:isFocused', () => {
 editable1.on( 'change:isFocused', () => {

+ 1 - 1
packages/ckeditor5-engine/tests/view/manual/keyobserver.js

@@ -19,7 +19,7 @@ view.attachDomRoot( document.getElementById( 'editable' ), 'editable' );
 
 
 view.change( writer => {
 view.change( writer => {
 	const text = writer.createText( 'foobar' );
 	const text = writer.createText( 'foobar' );
-	writer.insert( writer.createPositionAt( viewRoot ), text );
+	writer.insert( writer.createPositionAt( viewRoot, 0 ), text );
 	writer.setSelection( text, 3 );
 	writer.setSelection( text, 3 );
 } );
 } );
 
 

+ 0 - 1
packages/ckeditor5-engine/tests/view/manual/noselection-iframe.html

@@ -1,2 +1 @@
-<div contenteditable="true" id="editor"></div>
 <iframe id="iframe" src="immutable.html"></iframe>
 <iframe id="iframe" src="immutable.html"></iframe>

+ 13 - 7
packages/ckeditor5-engine/tests/view/manual/noselection-iframe.js

@@ -9,12 +9,18 @@ import View from '../../../src/view/view';
 import { setData } from '../../../src/dev-utils/view';
 import { setData } from '../../../src/dev-utils/view';
 import createViewRoot from '../_utils/createroot';
 import createViewRoot from '../_utils/createroot';
 
 
-const view = new View();
-const viewDocument = view.document;
-createViewRoot( viewDocument );
 const iframe = document.getElementById( 'iframe' );
 const iframe = document.getElementById( 'iframe' );
-view.attachDomRoot( iframe.contentWindow.document.getElementById( 'editor' ) );
+iframe.srcdoc = '<div contenteditable="true" id="editor"></div>';
 
 
-setData( view,
-	'<container:p>foo</container:p>' +
-	'<container:p>bar</container:p>' );
+iframe.addEventListener( 'load', () => {
+	const view = new View();
+	const viewDocument = view.document;
+	createViewRoot( viewDocument );
+
+	view.attachDomRoot( iframe.contentWindow.document.getElementById( 'editor' ) );
+
+	setData( view,
+		'<container:p>foo</container:p>' +
+		'<container:p>bar</container:p>'
+	);
+} );

+ 3 - 0
packages/ckeditor5-engine/tests/view/manual/uielement.md

@@ -5,3 +5,6 @@
 1. When paragraph is split or new paragraph is created - new UIElement should be created too.
 1. When paragraph is split or new paragraph is created - new UIElement should be created too.
 1. You should not be able to place selection inside ui element or type in it.
 1. You should not be able to place selection inside ui element or type in it.
 1. Arrow keys should work correctly around ui element.
 1. Arrow keys should work correctly around ui element.
+
+Note: You can't put a selection after `X` (UIElement). 
+See a comment in issue [#1592](https://github.com/ckeditor/ckeditor5-engine/issues/1592#issuecomment-440638618).