Tests: Properly use sinon sandbox in tests.

ckeditor · Jul 9, 2018 · 1119a03 · 1119a03
1 parent 30c2119
commit 1119a03
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git a/tests/dev-utils/enableenginedebug.js b/tests/dev-utils/enableenginedebug.js
@@ -49,9 +49,9 @@ import ViewElement from '../../src/view/element';
 import createViewRoot from '../view/_utils/createroot';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
-testUtils.createSinonSandbox();
-
 describe( 'enableEngineDebug', () => {
+	testUtils.createSinonSandbox();
+
 	afterEach( () => {
 		disableEngineDebug();
 	} );
@@ -72,6 +72,8 @@ describe( 'enableEngineDebug', () => {
 } );
 
 describe( 'disableEngineDebug', () => {
+	testUtils.createSinonSandbox();
+
 	it( 'restores modified stubs', () => {
 		expect( ModelPosition.prototype.log ).to.equal( undefined, 'Initial value (model/position)' );
 		expect( ModelElement.prototype.printTree ).to.equal( undefined, 'Initial value (model/element)' );
@@ -103,6 +105,8 @@ describe( 'disableEngineDebug', () => {
 describe( 'debug tools', () => {
 	let DebugPlugin, log, error;
 
+	testUtils.createSinonSandbox();
+
 	before( () => {
 		log = sinon.spy();
 		error = sinon.spy();

diff --git a/tests/model/documentselection.js b/tests/model/documentselection.js
@@ -22,11 +22,11 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import { wrapInDelta } from '../../tests/model/_utils/utils';
 import { setData, getData } from '../../src/dev-utils/model';
 
-testUtils.createSinonSandbox();
-
 describe( 'DocumentSelection', () => {
 	let model, doc, root, selection, liveRange, range;
 
+	testUtils.createSinonSandbox();
+
 	const fooStoreAttrKey = DocumentSelection._getStoreAttributeKey( 'foo' );
 	const abcStoreAttrKey = DocumentSelection._getStoreAttributeKey( 'abc' );
 

diff --git a/tests/model/position.js b/tests/model/position.js
@@ -13,11 +13,11 @@ import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import { jsonParseStringify } from '../../tests/model/_utils/utils';
 
-testUtils.createSinonSandbox();
-
 describe( 'Position', () => {
 	let doc, root, otherRoot, p, ul, li1, li2, f, o, z, b, a, r, foz, bar;
 
+	testUtils.createSinonSandbox();
+
 	// root
 	//  |- p         Before: [ 0 ]       After: [ 1 ]
 	//  |- ul        Before: [ 1 ]       After: [ 2 ]

diff --git a/tests/model/selection.js b/tests/model/selection.js
@@ -16,11 +16,11 @@ import count from '@ckeditor/ckeditor5-utils/src/count';
 import { parse, setData } from '../../src/dev-utils/model';
 import Schema from '../../src/model/schema';
 
-testUtils.createSinonSandbox();
-
 describe( 'Selection', () => {
 	let model, doc, root, selection, liveRange, range, range1, range2, range3;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		model = new Model();
 		doc = model.document;

diff --git a/tests/view/document.js b/tests/view/document.js
@@ -11,11 +11,11 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import count from '@ckeditor/ckeditor5-utils/src/count';
 import createViewRoot from './_utils/createroot';
 
-testUtils.createSinonSandbox();
-
 describe( 'Document', () => {
 	let domRoot, viewDocument;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		domRoot = createElement( document, 'div', {
 			id: 'editor',

diff --git a/tests/view/domconverter/domconverter.js b/tests/view/domconverter/domconverter.js
@@ -14,11 +14,11 @@ import { BR_FILLER, NBSP_FILLER, INLINE_FILLER, INLINE_FILLER_LENGTH } from '../
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import global from '@ckeditor/ckeditor5-utils/src/dom/global';
 
-testUtils.createSinonSandbox();
-
 describe( 'DomConverter', () => {
 	let converter;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		converter = new DomConverter();
 	} );

diff --git a/tests/view/observer/selectionobserver.js b/tests/view/observer/selectionobserver.js
@@ -16,11 +16,11 @@ import log from '@ckeditor/ckeditor5-utils/src/log';
 import createViewRoot from '../_utils/createroot';
 import { parse } from '../../../src/dev-utils/view';
 
-testUtils.createSinonSandbox();
-
 describe( 'SelectionObserver', () => {
 	let view, viewDocument, viewRoot, selectionObserver, domRoot, domMain, domDocument;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( done => {
 		domDocument = document;
 		domRoot = domDocument.createElement( 'div' );

diff --git a/tests/view/renderer.js b/tests/view/renderer.js
@@ -25,11 +25,11 @@ import createViewRoot from './_utils/createroot';
 import createElement from '@ckeditor/ckeditor5-utils/src/dom/createelement';
 import normalizeHtml from '@ckeditor/ckeditor5-utils/tests/_utils/normalizehtml';
 
-testUtils.createSinonSandbox();
-
 describe( 'Renderer', () => {
 	let selection, domConverter, renderer;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		selection = new DocumentSelection();
 		domConverter = new DomConverter();