浏览代码

Merge pull request #87 from ckeditor/t/ckeditor5/383

Internal: Removed usage of the CKEditor 5 logger. Part of ckeditor/ckeditor5#383.
Piotr Jasiun 6 年之前
父节点
当前提交
b02b78893a

+ 6 - 3
packages/ckeditor5-media-embed/src/mediaregistry.js

@@ -7,11 +7,13 @@
  * @module media-embed/mediaregistry
  */
 
+/* globals console */
+
 import mediaPlaceholderIcon from '../theme/icons/media-placeholder.svg';
-import log from '@ckeditor/ckeditor5-utils/src/log';
 import TooltipView from '@ckeditor/ckeditor5-ui/src/tooltip/tooltipview';
 import IconView from '@ckeditor/ckeditor5-ui/src/icon/iconview';
 import Template from '@ckeditor/ckeditor5-ui/src/template';
+import { attachLinkToDocumentation } from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
 const mediaPlaceholderIconViewBox = '0 0 64 42';
 
@@ -46,8 +48,9 @@ export default class MediaRegistry {
 					 *
 					 * @warning media-embed-no-provider-name
 					 */
-					log.warn( 'media-embed-no-provider-name: The configured media provider has no name and cannot be used.',
-						{ provider } );
+					console.warn( attachLinkToDocumentation(
+						'media-embed-no-provider-name: The configured media provider has no name and cannot be used.'
+					), { provider } );
 
 					return false;
 				}

+ 15 - 13
packages/ckeditor5-media-embed/tests/mediaembedediting.js

@@ -3,20 +3,18 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
+/* globals console */
+
 import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
 import MediaEmbedEditing from '../src/mediaembedediting';
 import { setData as setModelData, getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 import normalizeHtml from '@ckeditor/ckeditor5-utils/tests/_utils/normalizehtml';
-import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
-import log from '@ckeditor/ckeditor5-utils/src/log';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 describe( 'MediaEmbedEditing', () => {
 	let editor, model, doc, view;
 
-	testUtils.createSinonSandbox();
-
 	const testProviders = {
 		A: {
 			name: 'A',
@@ -58,7 +56,11 @@ describe( 'MediaEmbedEditing', () => {
 
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
+		sinon.stub( env, 'isEdge' ).get( () => false );
+	} );
+
+	afterEach( () => {
+		sinon.restore();
 	} );
 
 	it( 'should be named', () => {
@@ -69,7 +71,7 @@ describe( 'MediaEmbedEditing', () => {
 		describe( 'configuration', () => {
 			describe( '#providers', () => {
 				it( 'should warn when provider has no name', () => {
-					const logSpy = testUtils.sinon.stub( log, 'warn' );
+					const consoleWarnStub = sinon.stub( console, 'warn' );
 					const provider = {
 						url: /.*/
 					};
@@ -77,9 +79,9 @@ describe( 'MediaEmbedEditing', () => {
 					return createTestEditor( {
 						providers: [ provider ]
 					} ).then( () => {
-						expect( logSpy.calledOnce ).to.equal( true );
-						expect( logSpy.firstCall.args[ 0 ] ).to.match( /^media-embed-no-provider-name:/ );
-						expect( logSpy.firstCall.args[ 1 ].provider ).to.deep.equal( provider );
+						expect( consoleWarnStub.calledOnce ).to.equal( true );
+						expect( consoleWarnStub.firstCall.args[ 0 ] ).to.match( /^media-embed-no-provider-name:/ );
+						expect( consoleWarnStub.firstCall.args[ 1 ].provider ).to.deep.equal( provider );
 					} );
 				} );
 
@@ -328,7 +330,7 @@ describe( 'MediaEmbedEditing', () => {
 
 			describe( '#extraProviders', () => {
 				it( 'should warn when provider has no name', () => {
-					const logSpy = testUtils.sinon.stub( log, 'warn' );
+					const consoleWarnStub = sinon.stub( console, 'warn' );
 					const provider = {
 						url: /.*/
 					};
@@ -336,9 +338,9 @@ describe( 'MediaEmbedEditing', () => {
 					return createTestEditor( {
 						extraProviders: [ provider ]
 					} ).then( () => {
-						expect( logSpy.calledOnce ).to.equal( true );
-						expect( logSpy.firstCall.args[ 0 ] ).to.match( /^media-embed-no-provider-name:/ );
-						expect( logSpy.firstCall.args[ 1 ].provider ).to.deep.equal( provider );
+						expect( consoleWarnStub.calledOnce ).to.equal( true );
+						expect( consoleWarnStub.firstCall.args[ 0 ] ).to.match( /^media-embed-no-provider-name:/ );
+						expect( consoleWarnStub.firstCall.args[ 1 ].provider ).to.deep.equal( provider );
 					} );
 				} );
 

+ 6 - 7
packages/ckeditor5-media-embed/tests/mediaregistry.js

@@ -3,8 +3,9 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
+/* globals console */
+
 import MediaRegistry from '../src/mediaregistry';
-import log from '@ckeditor/ckeditor5-utils/src/log';
 
 describe( 'MediaRegistry', () => {
 	describe( 'constructor()', () => {
@@ -40,7 +41,7 @@ describe( 'MediaRegistry', () => {
 		} );
 
 		it( 'logs a warning when provider\'s name is not defined', () => {
-			const logStub = sinon.stub( log, 'warn' );
+			const consoleWarnStub = sinon.stub( console, 'warn' );
 
 			const providers = [
 				{ url: [ /dailymotion\.com/ ] },
@@ -53,11 +54,9 @@ describe( 'MediaRegistry', () => {
 			const availableProviders = mediaRegistry.providerDefinitions.map( provider => provider.name );
 
 			expect( availableProviders ).to.deep.equal( [ 'spotify', 'youtube', 'vimeo' ] );
-			expect( logStub.calledOnce ).to.equal( true );
-			expect( logStub.firstCall.args[ 0 ] ).to.equal(
-				'media-embed-no-provider-name: The configured media provider has no name and cannot be used.'
-			);
-			expect( logStub.firstCall.args[ 1 ] ).to.deep.equal( { provider: { url: [ /dailymotion\.com/ ] } } );
+			expect( consoleWarnStub.calledOnce ).to.equal( true );
+			expect( consoleWarnStub.firstCall.args[ 0 ] ).to.match( /^media-embed-no-provider-name/ );
+			expect( consoleWarnStub.firstCall.args[ 1 ] ).to.deep.equal( { provider: { url: [ /dailymotion\.com/ ] } } );
 		} );
 	} );