From ae2c6cfbac555a69a958ec8005bf2d2e8d5e9d8b Mon Sep 17 00:00:00 2001
From: Mgsy <kacpertomporowski@gmail.com>
Date: Mon, 6 Aug 2018 16:33:10 +0200
Subject: [PATCH 1/5] Added: Test cases with a range inside a block.

---
 tests/model/operation/transform/attribute.js | 56 ++++++++++++
 tests/model/operation/transform/marker.js    | 90 ++++++++++++++++++++
 tests/model/operation/transform/move.js      | 71 +++++++++++++++
 tests/model/operation/transform/remove.js    | 86 ++++++++++++++++++-
 tests/model/operation/transform/rename.js    | 64 ++++++++++++--
 5 files changed, 360 insertions(+), 7 deletions(-)

diff --git a/tests/model/operation/transform/attribute.js b/tests/model/operation/transform/attribute.js
index 6a5d0f775..874d33b1f 100644
--- a/tests/model/operation/transform/attribute.js
+++ b/tests/model/operation/transform/attribute.js
@@ -376,6 +376,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text into div in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+				john.setAttribute( 'bold', true );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><$text bold="true">Foo</$text></paragraph>' +
+					'<paragraph><div>Bar</div></paragraph>'
+				);
+			} );
+
 			it( 'element into blockQuote in same path #1', () => {
 				john.setData( '<paragraph>[Foo]</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
@@ -407,6 +422,18 @@ describe( 'transform', () => {
 					'</blockQuote>'
 				);
 			} );
+
+			it( 'text into div in same path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.setAttribute( 'bold', true );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients( '<paragraph><div><$text bold="true">Foo</$text></div></paragraph>' );
+			} );
 		} );
 
 		describe( 'by unwrap', () => {
@@ -440,6 +467,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><blockQuote><paragraph>Bar</paragraph></blockQuote>' );
+				kate.setData( '<paragraph>Foo</paragraph><blockQuote><paragraph>[Bar]</paragraph></blockQuote>' );
+
+				john.setAttribute( 'bold', true );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><$text bold="true">Foo</$text></paragraph>' +
+					'<blockQuote>Bar</blockQuote>'
+				);
+			} );
+
 			it( 'element in same path #1', () => {
 				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -465,6 +507,20 @@ describe( 'transform', () => {
 
 				expectClients( '<paragraph bold="true">Foo</paragraph>' );
 			} );
+
+			it( 'text in same path', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.setAttribute( 'bold', true );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote><$text bold="true">Foo</$text></blockQuote>'
+				);
+			} );
 		} );
 
 		describe( 'by split', () => {
diff --git a/tests/model/operation/transform/marker.js b/tests/model/operation/transform/marker.js
index 07b4a2f2b..5fb5565d4 100644
--- a/tests/model/operation/transform/marker.js
+++ b/tests/model/operation/transform/marker.js
@@ -488,6 +488,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+				john.setMarker( 'm1' );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>' +
+					'<paragraph><div>Bar</div></paragraph>'
+				);
+			} );
+
 			it( 'element in same path', () => {
 				john.setData( '<paragraph>[Foo]</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
@@ -504,6 +519,18 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.setMarker( 'm1' );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients( '<paragraph><div><m1:start></m1:start>Foo<m1:end></m1:end></div></paragraph>' );
+			} );
+
 			it( 'element in same path, then undo', () => {
 				john.setData( '<paragraph>[Foo]</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
@@ -523,6 +550,22 @@ describe( 'transform', () => {
 					'</blockQuote>'
 				);
 			} );
+
+			it( 'text in same path, then undo', () => {
+				john.setData( '<paragraph>[Foo]</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.setMarker( 'm1' );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				john.undo();
+
+				syncClients();
+
+				expectClients( '<paragraph><div>Foo</div></paragraph>' );
+			} );
 		} );
 
 		describe( 'by unwrap', () => {
@@ -541,6 +584,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><blockQuote><paragraph>Bar</paragraph></blockQuote>' );
+				kate.setData( '<paragraph>Foo</paragraph><blockQuote><paragraph>[Bar]</paragraph></blockQuote>' );
+
+				john.setMarker( 'm1' );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>' +
+					'<blockQuote>Bar</blockQuote>'
+				);
+			} );
+
 			it( 'element in same path', () => {
 				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -555,6 +613,20 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.setMarker( 'm1' );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote><m1:start></m1:start>Foo<m1:end></m1:end></blockQuote>'
+				);
+			} );
+
 			it( 'element in same path, then undo', () => {
 				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -572,6 +644,24 @@ describe( 'transform', () => {
 					'<paragraph>Foo</paragraph>'
 				);
 			} );
+
+			it( 'text in same path, then undo', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.setMarker( 'm1' );
+				kate.unwrap();
+
+				syncClients();
+
+				john.undo();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote>Foo</blockQuote>'
+				);
+			} );
 		} );
 
 		describe( 'by split', () => {
diff --git a/tests/model/operation/transform/move.js b/tests/model/operation/transform/move.js
index f54108ef8..700ab6074 100644
--- a/tests/model/operation/transform/move.js
+++ b/tests/model/operation/transform/move.js
@@ -192,6 +192,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>F[oo]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+				john.move( [ 0, 0 ] );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>ooF</paragraph>' +
+					'<paragraph><div>Bar</div></paragraph>'
+				);
+			} );
+
 			it( 'element in same path', () => {
 				john.setData( '<paragraph>F[oo]</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
@@ -208,6 +223,18 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path', () => {
+				john.setData( '<paragraph>F[oo]</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.move( [ 0, 0 ] );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients( '<paragraph>oo<div>F</div></paragraph>' );
+			} );
+
 			it( 'element while moving', () => {
 				john.setData( '[<paragraph>Foo</paragraph>]<paragraph>Bar</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]<paragraph>Bar</paragraph>' );
@@ -225,6 +252,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'element while moving', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
+
+				john.move( [ 1, 0 ] );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><div></div></paragraph>' +
+					'<paragraph>FooBar</paragraph>'
+				);
+			} );
+
 			it( 'intersecting wrap', () => {
 				john.setData( '<paragraph>F[oo]</paragraph><paragraph>Bar</paragraph>' );
 				kate.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
@@ -272,6 +314,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>F[oo]</paragraph><blockQuote><paragraph>Bar</paragraph></blockQuote>' );
+				kate.setData( '<paragraph>Foo</paragraph><blockQuote><paragraph>[Bar]</paragraph></blockQuote>' );
+
+				john.move( [ 0, 0 ] );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>ooF</paragraph>' +
+					'<blockQuote>Bar</blockQuote>'
+				);
+			} );
+
 			it( 'element in same path', () => {
 				john.setData( '<blockQuote><paragraph>F[oo]</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -285,6 +342,20 @@ describe( 'transform', () => {
 					'<paragraph>ooF</paragraph>'
 				);
 			} );
+
+			it( 'text in same path', () => {
+				john.setData( '<blockQuote><paragraph>F[oo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.move( [ 0, 0, 0 ] );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote>ooF</blockQuote>'
+				);
+			} );
 		} );
 
 		describe( 'by split', () => {
diff --git a/tests/model/operation/transform/remove.js b/tests/model/operation/transform/remove.js
index 92cbc090b..7cc269e6e 100644
--- a/tests/model/operation/transform/remove.js
+++ b/tests/model/operation/transform/remove.js
@@ -124,6 +124,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+				john.remove();
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph></paragraph>' +
+					'<paragraph><div>Bar</div></paragraph>'
+				);
+			} );
+
 			it( 'element in same path', () => {
 				john.setData( '<paragraph>[Foo]</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
@@ -138,6 +153,18 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path', () => {
+				john.setData( '<paragraph>[Foo] Bar</paragraph>' );
+				kate.setData( '<paragraph>[Foo Bar]</paragraph>' );
+
+				john.remove();
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients( '<paragraph><div> Bar</div></paragraph>' );
+			} );
+
 			it( 'element while removing', () => {
 				john.setData( '<paragraph>Foo</paragraph>[<paragraph>Bar</paragraph>]' );
 				kate.setData( '<paragraph>Foo</paragraph>[<paragraph>Bar</paragraph>]' );
@@ -163,8 +190,6 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				// Actual content:
-				// <paragraph>Foo</paragraph><paragraph>Bar</paragraph><blockQuote></blockQuote>
 				expectClients(
 					'<paragraph>Foo</paragraph>' +
 					'<blockQuote>' +
@@ -172,6 +197,34 @@ describe( 'transform', () => {
 					'</blockQuote>'
 				);
 			} );
+
+			it( 'text while removing', () => {
+				john.setData( '<paragraph>[Foo]</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.remove();
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients( '<paragraph></paragraph>' );
+			} );
+
+			it( 'text while removing, then undo', () => {
+				john.setData( '<paragraph>[Foo]</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.remove();
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				john.undo();
+
+				syncClients();
+
+				expectClients( '<paragraph><div>Foo</div></paragraph>' );
+			} );
 		} );
 
 		describe( 'by unwrap', () => {
@@ -190,6 +243,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><blockQuote><paragraph>Bar</paragraph></blockQuote>' );
+				kate.setData( '<paragraph>Foo</paragraph><blockQuote><paragraph>[Bar]</paragraph></blockQuote>' );
+
+				john.remove();
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<paragraph></paragraph>' +
+					'<blockQuote>Bar</blockQuote>'
+				);
+			} );
+
 			it( 'element in same path', () => {
 				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -204,6 +272,20 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.remove();
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote></blockQuote>'
+				);
+			} );
+
 			it( 'element while removing', () => {
 				john.setData( '<paragraph>Foo</paragraph><blockQuote>[<paragraph>Bar</paragraph>]</blockQuote>' );
 				kate.setData( '<paragraph>Foo</paragraph><blockQuote>[<paragraph>Bar</paragraph>]</blockQuote>' );
diff --git a/tests/model/operation/transform/rename.js b/tests/model/operation/transform/rename.js
index 0b424ad3f..f2aaa92d5 100644
--- a/tests/model/operation/transform/rename.js
+++ b/tests/model/operation/transform/rename.js
@@ -129,15 +129,15 @@ describe( 'transform', () => {
 			} );
 
 			it( 'the same element', () => {
-				john.setData( '<blockQuote>[]<paragraph>Foo Bar</paragraph></blockQuote>' );
-				kate.setData( '<blockQuote>[]<paragraph>Foo Bar</paragraph></blockQuote>' );
+				john.setData( '<blockQuote><paragraph>[]Foo Bar</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[]Foo Bar</paragraph></blockQuote>' );
 
-				john.rename( 'blockQuote2' );
-				kate.rename( 'blockQuote3' );
+				john.rename( 'heading1' );
+				kate.rename( 'heading2' );
 
 				syncClients();
 
-				expectClients( '<blockQuote2><paragraph>Foo Bar</paragraph></blockQuote2>' );
+				expectClients( '<blockQuote><heading1>Foo Bar</heading1></blockQuote>' );
 			} );
 		} );
 
@@ -218,6 +218,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>[]Foo</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+				john.rename( 'heading1' );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients(
+					'<heading1>Foo</heading1>' +
+					'<paragraph><div>Bar</div></paragraph>'
+				);
+			} );
+
 			it( 'element in same path', () => {
 				john.setData( '<paragraph>[]Foo</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
@@ -229,6 +244,18 @@ describe( 'transform', () => {
 
 				expectClients( '<blockQuote><heading1>Foo</heading1></blockQuote>' );
 			} );
+
+			it( 'text in same path', () => {
+				john.setData( '<paragraph>[]Foo</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.rename( 'heading1' );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients( '<heading1><div>Foo</div></heading1>' );
+			} );
 		} );
 
 		describe( 'by unwrap', () => {
@@ -247,6 +274,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>F[]oo</paragraph><blockQuote><paragraph>Bar</paragraph></blockQuote>' );
+				kate.setData( '<paragraph>Foo</paragraph><blockQuote><paragraph>[Bar]</paragraph></blockQuote>' );
+
+				john.rename( 'heading1' );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<heading1>Foo</heading1>' +
+					'<blockQuote>Bar</blockQuote>'
+				);
+			} );
+
 			it( 'element in same path', () => {
 				john.setData( '<blockQuote><paragraph>F[]oo</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -260,6 +302,18 @@ describe( 'transform', () => {
 					'<heading1>Foo</heading1>'
 				);
 			} );
+
+			it( 'text in same path', () => {
+				john.setData( '<blockQuote><paragraph>F[]oo</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.rename( 'heading1' );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients( '<blockQuote>Foo</blockQuote>' );
+			} );
 		} );
 
 		describe( 'by merge', () => {

From 89a5546658b81e42e4daf0c38ab69048e0b3179f Mon Sep 17 00:00:00 2001
From: Mgsy <kacpertomporowski@gmail.com>
Date: Tue, 7 Aug 2018 11:38:43 +0200
Subject: [PATCH 2/5] Added: Test cases with a range inside a block.

---
 tests/model/operation/transform/split.js  | 67 +++++++++++++++++++++++
 tests/model/operation/transform/unwrap.js | 52 +++++++++++++++++-
 tests/model/operation/transform/wrap.js   | 42 ++++++++++++++
 3 files changed, 160 insertions(+), 1 deletion(-)

diff --git a/tests/model/operation/transform/split.js b/tests/model/operation/transform/split.js
index 7f02b915c..9aa47c19e 100644
--- a/tests/model/operation/transform/split.js
+++ b/tests/model/operation/transform/split.js
@@ -52,6 +52,40 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path', () => {
+				john.setData( '<paragraph>F[]oo</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.split();
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><div>F</div></paragraph>' +
+					'<paragraph><div>oo</div></paragraph>'
+				);
+			} );
+
+			it( 'text in same path, then undo', () => {
+				john.setData( '<paragraph>F[]oo</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.split();
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				kate.undo();
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>F</paragraph>' +
+					'<paragraph>oo</paragraph>'
+				);
+			} );
+
 			it( 'multiple elements', () => {
 				john.setData( '<paragraph>F[]oo</paragraph><paragraph>Bar</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph><paragraph>Bar</paragraph>]' );
@@ -122,6 +156,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path', () => {
+				john.setData( '<blockQuote><paragraph>F[]oo</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.split();
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote>F</blockQuote>' +
+					'<blockQuote>oo</blockQuote>'
+				);
+			} );
+
 			it.skip( 'element in same position', () => {
 				john.setData( '<blockQuote><paragraph>[]Foo</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote><paragraph>[]Foo</paragraph></blockQuote>' );
@@ -152,6 +201,24 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path, then undo', () => {
+				john.setData( '<blockQuote><paragraph>F[]oo</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.split();
+				kate.unwrap();
+
+				syncClients();
+
+				john.undo();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote>Foo</blockQuote>'
+				);
+			} );
+
 			it( 'multiple elements', () => {
 				john.setData( '<blockQuote><paragraph>F[]oo</paragraph><paragraph>Bar</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph><paragraph>Bar</paragraph>]</blockQuote>' );
diff --git a/tests/model/operation/transform/unwrap.js b/tests/model/operation/transform/unwrap.js
index 0b14ddd1b..dbb1bc245 100644
--- a/tests/model/operation/transform/unwrap.js
+++ b/tests/model/operation/transform/unwrap.js
@@ -38,6 +38,28 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData(
+					'<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' +
+					'<blockQuote><paragraph>Bar</paragraph></blockQuote>'
+				);
+
+				kate.setData(
+					'<blockQuote><paragraph>Foo</paragraph></blockQuote>' +
+					'<blockQuote><paragraph>[Bar]</paragraph></blockQuote>'
+				);
+
+				john.unwrap();
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote>Foo</blockQuote>' +
+					'<blockQuote>Bar</blockQuote>'
+				);
+			} );
+
 			it( 'the same element', () => {
 				john.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -68,10 +90,38 @@ describe( 'transform', () => {
 				// Kate has a different order of nodes in graveyard after syncing.
 				expectClients( '<blockQuote><paragraph>Foo</paragraph></blockQuote>' );
 			} );
+
+			it( 'the same text', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.unwrap();
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients( '<blockQuote>Foo</blockQuote>' );
+			} );
+
+			it( 'the same text, then undo', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.unwrap();
+				kate.unwrap();
+
+				syncClients();
+
+				john.undo();
+
+				syncClients();
+
+				expectClients( '<blockQuote><paragraph>Foo</paragraph></blockQuote>' );
+			} );
 		} );
 
 		describe( 'by delete', () => {
-			it( 'text from two elements', () => {
+			it( 'text from two elements #1', () => {
 				john.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote><paragraph>Bar</paragraph>' );
 				kate.setData( '<blockQuote><paragraph>Fo[o</paragraph></blockQuote><paragraph>Ba]r</paragraph>' );
 
diff --git a/tests/model/operation/transform/wrap.js b/tests/model/operation/transform/wrap.js
index f7e125980..ef6ec22cc 100644
--- a/tests/model/operation/transform/wrap.js
+++ b/tests/model/operation/transform/wrap.js
@@ -31,6 +31,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+				john.wrap( 'div' );
+				kate.wrap( 'div2' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><div>Foo</div></paragraph>' +
+					'<paragraph><div2>Bar</div2></paragraph>'
+				);
+			} );
+
 			it( 'the same element', () => {
 				john.setData( '[<paragraph>Foo</paragraph>]' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
@@ -142,6 +157,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><blockQuote><paragraph>Bar</paragraph></blockQuote>' );
+				kate.setData( '<paragraph>Foo</paragraph><blockQuote><paragraph>[Bar]</paragraph></blockQuote>' );
+
+				john.wrap( 'div' );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><div>Foo</div></paragraph>' +
+					'<blockQuote>Bar</blockQuote>'
+				);
+			} );
+
 			it( 'the same element', () => {
 				john.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -169,6 +199,18 @@ describe( 'transform', () => {
 
 				expectClients( '<blockQuote><paragraph>Foo</paragraph></blockQuote>' );
 			} );
+
+			it( 'the same text', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.wrap( 'div' );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients( '<blockQuote><div>Foo</div></blockQuote>' );
+			} );
 		} );
 
 		describe( 'by delete', () => {

From 2fa6fd09f4107d4c5cf48cdb19f9aa668454a41e Mon Sep 17 00:00:00 2001
From: Mgsy <kacpertomporowski@gmail.com>
Date: Tue, 7 Aug 2018 12:43:04 +0200
Subject: [PATCH 3/5] Added: New scenarios and cleanup.

---
 tests/model/operation/transform/attribute.js | 426 +++++++++++++++++++
 tests/model/operation/transform/insert.js    | 143 ++++---
 tests/model/operation/transform/marker.js    |  93 ----
 tests/model/operation/transform/move.js      |  89 ----
 tests/model/operation/transform/remove.js    |  88 ----
 tests/model/operation/transform/rename.js    |  88 ----
 6 files changed, 500 insertions(+), 427 deletions(-)

diff --git a/tests/model/operation/transform/attribute.js b/tests/model/operation/transform/attribute.js
index 874d33b1f..fede8c4d6 100644
--- a/tests/model/operation/transform/attribute.js
+++ b/tests/model/operation/transform/attribute.js
@@ -232,6 +232,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text between changed nodes', () => {
+				john.setData( '<paragraph>[Foo</paragraph><paragraph>Bar]</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>B[]ar</paragraph>' );
+
+				john.setAttribute( 'bold', true );
+				kate.type( 'Abc' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><$text bold="true">Foo</$text></paragraph>' +
+					'<paragraph><$text bold="true">BAbcar</$text></paragraph>'
+				);
+			} );
+
 			it( 'element in different path', () => {
 				john.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
 				kate.setData( '<paragraph>Foo</paragraph><paragraph>Bar</paragraph>[]' );
@@ -263,6 +278,68 @@ describe( 'transform', () => {
 					'<paragraph>Abc</paragraph>'
 				);
 			} );
+
+			it( 'remove attribute from element in different path', () => {
+				john.setData( '<paragraph>[]Foo</paragraph><paragraph bold="true">Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
+
+				john.type( 'Abc' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients( '<paragraph>AbcFoo</paragraph><paragraph>Bar</paragraph>' );
+			} );
+
+			it( 'remove attribute from text in different path', () => {
+				john.setData( '<paragraph>[]Foo</paragraph><paragraph><$text bold="true">Bar</$text></paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph><$text bold="true">[Bar]</$text></paragraph>' );
+
+				john.type( 'Abc' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients( '<paragraph>AbcFoo</paragraph><paragraph>Bar</paragraph>' );
+			} );
+
+			it( 'remove attribute from text in same path', () => {
+				john.setData( '<paragraph>[]Fo<$text bold="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
+
+				john.type( 'Bar' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients( '<paragraph>BarFoo</paragraph>' );
+			} );
+
+			it( 'remove attribute from element in same path', () => {
+				john.setData( '<paragraph bold="true">[]Foo</paragraph>' );
+				kate.setData( '[<paragraph bold="true">Foo</paragraph>]' );
+
+				john.type( 'Bar' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients( '<paragraph>BarFoo</paragraph>' );
+			} );
+
+			it( 'remove attribute from text with 2 attributes in same path', () => {
+				john.setData( '<paragraph>[]Fo<$text bold="true" italic="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
+
+				john.type( 'Bar' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>BarFo<$text italic="true">o</$text></paragraph>'
+				);
+			} );
 		} );
 
 		describe( 'by move', () => {
@@ -343,6 +420,93 @@ describe( 'transform', () => {
 
 				expectClients( '<paragraph bold="true">F Baroo</paragraph>' );
 			} );
+
+			it( 'remove attribute from element in different path', () => {
+				john.setData( '<paragraph>F[oo]</paragraph><paragraph bold="true">Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
+
+				john.move( [ 1, 0 ] );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>F</paragraph>' +
+					'<paragraph>ooBar</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in different path', () => {
+				john.setData( '<paragraph>F[oo]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+				john.move( [ 1, 0 ] );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>F</paragraph>' +
+					'<paragraph>ooBar</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in same path', () => {
+				john.setData( '<paragraph>[Fo]<$text bold="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
+
+				john.move( [ 0, 3 ] );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>oFo</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from element in same path', () => {
+				john.setData( '<paragraph bold="true">[Fo]o</paragraph>' );
+				kate.setData( '[<paragraph bold="true">Foo</paragraph>]' );
+
+				john.move( [ 0, 3 ] );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>oFo</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text with 2 attributes in same path', () => {
+				john.setData( '<paragraph>[Fo]<$text bold="true" italic="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
+
+				john.move( [ 0, 3 ] );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><$text italic="true">o</$text>Fo</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in other user\'s selection', () => {
+				john.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph><paragraph></paragraph>' );
+				kate.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph><paragraph></paragraph>' );
+
+				john.move( [ 1, 0 ] );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph></paragraph>' +
+					'<paragraph>Foo</paragraph>'
+				);
+			} );
 		} );
 
 		describe( 'by wrap', () => {
@@ -660,6 +824,92 @@ describe( 'transform', () => {
 					'<paragraph><$text bold="true">F</$text></paragraph>'
 				);
 			} );
+
+			it( 'remove attribute from element in different path', () => {
+				john.setData( '<paragraph>F[oo]</paragraph><paragraph bold="true">Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
+
+				john.remove();
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>F</paragraph>' +
+					'<paragraph>Bar</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in different path', () => {
+				john.setData( '<paragraph>F[oo]</paragraph><paragraph><$text bold="true">Bar</$text></paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph><$text bold="true">[Bar]</$text></paragraph>' );
+
+				john.remove();
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>F</paragraph>' +
+					'<paragraph>Bar</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in same path', () => {
+				john.setData( '<paragraph>[Fo]<$text bold="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
+
+				john.remove();
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>o</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from element in same path', () => {
+				john.setData( '<paragraph bold="true">[Fo]o</paragraph>' );
+				kate.setData( '[<paragraph bold="true">Foo</paragraph>]' );
+
+				john.remove();
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>o</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text with 2 attributes in same path', () => {
+				john.setData( '<paragraph>[Fo]<$text bold="true" italic="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
+
+				john.remove();
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><$text italic="true">o</$text></paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in other user\'s selection', () => {
+				john.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
+				kate.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
+
+				john.remove();
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph></paragraph>'
+				);
+			} );
 		} );
 
 		describe( 'by remove attribute', () => {
@@ -836,6 +1086,96 @@ describe( 'transform', () => {
 
 				expectClients( '<paragraph><m1:start></m1:start><$text bold="true">Foo Bar</$text><m1:end></m1:end></paragraph>' );
 			} );
+
+			it( 'remove attribute from element in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><paragraph bold="true">Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
+
+				john.setMarker( 'm1' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>' +
+					'<paragraph>Bar</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in different path', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><paragraph><$text bold="true">Bar</$text></paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph><$text bold="true">[Bar]</$text></paragraph>' );
+
+				john.setMarker( 'm1' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>' +
+					'<paragraph>Bar</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in same path', () => {
+				john.setData( '<paragraph>[Fo]<$text bold="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
+
+				john.setMarker( 'm1' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end>o</paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in same path, then undo', () => {
+				john.setData( '<paragraph>[Fo]<$text bold="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
+
+				john.setMarker( 'm1' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				kate.undo();
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end><$text bold="true">o</$text></paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text with 2 attributes in same path', () => {
+				john.setData( '<paragraph>[Fo]<$text bold="true" italic="true">o</$text></paragraph>' );
+				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
+
+				john.setMarker( 'm1' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end><$text italic="true">o</$text></paragraph>'
+				);
+			} );
+
+			it( 'remove attribute from text in other user\'s selection', () => {
+				john.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
+				kate.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
+
+				john.setMarker( 'm1' );
+				kate.removeAttribute( 'bold' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>'
+				);
+			} );
 		} );
 
 		describe( 'by merge', () => {
@@ -931,5 +1271,91 @@ describe( 'transform', () => {
 				'<paragraph>Foo</paragraph>'
 			);
 		} );
+
+		it( 'remove attribute from element in different path', () => {
+			john.setData( '<paragraph>F[]oo</paragraph><paragraph bold="true">Bar</paragraph>' );
+			kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
+
+			john.rename( 'heading1' );
+			kate.removeAttribute( 'bold' );
+
+			syncClients();
+
+			expectClients(
+				'<heading1>Foo</heading1>' +
+				'<paragraph>Bar</paragraph>'
+			);
+		} );
+
+		it( 'remove attribute from text in different path', () => {
+			john.setData( '<paragraph>F[]oo</paragraph><paragraph>Bar</paragraph>' );
+			kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+			john.rename( 'heading1' );
+			kate.removeAttribute( 'bold' );
+
+			syncClients();
+
+			expectClients(
+				'<heading1>Foo</heading1>' +
+				'<paragraph>Bar</paragraph>'
+			);
+		} );
+
+		it( 'remove attribute from text in same path', () => {
+			john.setData( '<paragraph>F[]o<$text bold="true">o</$text></paragraph>' );
+			kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
+
+			john.rename( 'heading1' );
+			kate.removeAttribute( 'bold' );
+
+			syncClients();
+
+			expectClients(
+				'<heading1>Foo</heading1>'
+			);
+		} );
+
+		it( 'remove attribute from element in same path', () => {
+			john.setData( '<paragraph bold="true">F[]oo</paragraph>' );
+			kate.setData( '[<paragraph bold="true">Foo</paragraph>]' );
+
+			john.rename( 'heading1' );
+			kate.removeAttribute( 'bold' );
+
+			syncClients();
+
+			expectClients(
+				'<heading1>Foo</heading1>'
+			);
+		} );
+
+		it( 'remove attribute from text with 2 attributes in same path', () => {
+			john.setData( '<paragraph>F[o]<$text bold="true" italic="true">o</$text></paragraph>' );
+			kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
+
+			john.rename( 'heading1' );
+			kate.removeAttribute( 'bold' );
+
+			syncClients();
+
+			expectClients(
+				'<heading1>Fo<$text italic="true">o</$text></heading1>'
+			);
+		} );
+
+		it( 'remove attribute from text in other user\'s selection', () => {
+			john.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
+			kate.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
+
+			john.rename( 'heading1' );
+			kate.removeAttribute( 'bold' );
+
+			syncClients();
+
+			expectClients(
+				'<heading1>Foo</heading1>'
+			);
+		} );
 	} );
 } );
diff --git a/tests/model/operation/transform/insert.js b/tests/model/operation/transform/insert.js
index 635116e14..b3e1fb6e6 100644
--- a/tests/model/operation/transform/insert.js
+++ b/tests/model/operation/transform/insert.js
@@ -216,6 +216,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text at different paths', () => {
+				john.setData( '<paragraph>[]Foo</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>B[ar]</paragraph>' );
+
+				john.type( 'Abc' );
+				kate.move( [ 1, 0 ] );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>AbcFoo</paragraph>' +
+					'<paragraph>arB</paragraph>'
+				);
+			} );
+
 			it( 'text at same path', () => {
 				john.setData( '<paragraph>F[]oo Bar</paragraph>' );
 				kate.setData( '<paragraph>Foo B[ar]</paragraph>' );
@@ -254,7 +269,7 @@ describe( 'transform', () => {
 		} );
 
 		describe( 'by wrap', () => {
-			it( 'element in same path', () => {
+			it( 'element in same path #1', () => {
 				john.setData( '<paragraph>Foo Bar</paragraph>[]' );
 				kate.setData( '[<paragraph>Foo Bar</paragraph>]' );
 
@@ -271,7 +286,7 @@ describe( 'transform', () => {
 				);
 			} );
 
-			it( 'element in same path', () => {
+			it( 'element in same path #2', () => {
 				john.setData( '<paragraph>Foo[]</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
 
@@ -287,7 +302,19 @@ describe( 'transform', () => {
 				);
 			} );
 
-			it( 'element in different paths', () => {
+			it( 'text in same path', () => {
+				john.setData( '<paragraph>Foo[]</paragraph>' );
+				kate.setData( '<paragraph>[Foo]</paragraph>' );
+
+				john.type( 'Bar' );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients( '<paragraph><div>Foo</div>Bar</paragraph>' );
+			} );
+
+			it( 'element in different paths #1', () => {
 				john.setData( '<paragraph>Foo</paragraph>[]<paragraph>Bar</paragraph>' );
 				kate.setData( '<paragraph>Foo</paragraph>[<paragraph>Bar</paragraph>]' );
 
@@ -305,7 +332,7 @@ describe( 'transform', () => {
 				);
 			} );
 
-			it( 'element in different paths', () => {
+			it( 'element in different paths #2', () => {
 				john.setData( '<paragraph>Foo</paragraph><paragraph>Bar[]</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]<paragraph>Bar</paragraph>' );
 
@@ -322,6 +349,21 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different paths', () => {
+				john.setData( '<paragraph>Foo[]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
+
+				john.type( 'Abc' );
+				kate.wrap( 'div' );
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>FooAbc</paragraph>' +
+					'<paragraph><div>Bar</div></paragraph>'
+				);
+			} );
+
 			it( 'element, then unwrap and split', () => {
 				john.setData( '<paragraph>Foo[]</paragraph>' );
 				kate.setData( '[<paragraph>Foo</paragraph>]' );
@@ -449,6 +491,20 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in different path', () => {
+				john.setData( '<paragraph>Foo[]</paragraph><blockQuote><paragraph>Bar</paragraph></blockQuote>' );
+				kate.setData( '<paragraph>Foo</paragraph><blockQuote><paragraph>[Bar]</paragraph></blockQuote>' );
+
+				john.type( 'Abc' );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<paragraph>FooAbc</paragraph><blockQuote>Bar</blockQuote>'
+				);
+			} );
+
 			it( 'element in same path #1', () => {
 				john.setData( '<blockQuote><paragraph>Foo[]</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[<paragraph>Foo</paragraph>]</blockQuote>' );
@@ -478,6 +534,20 @@ describe( 'transform', () => {
 				);
 			} );
 
+			it( 'text in same path', () => {
+				john.setData( '<blockQuote><paragraph>Foo[]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.type( ' Bar' );
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients(
+					'<blockQuote>Foo Bar</blockQuote>'
+				);
+			} );
+
 			it( 'element, then insert text and move', () => {
 				john.setData( '<blockQuote>[]<paragraph>Foo</paragraph></blockQuote>' );
 				kate.setData( '<blockQuote>[]<paragraph>Foo</paragraph></blockQuote>' );
@@ -914,71 +984,6 @@ describe( 'transform', () => {
 			} );
 		} );
 
-		// This should be moved to attribute.js.
-		describe( 'by remove attribute', () => {
-			it( 'from element in different path', () => {
-				john.setData( '<paragraph>[]Foo</paragraph><paragraph bold="true">Bar</paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
-
-				john.type( 'Abc' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients( '<paragraph>AbcFoo</paragraph><paragraph>Bar</paragraph>' );
-			} );
-
-			it( 'from text in different path', () => {
-				john.setData( '<paragraph>[]Foo</paragraph><paragraph><$text bold="true">Bar</$text></paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph><paragraph><$text bold="true">[Bar]</$text></paragraph>' );
-
-				john.type( 'Abc' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients( '<paragraph>AbcFoo</paragraph><paragraph>Bar</paragraph>' );
-			} );
-
-			it( 'from text in same path', () => {
-				john.setData( '<paragraph>[]Fo<$text bold="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
-
-				john.type( 'Bar' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients( '<paragraph>BarFoo</paragraph>' );
-			} );
-
-			it( 'from element in same path', () => {
-				john.setData( '<paragraph bold="true">[]Foo</paragraph>' );
-				kate.setData( '[<paragraph bold="true">Foo</paragraph>]' );
-
-				john.type( 'Bar' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients( '<paragraph>BarFoo</paragraph>' );
-			} );
-
-			it( 'from text with 2 attributes in same path', () => {
-				john.setData( '<paragraph>[]Fo<$text bold="true" italic="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
-
-				john.type( 'Bar' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>BarFo<$text italic="true">o</$text></paragraph>'
-				);
-			} );
-		} );
-
 		describe( 'by rename', () => {
 			it( 'element in different path', () => {
 				john.setData( '<paragraph>Foo</paragraph><paragraph>Bar</paragraph>[]' );
diff --git a/tests/model/operation/transform/marker.js b/tests/model/operation/transform/marker.js
index 5fb5565d4..bd1b550ad 100644
--- a/tests/model/operation/transform/marker.js
+++ b/tests/model/operation/transform/marker.js
@@ -736,99 +736,6 @@ describe( 'transform', () => {
 			} );
 		} );
 
-		// Should be in attribute.js.
-		describe( 'by remove attribute', () => {
-			it( 'from element in different path', () => {
-				john.setData( '<paragraph>[Foo]</paragraph><paragraph bold="true">Bar</paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
-
-				john.setMarker( 'm1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>' +
-					'<paragraph>Bar</paragraph>'
-				);
-			} );
-
-			it( 'from text in different path', () => {
-				john.setData( '<paragraph>[Foo]</paragraph><paragraph><$text bold="true">Bar</$text></paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph><paragraph><$text bold="true">[Bar]</$text></paragraph>' );
-
-				john.setMarker( 'm1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>' +
-					'<paragraph>Bar</paragraph>'
-				);
-			} );
-
-			it( 'from text in same path', () => {
-				john.setData( '<paragraph>[Fo]<$text bold="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
-
-				john.setMarker( 'm1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end>o</paragraph>'
-				);
-			} );
-
-			it( 'from text in same path, then undo', () => {
-				john.setData( '<paragraph>[Fo]<$text bold="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
-
-				john.setMarker( 'm1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				kate.undo();
-
-				syncClients();
-
-				expectClients(
-					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end><$text bold="true">o</$text></paragraph>'
-				);
-			} );
-
-			it( 'from text with 2 attributes in same path', () => {
-				john.setData( '<paragraph>[Fo]<$text bold="true" italic="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
-
-				john.setMarker( 'm1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end><$text italic="true">o</$text></paragraph>'
-				);
-			} );
-
-			it( 'from text in other user\'s selection', () => {
-				john.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
-				kate.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
-
-				john.setMarker( 'm1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>'
-				);
-			} );
-		} );
-
 		describe( 'by merge', () => {
 			it( 'element into paragraph', () => {
 				john.setData( '<paragraph>[Foo]</paragraph><paragraph> Bar</paragraph>' );
diff --git a/tests/model/operation/transform/move.js b/tests/model/operation/transform/move.js
index 700ab6074..1978ac1ff 100644
--- a/tests/model/operation/transform/move.js
+++ b/tests/model/operation/transform/move.js
@@ -671,95 +671,6 @@ describe( 'transform', () => {
 			} );
 		} );
 
-		describe( 'by remove attribute', () => {
-			it( 'from element in different path', () => {
-				john.setData( '<paragraph>F[oo]</paragraph><paragraph bold="true">Bar</paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
-
-				john.move( [ 1, 0 ] );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>F</paragraph>' +
-					'<paragraph>ooBar</paragraph>'
-				);
-			} );
-
-			it( 'from text in different path', () => {
-				john.setData( '<paragraph>F[oo]</paragraph><paragraph>Bar</paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
-
-				john.move( [ 1, 0 ] );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>F</paragraph>' +
-					'<paragraph>ooBar</paragraph>'
-				);
-			} );
-
-			it( 'from text in same path', () => {
-				john.setData( '<paragraph>[Fo]<$text bold="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
-
-				john.move( [ 0, 3 ] );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>oFo</paragraph>'
-				);
-			} );
-
-			it( 'from element in same path', () => {
-				john.setData( '<paragraph bold="true">[Fo]o</paragraph>' );
-				kate.setData( '[<paragraph bold="true">Foo</paragraph>]' );
-
-				john.move( [ 0, 3 ] );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>oFo</paragraph>'
-				);
-			} );
-
-			it( 'from text with 2 attributes in same path', () => {
-				john.setData( '<paragraph>[Fo]<$text bold="true" italic="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
-
-				john.move( [ 0, 3 ] );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph><$text italic="true">o</$text>Fo</paragraph>'
-				);
-			} );
-
-			it( 'from text in other user\'s selection', () => {
-				john.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph><paragraph></paragraph>' );
-				kate.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph><paragraph></paragraph>' );
-
-				john.move( [ 1, 0 ] );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph></paragraph>' +
-					'<paragraph>Foo</paragraph>'
-				);
-			} );
-		} );
-
 		describe( 'by rename', () => {
 			it( 'element in different path #1', () => {
 				john.setData( '<paragraph>Foo</paragraph><paragraph>B[ar]</paragraph>' );
diff --git a/tests/model/operation/transform/remove.js b/tests/model/operation/transform/remove.js
index 7cc269e6e..96cfa300f 100644
--- a/tests/model/operation/transform/remove.js
+++ b/tests/model/operation/transform/remove.js
@@ -408,94 +408,6 @@ describe( 'transform', () => {
 			} );
 		} );
 
-		describe( 'by remove attribute', () => {
-			it( 'from element in different path', () => {
-				john.setData( '<paragraph>F[oo]</paragraph><paragraph bold="true">Bar</paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
-
-				john.remove();
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>F</paragraph>' +
-					'<paragraph>Bar</paragraph>'
-				);
-			} );
-
-			it( 'from text in different path', () => {
-				john.setData( '<paragraph>F[oo]</paragraph><paragraph><$text bold="true">Bar</$text></paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph><paragraph><$text bold="true">[Bar]</$text></paragraph>' );
-
-				john.remove();
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>F</paragraph>' +
-					'<paragraph>Bar</paragraph>'
-				);
-			} );
-
-			it( 'from text in same path', () => {
-				john.setData( '<paragraph>[Fo]<$text bold="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
-
-				john.remove();
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>o</paragraph>'
-				);
-			} );
-
-			it( 'from element in same path', () => {
-				john.setData( '<paragraph bold="true">[Fo]o</paragraph>' );
-				kate.setData( '[<paragraph bold="true">Foo</paragraph>]' );
-
-				john.remove();
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph>o</paragraph>'
-				);
-			} );
-
-			it( 'from text with 2 attributes in same path', () => {
-				john.setData( '<paragraph>[Fo]<$text bold="true" italic="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
-
-				john.remove();
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph><$text italic="true">o</$text></paragraph>'
-				);
-			} );
-
-			it( 'from text in other user\'s selection', () => {
-				john.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
-				kate.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
-
-				john.remove();
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<paragraph></paragraph>'
-				);
-			} );
-		} );
-
 		describe( 'by merge', () => {
 			it( 'element into paragraph #1', () => {
 				john.setData( '<paragraph>F[oo]</paragraph><paragraph>Bar</paragraph>' );
diff --git a/tests/model/operation/transform/rename.js b/tests/model/operation/transform/rename.js
index f2aaa92d5..ec60a680c 100644
--- a/tests/model/operation/transform/rename.js
+++ b/tests/model/operation/transform/rename.js
@@ -15,94 +15,6 @@ describe( 'transform', () => {
 	} );
 
 	describe( 'rename', () => {
-		describe( 'by remove attribute', () => {
-			it( 'from element in different path', () => {
-				john.setData( '<paragraph>F[]oo</paragraph><paragraph bold="true">Bar</paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph>[<paragraph bold="true">Bar</paragraph>]' );
-
-				john.rename( 'heading1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<heading1>Foo</heading1>' +
-					'<paragraph>Bar</paragraph>'
-				);
-			} );
-
-			it( 'from text in different path', () => {
-				john.setData( '<paragraph>F[]oo</paragraph><paragraph>Bar</paragraph>' );
-				kate.setData( '<paragraph>Foo</paragraph><paragraph>[Bar]</paragraph>' );
-
-				john.rename( 'heading1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<heading1>Foo</heading1>' +
-					'<paragraph>Bar</paragraph>'
-				);
-			} );
-
-			it( 'from text in same path', () => {
-				john.setData( '<paragraph>F[]o<$text bold="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true">[o]</$text></paragraph>' );
-
-				john.rename( 'heading1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<heading1>Foo</heading1>'
-				);
-			} );
-
-			it( 'from element in same path', () => {
-				john.setData( '<paragraph bold="true">F[]oo</paragraph>' );
-				kate.setData( '[<paragraph bold="true">Foo</paragraph>]' );
-
-				john.rename( 'heading1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<heading1>Foo</heading1>'
-				);
-			} );
-
-			it( 'from text with 2 attributes in same path', () => {
-				john.setData( '<paragraph>F[o]<$text bold="true" italic="true">o</$text></paragraph>' );
-				kate.setData( '<paragraph>Fo<$text bold="true" italic="true">[o]</$text></paragraph>' );
-
-				john.rename( 'heading1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<heading1>Fo<$text italic="true">o</$text></heading1>'
-				);
-			} );
-
-			it( 'from text in other user\'s selection', () => {
-				john.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
-				kate.setData( '<paragraph><$text bold="true">[Foo]</$text></paragraph>' );
-
-				john.rename( 'heading1' );
-				kate.removeAttribute( 'bold' );
-
-				syncClients();
-
-				expectClients(
-					'<heading1>Foo</heading1>'
-				);
-			} );
-		} );
-
 		describe( 'by rename', () => {
 			it( 'elements in different paths #1', () => {
 				john.setData( '<paragraph>[]Foo</paragraph><paragraph>Bar</paragraph>' );

From c68cb116005c91aa899c3e4e877901b37e1e4a2c Mon Sep 17 00:00:00 2001
From: Mgsy <kacpertomporowski@gmail.com>
Date: Tue, 7 Aug 2018 16:30:04 +0200
Subject: [PATCH 4/5] Code style.

---
 tests/model/operation/transform/attribute.js | 104 +++++--------------
 tests/model/operation/transform/insert.js    |  36 ++-----
 tests/model/operation/transform/marker.js    |  64 ++++--------
 tests/model/operation/transform/move.js      |  36 ++-----
 tests/model/operation/transform/remove.js    |  64 +++---------
 tests/model/operation/transform/rename.js    |  20 +---
 tests/model/operation/transform/split.js     |  12 +--
 7 files changed, 86 insertions(+), 250 deletions(-)

diff --git a/tests/model/operation/transform/attribute.js b/tests/model/operation/transform/attribute.js
index fede8c4d6..faf8999c3 100644
--- a/tests/model/operation/transform/attribute.js
+++ b/tests/model/operation/transform/attribute.js
@@ -336,9 +336,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>BarFo<$text italic="true">o</$text></paragraph>'
-				);
+				expectClients( '<paragraph>BarFo<$text italic="true">o</$text></paragraph>' );
 			} );
 		} );
 
@@ -460,9 +458,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>oFo</paragraph>'
-				);
+				expectClients( '<paragraph>oFo</paragraph>' );
 			} );
 
 			it( 'remove attribute from element in same path', () => {
@@ -474,9 +470,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>oFo</paragraph>'
-				);
+				expectClients( '<paragraph>oFo</paragraph>' );
 			} );
 
 			it( 'remove attribute from text with 2 attributes in same path', () => {
@@ -488,9 +482,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><$text italic="true">o</$text>Fo</paragraph>'
-				);
+				expectClients( '<paragraph><$text italic="true">o</$text>Fo</paragraph>' );
 			} );
 
 			it( 'remove attribute from text in other user\'s selection', () => {
@@ -655,9 +647,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><$text bold="true">Foo</$text></paragraph>'
-				);
+				expectClients( '<paragraph><$text bold="true">Foo</$text></paragraph>' );
 			} );
 
 			it( 'element in same path #2', () => {
@@ -681,9 +671,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><$text bold="true">Foo</$text></blockQuote>'
-				);
+				expectClients( '<blockQuote><$text bold="true">Foo</$text></blockQuote>' );
 			} );
 		} );
 
@@ -806,9 +794,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><$text bold="true">Fo</$text></paragraph>'
-				);
+				expectClients( '<paragraph><$text bold="true">Fo</$text></paragraph>' );
 			} );
 
 			it( 'text in other user\'s selection', () => {
@@ -820,9 +806,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><$text bold="true">F</$text></paragraph>'
-				);
+				expectClients( '<paragraph><$text bold="true">F</$text></paragraph>' );
 			} );
 
 			it( 'remove attribute from element in different path', () => {
@@ -864,9 +848,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>o</paragraph>'
-				);
+				expectClients( '<paragraph>o</paragraph>' );
 			} );
 
 			it( 'remove attribute from element in same path', () => {
@@ -878,9 +860,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>o</paragraph>'
-				);
+				expectClients( '<paragraph>o</paragraph>' );
 			} );
 
 			it( 'remove attribute from text with 2 attributes in same path', () => {
@@ -892,9 +872,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><$text italic="true">o</$text></paragraph>'
-				);
+				expectClients( '<paragraph><$text italic="true">o</$text></paragraph>' );
 			} );
 
 			it( 'remove attribute from text in other user\'s selection', () => {
@@ -906,9 +884,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 		} );
 
@@ -952,9 +928,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><$text bold="true">Fo</$text>o</paragraph>'
-				);
+				expectClients( '<paragraph><$text bold="true">Fo</$text>o</paragraph>' );
 			} );
 
 			it( 'from element in same path', () => {
@@ -978,9 +952,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><$text bold="true">Fo</$text><$text italic="true">o</$text></paragraph>'
-				);
+				expectClients( '<paragraph><$text bold="true">Fo</$text><$text italic="true">o</$text></paragraph>' );
 			} );
 
 			it( 'from text in other user\'s selection', () => {
@@ -992,9 +964,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><$text italic="true">Foo</$text></paragraph>'
-				);
+				expectClients( '<paragraph><$text italic="true">Foo</$text></paragraph>' );
 			} );
 		} );
 
@@ -1126,9 +1096,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end>o</paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>Fo<m1:end></m1:end>o</paragraph>' );
 			} );
 
 			it( 'remove attribute from text in same path, then undo', () => {
@@ -1144,9 +1112,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end><$text bold="true">o</$text></paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>Fo<m1:end></m1:end><$text bold="true">o</$text></paragraph>' );
 			} );
 
 			it( 'remove attribute from text with 2 attributes in same path', () => {
@@ -1158,9 +1124,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>Fo<m1:end></m1:end><$text italic="true">o</$text></paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>Fo<m1:end></m1:end><$text italic="true">o</$text></paragraph>' );
 			} );
 
 			it( 'remove attribute from text in other user\'s selection', () => {
@@ -1172,9 +1136,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>' );
 			} );
 		} );
 
@@ -1234,9 +1196,7 @@ describe( 'transform', () => {
 
 			syncClients();
 
-			expectClients(
-				'<heading1><$text bold="true">Foo Bar</$text></heading1>'
-			);
+			expectClients( '<heading1><$text bold="true">Foo Bar</$text></heading1>' );
 		} );
 
 		it( 'element in user\'s selection', () => {
@@ -1248,9 +1208,7 @@ describe( 'transform', () => {
 
 			syncClients();
 
-			expectClients(
-				'<heading1><$text bold="true">Foo</$text></heading1>'
-			);
+			expectClients( '<heading1><$text bold="true">Foo</$text></heading1>' );
 		} );
 
 		it( 'element in user\'s selection, then undo', () => {
@@ -1267,9 +1225,7 @@ describe( 'transform', () => {
 
 			syncClients();
 
-			expectClients(
-				'<paragraph>Foo</paragraph>'
-			);
+			expectClients( '<paragraph>Foo</paragraph>' );
 		} );
 
 		it( 'remove attribute from element in different path', () => {
@@ -1311,9 +1267,7 @@ describe( 'transform', () => {
 
 			syncClients();
 
-			expectClients(
-				'<heading1>Foo</heading1>'
-			);
+			expectClients( '<heading1>Foo</heading1>' );
 		} );
 
 		it( 'remove attribute from element in same path', () => {
@@ -1325,9 +1279,7 @@ describe( 'transform', () => {
 
 			syncClients();
 
-			expectClients(
-				'<heading1>Foo</heading1>'
-			);
+			expectClients( '<heading1>Foo</heading1>' );
 		} );
 
 		it( 'remove attribute from text with 2 attributes in same path', () => {
@@ -1339,9 +1291,7 @@ describe( 'transform', () => {
 
 			syncClients();
 
-			expectClients(
-				'<heading1>Fo<$text italic="true">o</$text></heading1>'
-			);
+			expectClients( '<heading1>Fo<$text italic="true">o</$text></heading1>' );
 		} );
 
 		it( 'remove attribute from text in other user\'s selection', () => {
@@ -1353,9 +1303,7 @@ describe( 'transform', () => {
 
 			syncClients();
 
-			expectClients(
-				'<heading1>Foo</heading1>'
-			);
+			expectClients( '<heading1>Foo</heading1>' );
 		} );
 	} );
 } );
diff --git a/tests/model/operation/transform/insert.js b/tests/model/operation/transform/insert.js
index b3e1fb6e6..1969314f8 100644
--- a/tests/model/operation/transform/insert.js
+++ b/tests/model/operation/transform/insert.js
@@ -175,9 +175,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 		} );
 
@@ -486,9 +484,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>FooAbc</paragraph><paragraph>Bar</paragraph>'
-				);
+				expectClients( '<paragraph>FooAbc</paragraph><paragraph>Bar</paragraph>' );
 			} );
 
 			it( 'text in different path', () => {
@@ -500,9 +496,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>FooAbc</paragraph><blockQuote>Bar</blockQuote>'
-				);
+				expectClients( '<paragraph>FooAbc</paragraph><blockQuote>Bar</blockQuote>' );
 			} );
 
 			it( 'element in same path #1', () => {
@@ -514,9 +508,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo Bar</paragraph>'
-				);
+				expectClients( '<paragraph>Foo Bar</paragraph>' );
 			} );
 
 			it( 'element in same path #2', () => {
@@ -543,9 +535,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote>Foo Bar</blockQuote>'
-				);
+				expectClients( '<blockQuote>Foo Bar</blockQuote>' );
 			} );
 
 			it( 'element, then insert text and move', () => {
@@ -770,9 +760,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>FooAbc</paragraph><paragraph></paragraph>'
-				);
+				expectClients( '<paragraph>FooAbc</paragraph><paragraph></paragraph>' );
 			} );
 
 			it( 'text in same path', () => {
@@ -784,9 +772,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Bar</paragraph>'
-				);
+				expectClients( '<paragraph>Bar</paragraph>' );
 			} );
 
 			it( 'element in different path', () => {
@@ -931,9 +917,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo Bar</paragraph>'
-				);
+				expectClients( '<paragraph>Foo Bar</paragraph>' );
 			} );
 		} );
 
@@ -978,9 +962,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>BarFo<m1:start></m1:start>o<m1:end></m1:end></paragraph>'
-				);
+				expectClients( '<paragraph>BarFo<m1:start></m1:start>o<m1:end></m1:end></paragraph>' );
 			} );
 		} );
 
diff --git a/tests/model/operation/transform/marker.js b/tests/model/operation/transform/marker.js
index bd1b550ad..47f40e0f2 100644
--- a/tests/model/operation/transform/marker.js
+++ b/tests/model/operation/transform/marker.js
@@ -159,9 +159,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 
 			it.skip( 'then remove text and undo', () => {
@@ -210,7 +208,9 @@ describe( 'transform', () => {
 				syncClients();
 
 				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end> <m2:start></m2:start>Bar<m2:end></m2:end></paragraph>'
+					'<paragraph>' +
+						'<m1:start></m1:start>Foo<m1:end></m1:end> <m2:start></m2:start>Bar<m2:end></m2:end>' +
+					'</paragraph>'
 				);
 
 				john.setSelection( [ 0, 1 ], [ 0, 3 ] );
@@ -221,9 +221,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>F<m1:end></m1:end> oo</paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>F<m1:end></m1:end> oo</paragraph>' );
 			} );
 
 			it( 'then unwrap and merge', () => {
@@ -314,9 +312,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo Bar</paragraph>'
-				);
+				expectClients( '<paragraph>Foo Bar</paragraph>' );
 			} );
 
 			it( 'with the same name', () => {
@@ -357,9 +353,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>o<m1:start></m1:start>Fo<m1:end></m1:end></paragraph>'
-				);
+				expectClients( '<paragraph>o<m1:start></m1:start>Fo<m1:end></m1:end></paragraph>' );
 			} );
 
 			it( 'text from other user\'s range #1', () => {
@@ -373,9 +367,7 @@ describe( 'transform', () => {
 
 				// Actual result for Kate:
 				// <paragraph>Ba<m1:start></m1:start>Foo r<m1:end></m1:end></paragraph>
-				expectClients(
-					'<paragraph><m1:start></m1:start>BaFoo r<m1:end></m1:end></paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>BaFoo r<m1:end></m1:end></paragraph>' );
 			} );
 
 			it( 'text from other user\'s range #2', () => {
@@ -436,9 +428,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end> </paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>Foo<m1:end></m1:end> </paragraph>' );
 			} );
 
 			it( 'text in other user\'s selection #1', () => {
@@ -450,9 +440,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>F<m1:end></m1:end></paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>F<m1:end></m1:end></paragraph>' );
 			} );
 
 			it( 'text in other user\'s selection #2', () => {
@@ -464,9 +452,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 		} );
 
@@ -608,9 +594,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>Foo<m1:end></m1:end></paragraph>' );
 			} );
 
 			it( 'text in same path', () => {
@@ -622,9 +606,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><m1:start></m1:start>Foo<m1:end></m1:end></blockQuote>'
-				);
+				expectClients( '<blockQuote><m1:start></m1:start>Foo<m1:end></m1:end></blockQuote>' );
 			} );
 
 			it( 'element in same path, then undo', () => {
@@ -640,9 +622,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo</paragraph>'
-				);
+				expectClients( '<paragraph>Foo</paragraph>' );
 			} );
 
 			it( 'text in same path, then undo', () => {
@@ -658,9 +638,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote>Foo</blockQuote>'
-				);
+				expectClients( '<blockQuote>Foo</blockQuote>' );
 			} );
 		} );
 
@@ -746,9 +724,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end> Bar</paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>Foo<m1:end></m1:end> Bar</paragraph>' );
 			} );
 
 			it( 'elements into paragraph', () => {
@@ -766,9 +742,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph><m1:start></m1:start>Foo<m1:end></m1:end> Bar Abc</paragraph>'
-				);
+				expectClients( '<paragraph><m1:start></m1:start>Foo<m1:end></m1:end> Bar Abc</paragraph>' );
 			} );
 
 			it( 'wrapped element into wrapped paragraph', () => {
@@ -813,9 +787,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<heading1>Fo<m1:start></m1:start>o<m1:end></m1:end></heading1>'
-				);
+				expectClients( '<heading1>Fo<m1:start></m1:start>o<m1:end></m1:end></heading1>' );
 			} );
 		} );
 	} );
diff --git a/tests/model/operation/transform/move.js b/tests/model/operation/transform/move.js
index 1978ac1ff..d59527dd2 100644
--- a/tests/model/operation/transform/move.js
+++ b/tests/model/operation/transform/move.js
@@ -338,9 +338,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>ooF</paragraph>'
-				);
+				expectClients( '<paragraph>ooF</paragraph>' );
 			} );
 
 			it( 'text in same path', () => {
@@ -352,9 +350,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote>ooF</blockQuote>'
-				);
+				expectClients( '<blockQuote>ooF</blockQuote>' );
 			} );
 		} );
 
@@ -550,9 +546,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo Bar</paragraph>'
-				);
+				expectClients( '<paragraph>Foo Bar</paragraph>' );
 			} );
 		} );
 
@@ -566,9 +560,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>ooFBar</paragraph>'
-				);
+				expectClients( '<paragraph>ooFBar</paragraph>' );
 			} );
 
 			it( 'element into paragraph #2', () => {
@@ -580,9 +572,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>arFooB</paragraph>'
-				);
+				expectClients( '<paragraph>arFooB</paragraph>' );
 			} );
 
 			it( 'element into paragraph #3', () => {
@@ -594,9 +584,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>FooBar</paragraph>'
-				);
+				expectClients( '<paragraph>FooBar</paragraph>' );
 			} );
 
 			it( 'wrapped element into wrapped paragraph #1', () => {
@@ -608,9 +596,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><paragraph>ooFBar</paragraph></blockQuote>'
-				);
+				expectClients( '<blockQuote><paragraph>ooFBar</paragraph></blockQuote>' );
 			} );
 
 			it( 'wrapped element into wrapped paragraph #2', () => {
@@ -622,9 +608,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><paragraph>arFooB</paragraph></blockQuote>'
-				);
+				expectClients( '<blockQuote><paragraph>arFooB</paragraph></blockQuote>' );
 			} );
 
 			it( 'wrapped element into wrapped paragraph #3', () => {
@@ -636,9 +620,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><paragraph>FooBar</paragraph></blockQuote>'
-				);
+				expectClients( '<blockQuote><paragraph>FooBar</paragraph></blockQuote>' );
 			} );
 
 			it( 'moved element', () => {
diff --git a/tests/model/operation/transform/remove.js b/tests/model/operation/transform/remove.js
index 96cfa300f..0fb5aaf65 100644
--- a/tests/model/operation/transform/remove.js
+++ b/tests/model/operation/transform/remove.js
@@ -25,9 +25,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>F</paragraph><paragraph>B</paragraph>'
-				);
+				expectClients( '<paragraph>F</paragraph><paragraph>B</paragraph>' );
 			} );
 
 			it( 'text in same path', () => {
@@ -39,9 +37,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>F B</paragraph>'
-				);
+				expectClients( '<paragraph>F B</paragraph>' );
 			} );
 
 			it( 'text in other user\'s selection #1', () => {
@@ -53,9 +49,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 
 			it( 'text in other user\'s selection #2', () => {
@@ -67,9 +61,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 
 			it( 'element in different path', () => {
@@ -81,9 +73,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 
 			it( 'text in other user\'s selection, then undo', () => {
@@ -100,9 +90,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo Bar</paragraph>'
-				);
+				expectClients( '<paragraph>Foo Bar</paragraph>' );
 			} );
 		} );
 
@@ -148,9 +136,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><paragraph></paragraph></blockQuote>'
-				);
+				expectClients( '<blockQuote><paragraph></paragraph></blockQuote>' );
 			} );
 
 			it( 'text in same path', () => {
@@ -267,9 +253,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 
 			it( 'text in same path', () => {
@@ -281,9 +265,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote></blockQuote>'
-				);
+				expectClients( '<blockQuote></blockQuote>' );
 			} );
 
 			it( 'element while removing', () => {
@@ -295,9 +277,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo</paragraph>'
-				);
+				expectClients( '<paragraph>Foo</paragraph>' );
 			} );
 
 			it.skip( 'element while removing, then undo', () => {
@@ -402,9 +382,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph></paragraph>'
-				);
+				expectClients( '<paragraph></paragraph>' );
 			} );
 		} );
 
@@ -418,9 +396,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>FBar</paragraph>'
-				);
+				expectClients( '<paragraph>FBar</paragraph>' );
 			} );
 
 			it( 'element into paragraph #2', () => {
@@ -432,9 +408,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>FooB</paragraph>'
-				);
+				expectClients( '<paragraph>FooB</paragraph>' );
 			} );
 
 			it.skip( 'element into paragraph, then undo', () => {
@@ -466,9 +440,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><paragraph>FBar</paragraph></blockQuote>'
-				);
+				expectClients( '<blockQuote><paragraph>FBar</paragraph></blockQuote>' );
 			} );
 
 			it( 'wrapped element into wrapped paragraph #2', () => {
@@ -480,9 +452,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><paragraph>FooB</paragraph></blockQuote>'
-				);
+				expectClients( '<blockQuote><paragraph>FooB</paragraph></blockQuote>' );
 			} );
 
 			it( 'removed element, then undo', () => {
@@ -540,9 +510,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<heading1></heading1>'
-				);
+				expectClients( '<heading1></heading1>' );
 			} );
 		} );
 	} );
diff --git a/tests/model/operation/transform/rename.js b/tests/model/operation/transform/rename.js
index ec60a680c..1d59e11b0 100644
--- a/tests/model/operation/transform/rename.js
+++ b/tests/model/operation/transform/rename.js
@@ -210,9 +210,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<heading1>Foo</heading1>'
-				);
+				expectClients( '<heading1>Foo</heading1>' );
 			} );
 
 			it( 'text in same path', () => {
@@ -238,9 +236,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<heading1>FooBar</heading1>'
-				);
+				expectClients( '<heading1>FooBar</heading1>' );
 			} );
 
 			it( 'element into paragraph #2', () => {
@@ -252,9 +248,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>FooBar</paragraph>'
-				);
+				expectClients( '<paragraph>FooBar</paragraph>' );
 			} );
 
 			it( 'wrapped element into wrapped paragraph #1', () => {
@@ -266,9 +260,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><heading1>FooBar</heading1></blockQuote>'
-				);
+				expectClients( '<blockQuote><heading1>FooBar</heading1></blockQuote>' );
 			} );
 
 			it( 'wrapped element into wrapped paragraph #2', () => {
@@ -280,9 +272,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote><paragraph>FooBar</paragraph></blockQuote>'
-				);
+				expectClients( '<blockQuote><paragraph>FooBar</paragraph></blockQuote>' );
 			} );
 		} );
 	} );
diff --git a/tests/model/operation/transform/split.js b/tests/model/operation/transform/split.js
index 9aa47c19e..7b621dc95 100644
--- a/tests/model/operation/transform/split.js
+++ b/tests/model/operation/transform/split.js
@@ -196,9 +196,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo</paragraph>'
-				);
+				expectClients( '<paragraph>Foo</paragraph>' );
 			} );
 
 			it( 'text in same path, then undo', () => {
@@ -214,9 +212,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<blockQuote>Foo</blockQuote>'
-				);
+				expectClients( '<blockQuote>Foo</blockQuote>' );
 			} );
 
 			it( 'multiple elements', () => {
@@ -297,9 +293,7 @@ describe( 'transform', () => {
 
 				syncClients();
 
-				expectClients(
-					'<paragraph>Foo</paragraph>'
-				);
+				expectClients( '<paragraph>Foo</paragraph>' );
 			} );
 
 			it( 'text in different path', () => {

From e5b3ed4959ad61d826410ab0a84a7a68c43a275b Mon Sep 17 00:00:00 2001
From: Mgsy <kacpertomporowski@gmail.com>
Date: Wed, 8 Aug 2018 10:16:33 +0200
Subject: [PATCH 5/5] Added: New scenarios.

---
 tests/model/operation/transform/move.js   | 30 ++++++++++++++++++++++-
 tests/model/operation/transform/remove.js | 12 +++++++++
 tests/model/operation/transform/wrap.js   | 30 ++++++++++++++++++++++-
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/tests/model/operation/transform/move.js b/tests/model/operation/transform/move.js
index d59527dd2..da9501b92 100644
--- a/tests/model/operation/transform/move.js
+++ b/tests/model/operation/transform/move.js
@@ -252,7 +252,7 @@ describe( 'transform', () => {
 				);
 			} );
 
-			it( 'element while moving', () => {
+			it( 'text while moving', () => {
 				john.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
 				kate.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
 
@@ -651,6 +651,34 @@ describe( 'transform', () => {
 
 				expectClients( '<paragraph>FooBar</paragraph>' );
 			} );
+
+			it( 'moved text', () => {
+				john.setData( '<paragraph>Foo</paragraph><paragraph>B[ar]</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph>[]<paragraph>Bar</paragraph>' );
+
+				john.move( [ 0, 0 ] );
+				kate.merge();
+
+				syncClients();
+
+				expectClients( '<paragraph>arFooB</paragraph>' );
+			} );
+
+			it( 'moved text, then undo', () => {
+				john.setData( '<paragraph>Foo</paragraph><paragraph>B[ar]</paragraph>' );
+				kate.setData( '<paragraph>Foo</paragraph>[]<paragraph>Bar</paragraph>' );
+
+				john.move( [ 0, 0 ] );
+				kate.merge();
+
+				syncClients();
+
+				john.undo();
+
+				syncClients();
+
+				expectClients( '<paragraph>FooBar</paragraph>' );
+			} );
 		} );
 
 		describe( 'by rename', () => {
diff --git a/tests/model/operation/transform/remove.js b/tests/model/operation/transform/remove.js
index 0fb5aaf65..630db6bce 100644
--- a/tests/model/operation/transform/remove.js
+++ b/tests/model/operation/transform/remove.js
@@ -268,6 +268,18 @@ describe( 'transform', () => {
 				expectClients( '<blockQuote></blockQuote>' );
 			} );
 
+			it( 'text in same path, then undo', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.remove();
+				kate.unwrap();
+
+				syncClients();
+
+				expectClients( '<blockQuote>Foo</blockQuote>' );
+			} );
+
 			it( 'element while removing', () => {
 				john.setData( '<paragraph>Foo</paragraph><blockQuote>[<paragraph>Bar</paragraph>]</blockQuote>' );
 				kate.setData( '<paragraph>Foo</paragraph><blockQuote>[<paragraph>Bar</paragraph>]</blockQuote>' );
diff --git a/tests/model/operation/transform/wrap.js b/tests/model/operation/transform/wrap.js
index ef6ec22cc..fbcd1e276 100644
--- a/tests/model/operation/transform/wrap.js
+++ b/tests/model/operation/transform/wrap.js
@@ -211,10 +211,26 @@ describe( 'transform', () => {
 
 				expectClients( '<blockQuote><div>Foo</div></blockQuote>' );
 			} );
+
+			it( 'the same text, then undo', () => {
+				john.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+				kate.setData( '<blockQuote><paragraph>[Foo]</paragraph></blockQuote>' );
+
+				john.wrap( 'div' );
+				kate.unwrap();
+
+				syncClients();
+
+				kate.undo();
+
+				syncClients();
+
+				expectClients( '<blockQuote><paragraph><div>Foo</div></paragraph></blockQuote>' );
+			} );
 		} );
 
 		describe( 'by delete', () => {
-			it( 'text in two elements', () => {
+			it( 'text in two elements #1', () => {
 				john.setData( '[<paragraph>Foo</paragraph>]<paragraph>Bar</paragraph>' );
 				kate.setData( '<paragraph>Fo[o</paragraph><paragraph>Ba]r</paragraph>' );
 
@@ -229,6 +245,18 @@ describe( 'transform', () => {
 					'</blockQuote>'
 				);
 			} );
+
+			it( 'text in two elements #2', () => {
+				john.setData( '<paragraph>[Foo]</paragraph><paragraph>Bar</paragraph>' );
+				kate.setData( '<paragraph>Fo[o</paragraph><paragraph>Ba]r</paragraph>' );
+
+				john.wrap( 'div' );
+				kate.delete();
+
+				syncClients();
+
+				expectClients( '<paragraph><div>Fo</div>r</paragraph>' );
+			} );
 		} );
 
 		describe( 'by merge', () => {