Browse Source

Tests: Use sinon for stubbing env.isEdge.

Maciej Gołaszewski 7 years ago
parent
commit
98a9481bb5

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

@@ -15,13 +15,11 @@ import global from '@ckeditor/ckeditor5-utils/src/dom/global';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 describe( 'Image', () => {
-	const initialEnvEdge = env.isEdge;
-
 	let editorElement, model, view, editor, document, viewDocument;
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		env.isEdge = false;
+		sinon.stub( env, 'isEdge' ).get( () => false );
 
 		editorElement = global.document.createElement( 'div' );
 		global.document.body.appendChild( editorElement );
@@ -40,8 +38,6 @@ describe( 'Image', () => {
 	} );
 
 	afterEach( () => {
-		env.isEdge = initialEnvEdge;
-
 		editorElement.remove();
 
 		return editor.destroy();

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

@@ -20,13 +20,11 @@ import { setData as setModelData, getData as getModelData } from '@ckeditor/cked
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 describe( 'Image converters', () => {
-	const initialEnvEdge = env.isEdge;
-
 	let editor, model, document, viewDocument;
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		env.isEdge = false;
+		sinon.stub( env, 'isEdge' ).get( () => false );
 
 		return VirtualTestEditor.create()
 			.then( newEditor => {
@@ -58,10 +56,6 @@ describe( 'Image converters', () => {
 			} );
 	} );
 
-	afterEach( () => {
-		env.isEdge = initialEnvEdge;
-	} );
-
 	describe( 'viewFigureToModel', () => {
 		function expectModel( data ) {
 			expect( getModelData( model, { withoutSelection: true } ) ).to.equal( data );

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

@@ -16,13 +16,11 @@ import normalizeHtml from '@ckeditor/ckeditor5-utils/tests/_utils/normalizehtml'
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 describe( 'ImageEditing', () => {
-	const initialEnvEdge = env.isEdge;
-
 	let editor, model, doc, view, viewDocument;
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		env.isEdge = false;
+		sinon.stub( env, 'isEdge' ).get( () => false );
 
 		return VirtualTestEditor
 			.create( {
@@ -37,10 +35,6 @@ describe( 'ImageEditing', () => {
 			} );
 	} );
 
-	afterEach( () => {
-		env.isEdge = initialEnvEdge;
-	} );
-
 	it( 'should be loaded', () => {
 		expect( editor.plugins.get( ImageEditing ) ).to.be.instanceOf( ImageEditing );
 	} );

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

@@ -21,13 +21,11 @@ import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 describe( 'ImageCaptionEditing', () => {
-	const initialEnvEdge = env.isEdge;
-
 	let editor, model, doc, view;
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		env.isEdge = false;
+		sinon.stub( env, 'isEdge' ).get( () => false );
 
 		return VirtualTestEditor
 			.create( {
@@ -50,10 +48,6 @@ describe( 'ImageCaptionEditing', () => {
 			} );
 	} );
 
-	afterEach( () => {
-		env.isEdge = initialEnvEdge;
-	} );
-
 	it( 'should be loaded', () => {
 		expect( editor.plugins.get( ImageCaptionEditing ) ).to.be.instanceOf( ImageCaptionEditing );
 	} );

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

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

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

@@ -18,20 +18,14 @@ import env from '@ckeditor/ckeditor5-utils/src/env';
 testUtils.createSinonSandbox();
 
 describe( 'TextAlternativeFormView', () => {
-	const initialEnvEdge = env.isEdge;
-
 	let view;
 
 	beforeEach( () => {
-		env.isEdge = false;
+		sinon.stub( env, 'isEdge' ).get( () => false );
 
 		view = new TextAlternativeFormView( { t: () => {} } );
 	} );
 
-	afterEach( () => {
-		env.isEdge = initialEnvEdge;
-	} );
-
 	describe( 'constructor()', () => {
 		it( 'should create element from template', () => {
 			view.render();

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

@@ -18,13 +18,11 @@ import { setData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 describe( 'ImageToolbar', () => {
-	const initialEnvEdge = env.isEdge;
-
 	let editor, model, doc, plugin, toolbar, balloon, editorElement;
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		env.isEdge = false;
+		sinon.stub( env, 'isEdge' ).get( () => false );
 
 		editorElement = global.document.createElement( 'div' );
 		global.document.body.appendChild( editorElement );
@@ -47,8 +45,6 @@ describe( 'ImageToolbar', () => {
 	} );
 
 	afterEach( () => {
-		env.isEdge = initialEnvEdge;
-
 		editorElement.remove();
 
 		return editor.destroy();

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

@@ -30,7 +30,6 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import Notification from '@ckeditor/ckeditor5-ui/src/notification/notification';
 
 describe( 'ImageUploadEditing', () => {
-	const initialEnvEdge = env.isEdge;
 	// eslint-disable-next-line max-len
 	const base64Sample = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=';
 	let editor, model, view, doc, fileRepository, viewDocument, nativeReaderMock, loader, adapterMock;
@@ -51,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`.
-		env.isEdge = false;
+		sinon.stub( env, 'isEdge' ).get( () => false );
 
 		testUtils.sinon.stub( window, 'FileReader' ).callsFake( () => {
 			nativeReaderMock = new NativeFileReaderMock();
@@ -73,8 +72,6 @@ describe( 'ImageUploadEditing', () => {
 	} );
 
 	afterEach( () => {
-		env.isEdge = initialEnvEdge;
-
 		return editor.destroy();
 	} );
 

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

@@ -23,8 +23,6 @@ import svgPlaceholder from '../../theme/icons/image_placeholder.svg';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 describe( 'ImageUploadProgress', () => {
-	const initialEnvEdge = env.isEdge;
-
 	const imagePlaceholder = encodeURIComponent( svgPlaceholder );
 
 	// eslint-disable-next-line max-len
@@ -47,7 +45,7 @@ describe( 'ImageUploadProgress', () => {
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		env.isEdge = false;
+		sinon.stub( env, 'isEdge' ).get( () => false );
 
 		testUtils.sinon.stub( window, 'FileReader' ).callsFake( () => {
 			nativeReaderMock = new NativeFileReaderMock();
@@ -75,10 +73,6 @@ describe( 'ImageUploadProgress', () => {
 			} );
 	} );
 
-	afterEach( () => {
-		env.isEdge = initialEnvEdge;
-	} );
-
 	it( 'should convert image\'s "reading" uploadStatus attribute', () => {
 		setModelData( model, '<paragraph>[]foo</paragraph>' );
 		editor.execute( 'imageUpload', { file: createNativeFileMock() } );

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

@@ -14,14 +14,12 @@ import View from '@ckeditor/ckeditor5-ui/src/view';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 describe( 'ImageToolbar integration', () => {
-	const initialEnvEdge = env.isEdge;
-
 	describe( 'with the BalloonToolbar', () => {
 		let balloon, balloonToolbar, newEditor, editorElement;
 
 		beforeEach( () => {
 			// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-			env.isEdge = false;
+			sinon.stub( env, 'isEdge' ).get( () => false );
 
 			editorElement = global.document.createElement( 'div' );
 			global.document.body.appendChild( editorElement );
@@ -48,7 +46,6 @@ describe( 'ImageToolbar integration', () => {
 		} );
 
 		afterEach( () => {
-			env.isEdge = initialEnvEdge;
 			editorElement.remove();
 			return newEditor.destroy();
 		} );