Sfoglia il codice sorgente

Changed rejected messages to rejected errors.

Maciej Bukowski 7 anni fa
parent
commit
42f74b6e35

+ 5 - 5
packages/ckeditor-cloud-services-core/src/token/token.js

@@ -96,8 +96,8 @@ class Token {
 	 */
 	_refreshToken() {
 		return this._refresh()
-				.then( value => this.set( 'value', value ) )
-				.then( () => this );
+			.then( value => this.set( 'value', value ) )
+			.then( () => this );
 	}
 
 	/**
@@ -162,14 +162,14 @@ function defaultRefreshToken( tokenUrl ) {
 			const xhrResponse = xhr.response;
 
 			if ( statusCode < 200 || statusCode > 299 ) {
-				return reject( 'Cannot download new token!' );
+				return reject( new Error( 'Cannot download new token!' ) );
 			}
 
 			return resolve( xhrResponse );
 		} );
 
-		xhr.addEventListener( 'error', () => reject( 'Network Error' ) );
-		xhr.addEventListener( 'abort', () => reject( 'Abort' ) );
+		xhr.addEventListener( 'error', () => reject( new Error( 'Network Error' ) ) );
+		xhr.addEventListener( 'abort', () => reject( new Error( 'Abort' ) ) );
 
 		xhr.send();
 	} );

+ 7 - 3
packages/ckeditor-cloud-services-core/src/uploadgateway/fileuploader.js

@@ -176,14 +176,18 @@ class FileUploader {
 				const xhrResponse = xhr.response;
 
 				if ( statusCode < 200 || statusCode > 299 ) {
-					return reject( xhrResponse.message || xhrResponse.error );
+					if ( xhrResponse.message ) {
+						return reject( new Error( xhrResponse.message ) );
+					}
+
+					return reject( xhrResponse.error );
 				}
 
 				return resolve( xhrResponse );
 			} );
 
-			xhr.addEventListener( 'error', () => reject( 'Network Error' ) );
-			xhr.addEventListener( 'abort', () => reject( 'Abort' ) );
+			xhr.addEventListener( 'error', () => reject( new Error( 'Network Error' ) ) );
+			xhr.addEventListener( 'abort', () => reject( new Error( 'Abort' ) ) );
 
 			xhr.send( formData );
 		} );

+ 24 - 24
packages/ckeditor-cloud-services-core/tests/token/token.js

@@ -127,43 +127,43 @@ describe( 'Token', () => {
 				} );
 		} );
 
-		it( 'should throw an error when cannot download new token', done => {
+		it( 'should throw an error when cannot download new token', () => {
 			const token = new Token( 'http://token-endpoint', { initValue: 'initValue', autoRefresh: false } );
-
-			token._refreshToken()
-				.catch( error => {
-					expect( error ).to.equal( 'Cannot download new token!' );
-
-					done();
-				} );
+			const promise = token._refresh();
 
 			requests[ 0 ].respond( 401 );
+
+			return promise.then( () => {
+				throw new Error( 'Promise should be rejected' );
+			}, error => {
+				expect( error ).to.match( /Cannot download new token!/ );
+			} )
 		} );
 
-		it( 'should throw an error when the response is aborted', done => {
+		it( 'should throw an error when the response is aborted', () => {
 			const token = new Token( 'http://token-endpoint', { initValue: 'initValue', autoRefresh: false } );
-
-			token._refreshToken()
-				.catch( error => {
-					expect( error ).to.equal( 'Abort' );
-
-					done();
-				} );
+			const promise = token._refresh();
 
 			requests[ 0 ].abort();
+
+			return promise.then( () => {
+				throw new Error( 'Promise should be rejected' );
+			}, error => {
+				expect( error ).to.match( /Abort/ );
+			} )
 		} );
 
-		it( 'should throw an error when network error occurs', done => {
+		it( 'should throw an error when network error occurs', () => {
 			const token = new Token( 'http://token-endpoint', { initValue: 'initValue', autoRefresh: false } );
-
-			token._refreshToken()
-				.catch( error => {
-					expect( error ).to.equal( 'Network Error' );
-
-					done();
-				} );
+			const promise = token._refresh();
 
 			requests[ 0 ].error();
+
+			return promise.then( () => {
+				throw new Error( 'Promise should be rejected' );
+			}, error => {
+				expect( error ).to.match( /Network Error/ );
+			} )
 		} );
 
 		it( 'should throw an error when the callback throws error', () => {