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

Tests: Properly use sinon sandbox in tests.

Maciej Gołaszewski 7 лет назад
Родитель
Сommit
3541bfe870

+ 4 - 1
packages/ckeditor5-image/tests/image.js

@@ -13,13 +13,16 @@ import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils
 import ModelRange from '@ckeditor/ckeditor5-engine/src/model/range';
 import global from '@ckeditor/ckeditor5-utils/src/dom/global';
 import env from '@ckeditor/ckeditor5-utils/src/env';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 describe( 'Image', () => {
 	let editorElement, model, view, editor, document, viewDocument;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		editorElement = global.document.createElement( 'div' );
 		global.document.body.appendChild( editorElement );

+ 4 - 1
packages/ckeditor5-image/tests/image/converters.js

@@ -18,13 +18,16 @@ import ModelRange from '@ckeditor/ckeditor5-engine/src/model/range';
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 import { setData as setModelData, getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import env from '@ckeditor/ckeditor5-utils/src/env';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 describe( 'Image converters', () => {
 	let editor, model, document, viewDocument;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		return VirtualTestEditor.create()
 			.then( newEditor => {

+ 4 - 1
packages/ckeditor5-image/tests/image/imageediting.js

@@ -14,13 +14,16 @@ import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils
 import { isImageWidget } from '../../src/image/utils';
 import normalizeHtml from '@ckeditor/ckeditor5-utils/tests/_utils/normalizehtml';
 import env from '@ckeditor/ckeditor5-utils/src/env';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 describe( 'ImageEditing', () => {
 	let editor, model, doc, view, viewDocument;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		return VirtualTestEditor
 			.create( {

+ 4 - 1
packages/ckeditor5-image/tests/imagecaption/imagecaptionediting.js

@@ -19,13 +19,16 @@ import { getData as getModelData, setData as setModelData } from '@ckeditor/cked
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 
 import env from '@ckeditor/ckeditor5-utils/src/env';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 describe( 'ImageCaptionEditing', () => {
 	let editor, model, doc, view;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		return VirtualTestEditor
 			.create( {

+ 3 - 3
packages/ckeditor5-image/tests/imagestyle/imagestyleediting.js

@@ -14,14 +14,14 @@ import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
-testUtils.createSinonSandbox();
-
 describe( 'ImageStyleEditing', () => {
 	let editor, model, document, viewDocument;
 
+	testUtils.createSinonSandbox( 'ImageStyleEditing' );
+
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 	} );
 
 	afterEach( () => {

+ 2 - 2
packages/ckeditor5-image/tests/imagestyle/utils.js

@@ -13,11 +13,11 @@ import rightIcon from '@ckeditor/ckeditor5-core/theme/icons/object-right.svg';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import { normalizeImageStyles } from '../../src/imagestyle/utils';
 
-testUtils.createSinonSandbox();
-
 describe( 'ImageStyle utils', () => {
 	let imageStyles;
 
+	testUtils.createSinonSandbox();
+
 	describe( 'normalizeImageStyles()', () => {
 		// Since this function is all about normalizing the config object, make sure it doesn't throw
 		// if the config is empty (which may happen e.g. if only ImageStyleUI was loaded).

+ 3 - 3
packages/ckeditor5-image/tests/imagetextalternative/ui/textalternativeformview.js

@@ -15,13 +15,13 @@ import ViewCollection from '@ckeditor/ckeditor5-ui/src/viewcollection';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
-testUtils.createSinonSandbox();
-
 describe( 'TextAlternativeFormView', () => {
 	let view;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		view = new TextAlternativeFormView( { t: () => {} } );
 	} );

+ 4 - 1
packages/ckeditor5-image/tests/imagetoolbar.js

@@ -16,13 +16,16 @@ import Range from '@ckeditor/ckeditor5-engine/src/model/range';
 import View from '@ckeditor/ckeditor5-ui/src/view';
 import { setData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import env from '@ckeditor/ckeditor5-utils/src/env';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 describe( 'ImageToolbar', () => {
 	let editor, model, doc, plugin, toolbar, balloon, editorElement;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		editorElement = global.document.createElement( 'div' );
 		global.document.body.appendChild( editorElement );

+ 1 - 1
packages/ckeditor5-image/tests/imageupload/imageuploadediting.js

@@ -50,7 +50,7 @@ describe( 'ImageUploadEditing', () => {
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		testUtils.sinon.stub( window, 'FileReader' ).callsFake( () => {
 			nativeReaderMock = new NativeFileReaderMock();

+ 1 - 1
packages/ckeditor5-image/tests/imageupload/imageuploadprogress.js

@@ -44,7 +44,7 @@ describe( 'ImageUploadProgress', () => {
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		testUtils.sinon.stub( window, 'FileReader' ).callsFake( () => {
 			nativeReaderMock = new NativeFileReaderMock();

+ 4 - 1
packages/ckeditor5-image/tests/integration.js

@@ -12,14 +12,17 @@ import Image from '../src/image';
 import ImageToolbar from '../src/imagetoolbar';
 import View from '@ckeditor/ckeditor5-ui/src/view';
 import env from '@ckeditor/ckeditor5-utils/src/env';
+import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 describe( 'ImageToolbar integration', () => {
 	describe( 'with the BalloonToolbar', () => {
 		let balloon, balloonToolbar, newEditor, editorElement;
 
+		testUtils.createSinonSandbox();
+
 		beforeEach( () => {
 			// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-			sinon.stub( env, 'isEdge' ).get( () => false );
+			testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 			editorElement = global.document.createElement( 'div' );
 			global.document.body.appendChild( editorElement );