瀏覽代碼

Merge pull request #662 from ckeditor/t/661

T/661: Removed HTML files from automatic tests.
Piotrek Koszuliński 9 年之前
父節點
當前提交
39773d22fd

+ 0 - 1
packages/ckeditor5-engine/tests/__template__.html

@@ -1 +0,0 @@
-<div contenteditable="true" id="editor"></div>

+ 14 - 1
packages/ckeditor5-engine/tests/view/document/document.js

@@ -6,6 +6,7 @@
 /* globals document */
 /* bender-tags: view, browser-only */
 
+import createElement from '/ckeditor5/utils/dom/createelement.js';
 import Document from '/ckeditor5/engine/view/document.js';
 import Observer from '/ckeditor5/engine/view/observer/observer.js';
 import MutationObserver from '/ckeditor5/engine/view/observer/mutationobserver.js';
@@ -24,7 +25,19 @@ testUtils.createSinonSandbox();
 
 describe( 'Document', () => {
 	const DEFAULT_OBSERVERS_COUNT = 5;
-	let ObserverMock, ObserverMockGlobalCount, instantiated, enabled;
+	let ObserverMock, ObserverMockGlobalCount, instantiated, enabled, domRoot;
+
+	before( () => {
+		domRoot = createElement( document, 'div', {
+			id: 'editor',
+			contenteditable: 'true'
+		} );
+		document.body.appendChild( domRoot );
+	} );
+
+	after( () => {
+		domRoot.parentElement.removeChild( domRoot );
+	} );
 
 	beforeEach( () => {
 		instantiated = 0;

+ 0 - 2
packages/ckeditor5-engine/tests/view/observer/__template__.html

@@ -1,2 +0,0 @@
-<div contenteditable="true" id="main"></div>
-<div contenteditable="true" id="additional"></div>

+ 20 - 1
packages/ckeditor5-engine/tests/view/observer/domeventdata.js

@@ -10,14 +10,33 @@ import DomEventData from '/ckeditor5/engine/view/observer/domeventdata.js';
 import ViewDocument from '/ckeditor5/engine/view/document.js';
 
 describe( 'DomEventData', () => {
-	let viewDocument, viewBody;
+	let viewDocument, viewBody, domRoot;
+
+	// Todo: the whole `before` hook can be removed.
+	// Depends on: https://github.com/ckeditor/ckeditor5-engine/issues/647
+	before( () => {
+		for ( const node of document.body.childNodes ) {
+			// Remove all <!-- Comments -->
+			if ( node.nodeType === 8 ) {
+				document.body.removeChild( node );
+			}
+		}
+	} );
 
 	beforeEach( () => {
 		viewDocument = new ViewDocument();
 
+		domRoot = document.createElement( 'div' );
+		domRoot.innerHTML = `<div contenteditable="true" id="main"></div><div contenteditable="true" id="additional"></div>`;
+		document.body.appendChild( domRoot );
+
 		viewBody = viewDocument.domConverter.domToView( document.body, { bind: true } );
 	} );
 
+	afterEach( () => {
+		domRoot.parentElement.removeChild( domRoot );
+	} );
+
 	describe( 'constructor', () => {
 		it( 'sets properties', () => {
 			const domEvt = { target: document.body };

+ 14 - 1
packages/ckeditor5-engine/tests/view/observer/fakeselectionobserver.js

@@ -5,6 +5,7 @@
 
 /* globals document */
 
+import createElement from '/ckeditor5/utils/dom/createelement.js';
 import FakeSelectionObserver from '/ckeditor5/engine/view/observer/fakeselectionobserver.js';
 import ViewDocument from '/ckeditor5/engine/view/document.js';
 import DomEventData from '/ckeditor5/engine/view/observer/domeventdata.js';
@@ -15,10 +16,22 @@ describe( 'FakeSelectionObserver', () => {
 	let observer;
 	let viewDocument;
 	let root;
+	let domRoot;
+
+	before( () => {
+		domRoot = createElement( document, 'div', {
+			contenteditable: 'true'
+		} );
+		document.body.appendChild( domRoot );
+	} );
+
+	after( () => {
+		domRoot.parentElement.removeChild( domRoot );
+	} );
 
 	beforeEach( () => {
 		viewDocument = new ViewDocument();
-		root = viewDocument.createRoot( document.getElementById( 'main' ) );
+		root = viewDocument.createRoot( domRoot );
 		observer = viewDocument.getObserver( FakeSelectionObserver );
 		viewDocument.selection.setFake();
 	} );

+ 7 - 1
packages/ckeditor5-engine/tests/view/observer/mutationobserver.js

@@ -11,9 +11,13 @@ import MutationObserver from '/ckeditor5/engine/view/observer/mutationobserver.j
 import { parse } from '/ckeditor5/engine/dev-utils/view.js';
 
 describe( 'MutationObserver', () => {
-	let domEditor, viewDocument, viewRoot, mutationObserver, lastMutations;
+	let domEditor, viewDocument, viewRoot, mutationObserver, lastMutations, domRoot;
 
 	beforeEach( () => {
+		domRoot = document.createElement( 'div' );
+		domRoot.innerHTML = `<div contenteditable="true" id="main"></div><div contenteditable="true" id="additional"></div>`;
+		document.body.appendChild( domRoot );
+
 		viewDocument = new ViewDocument();
 		domEditor = document.getElementById( 'main' );
 		lastMutations = null;
@@ -35,6 +39,8 @@ describe( 'MutationObserver', () => {
 
 	afterEach( () => {
 		mutationObserver.disable();
+
+		domRoot.parentElement.removeChild( domRoot );
 	} );
 
 	it( 'should handle typing', () => {

+ 9 - 2
packages/ckeditor5-engine/tests/view/observer/selectionobserver.js

@@ -21,13 +21,16 @@ import { parse } from '/ckeditor5/engine/dev-utils/view.js';
 testUtils.createSinonSandbox();
 
 describe( 'SelectionObserver', () => {
-	let viewDocument, viewRoot, mutationObserver, selectionObserver, listenter;
+	let viewDocument, viewRoot, mutationObserver, selectionObserver, listenter, domRoot;
 
 	before( () => {
+		domRoot = document.createElement( 'div' );
+		domRoot.innerHTML = `<div contenteditable="true" id="main"></div><div contenteditable="true" id="additional"></div>`;
+		document.body.appendChild( domRoot );
+
 		listenter = Object.create( EmitterMixin );
 
 		viewDocument = new ViewDocument();
-
 		viewDocument.createRoot( document.getElementById( 'main' ) );
 
 		mutationObserver = viewDocument.getObserver( MutationObserver );
@@ -42,6 +45,10 @@ describe( 'SelectionObserver', () => {
 		viewDocument.render();
 	} );
 
+	after( () => {
+		domRoot.parentElement.removeChild( domRoot );
+	} );
+
 	beforeEach( ( done ) => {
 		viewDocument.selection.removeAllRanges();
 		document.getSelection().removeAllRanges();