Bläddra i källkod

Improved tests.

Maciej Bukowski 8 år sedan
förälder
incheckning
16a75cef63

+ 2 - 3
packages/ckeditor5-easy-image/src/cloudservicesuploadadapter.js

@@ -27,7 +27,7 @@ export default class CloudServicesUploadAdapter extends Plugin {
 	 * @inheritDoc
 	 */
 	static get requires() {
-		return [ FileRepository, CloudServicesUploadAdapter._CloudServices ];
+		return [ FileRepository, CloudServices ];
 	}
 
 	/**
@@ -36,7 +36,7 @@ export default class CloudServicesUploadAdapter extends Plugin {
 	init() {
 		const editor = this.editor;
 
-		const cloudServices = editor.plugins.get( CloudServicesUploadAdapter._CloudServices );
+		const cloudServices = editor.plugins.get( CloudServices );
 
 		const token = cloudServices.token;
 		const uploadUrl = cloudServices.uploadUrl || 'https://files.cke-cs.com/upload/';
@@ -78,7 +78,6 @@ class Adapter {
 // Store the API in static property to easily overwrite it in tests.
 // Too bad dependency injection does not work in Webpack + ES 6 (const) + Babel.
 CloudServicesUploadAdapter._UploadGateway = UploadGateway;
-CloudServicesUploadAdapter._CloudServices = CloudServices;
 
 /**
  * The configuration of the {@link module:easy-image/cloudservicesuploadadapter~CloudServicesUploadAdapter Cloud Services upload adapter}.

+ 6 - 6
packages/ckeditor5-easy-image/tests/cloudservicesuploadadapter.js

@@ -8,28 +8,27 @@
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import CloudServicesUploadAdapter from '../src/cloudservicesuploadadapter';
 import FileRepository from '@ckeditor/ckeditor5-upload/src/filerepository';
+import CloudServices from '@ckeditor/ckeditor5-cloudservices/src/cloudservices';
 
 import UploadGatewayMock from './_utils/uploadgatewaymock';
 import { createNativeFileMock } from '@ckeditor/ckeditor5-upload/tests/_utils/mocks';
-import CloudServicesMock from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservicesmock';
+import TokenMock from '@ckeditor/ckeditor5-cloudservices/tests/_utils/tokenmock';
 
 // Store original uploader.
 const CSUploader = CloudServicesUploadAdapter._UploadGateway;
-const CloudServices = CloudServicesUploadAdapter._CloudServices;
+const Token = CloudServices.Token;
 
 describe( 'CloudServicesUploadAdapter', () => {
 	let div;
 
 	before( () => {
-		// Mock uploader.
+		CloudServices.Token = TokenMock;
 		CloudServicesUploadAdapter._UploadGateway = UploadGatewayMock;
-		CloudServicesUploadAdapter._CloudServices = CloudServicesMock;
 	} );
 
 	after( () => {
-		// Restore original uploader.
+		CloudServices.Token = Token;
 		CloudServicesUploadAdapter._UploadGateway = CSUploader;
-		CloudServicesUploadAdapter._CloudServices = CloudServices;
 	} );
 
 	beforeEach( () => {
@@ -44,6 +43,7 @@ describe( 'CloudServicesUploadAdapter', () => {
 	describe( 'init()', () => {
 		it( 'should set loader', () => {
 			UploadGatewayMock.lastToken = undefined;
+			TokenMock.initialToken = 'token';
 
 			return ClassicTestEditor
 				.create( div, {

+ 9 - 5
packages/ckeditor5-easy-image/tests/easyimage.js

@@ -14,17 +14,18 @@ import UploadGatewayMock from './_utils/uploadgatewaymock';
 import { createNativeFileMock } from '@ckeditor/ckeditor5-upload/tests/_utils/mocks';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 
-import CloudServicesMock from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservicesmock';
+import CloudServices from '@ckeditor/ckeditor5-cloudservices/src/cloudservices';
+import TokenMock from '@ckeditor/ckeditor5-cloudservices/tests/_utils/tokenmock';
 
-const CloudServices = CloudServicesUploadAdapter._CloudServices;
+const Token = CloudServices.Token
 
 describe( 'EasyImage', () => {
 	before( () => {
-		CloudServicesUploadAdapter._CloudServices = CloudServicesMock;
+		CloudServices.Token = TokenMock;
 	} );
 
 	after( () => {
-		CloudServicesUploadAdapter._CloudServices = CloudServices;
+		CloudServices.Token = Token;
 	} );
 
 	it( 'should require other plugins', () => {
@@ -41,7 +42,10 @@ describe( 'EasyImage', () => {
 
 		return ClassicTestEditor
 			.create( div, {
-				plugins: [ EasyImage ]
+				plugins: [ EasyImage ],
+				cloudServices: {
+					tokenUrl: 'abc',
+				}
 			} )
 			.then( editor => {
 				const easyImage = editor.plugins.get( EasyImage );