浏览代码

Fix test for specific conten normalizers.

Mateusz Samsel 6 年之前
父节点
当前提交
46082cc1dc

+ 1 - 1
packages/ckeditor5-paste-from-office/src/normalizers/googledocs.js

@@ -15,7 +15,7 @@ export const googleDocsNormalizer = ( () => {
 		activationTrigger: contentString => /id=("|')docs-internal-guid-[-0-9a-f]+("|')/.test( contentString )
 	} );
 
-	normalizer.addFilter( data => {
+	normalizer.addFilter( ( { data } ) => {
 		removeBoldTagWrapper( data.content );
 	} );
 

+ 1 - 1
packages/ckeditor5-paste-from-office/src/normalizers/msword.js

@@ -19,7 +19,7 @@ export const mswordNormalizer = ( () => {
 			/xmlns:o="urn:schemas-microsoft-com/i.test( contentString )
 	} );
 
-	normalizer.addFilter( data => {
+	normalizer.addFilter( ( { data } ) => {
 		const html = data.dataTransfer.getData( 'text/html' );
 
 		data.content = _normalizeWordInput( html, data.dataTransfer );

+ 21 - 19
packages/ckeditor5-paste-from-office/tests/normalizers/googledocs.js

@@ -13,10 +13,6 @@ import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/html
 describe( 'PasteFromOffice/normalizers/googledocs', () => {
 	const htmlDataProcessor = new HtmlDataProcessor();
 
-	afterEach( () => {
-		normalizer.setInputData( {} );
-	} );
-
 	it( 'should be instance of content normalizers', () => {
 		expect( normalizer ).to.be.instanceOf( ContentNormalizer );
 	} );
@@ -30,7 +26,7 @@ describe( 'PasteFromOffice/normalizers/googledocs', () => {
 			content: htmlDataProcessor.toView( gDocs )
 		};
 
-		normalizer.setInputData( data ).exec();
+		normalizer.transform( data );
 
 		expect( data.isTransformedWithPasteFromOffice ).to.be.true;
 	} );
@@ -40,7 +36,7 @@ describe( 'PasteFromOffice/normalizers/googledocs', () => {
 			dataTransfer: createDataTransfer( { 'text/html': 'foo bar' } )
 		};
 
-		normalizer.setInputData( data ).exec();
+		normalizer.transform( data );
 
 		expect( data.isTransformedWithPasteFromOffice ).to.be.undefined;
 	} );
@@ -54,7 +50,7 @@ describe( 'PasteFromOffice/normalizers/googledocs', () => {
 			content: htmlDataProcessor.toView( gDocs )
 		};
 
-		normalizer.setInputData( data ).exec();
+		normalizer.transform( data );
 
 		expect( data.isTransformedWithPasteFromOffice ).to.be.true;
 		expect( data.content ).to.be.instanceOf( DocumentFragment );
@@ -70,15 +66,18 @@ describe( 'PasteFromOffice/normalizers/googledocs', () => {
 					// eslint-disable-next-line max-len
 					'text/html': '<meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-30db46f5-7fff-15a1-e17c-1234567890ab"></b>'
 				}
-			].forEach( ( data, index ) => {
+			].forEach( ( html, index ) => {
 				it( `should be active for markup #${ index }`, () => {
-					expect( normalizer.isActive ).to.be.false;
+					const data = {
+						dataTransfer: createDataTransfer( html ),
+						content: htmlDataProcessor.toView( html[ 'text/html' ] )
+					};
 
-					normalizer.setInputData( {
-						dataTransfer: createDataTransfer( data )
-					} );
+					expect( data.isTransformedWithPasteFromOffice ).to.be.undefined;
 
-					expect( normalizer.isActive ).to.be.true;
+					normalizer.transform( data );
+
+					expect( data.isTransformedWithPasteFromOffice ).to.be.true;
 				} );
 			} );
 		} );
@@ -91,15 +90,18 @@ describe( 'PasteFromOffice/normalizers/googledocs', () => {
 				{
 					'text/html': '<meta name=Generator content="Microsoft Word 15">'
 				}
-			].forEach( ( data, index ) => {
+			].forEach( ( html, index ) => {
 				it( `should be not active for wrong markup #${ index }`, () => {
-					expect( normalizer.isActive ).to.be.false;
+					const data = {
+						dataTransfer: createDataTransfer( html ),
+						content: htmlDataProcessor.toView( html[ 'text/html' ] )
+					};
+
+					expect( data.isTransformedWithPasteFromOffice ).to.be.undefined;
 
-					normalizer.setInputData( {
-						dataTransfer: createDataTransfer( data )
-					} );
+					normalizer.transform( data );
 
-					expect( normalizer.isActive ).to.be.false;
+					expect( data.isTransformedWithPasteFromOffice ).to.be.undefined;
 				} );
 			} );
 		} );

+ 19 - 19
packages/ckeditor5-paste-from-office/tests/normalizers/msword.js

@@ -10,10 +10,6 @@ import DocumentFragment from '@ckeditor/ckeditor5-engine/src/view/documentfragme
 
 // Functionality of the msword normalizer is tested with autogenerated normalization tests.
 describe( 'PasteFromOffice/normalizers/msword', () => {
-	afterEach( () => {
-		normalizer.setInputData( {} );
-	} );
-
 	it( 'should be instance of content normalizers', () => {
 		expect( normalizer ).to.be.instanceOf( ContentNormalizer );
 	} );
@@ -25,7 +21,7 @@ describe( 'PasteFromOffice/normalizers/msword', () => {
 			} )
 		};
 
-		normalizer.setInputData( data ).exec();
+		normalizer.transform( data );
 
 		expect( data.isTransformedWithPasteFromOffice ).to.be.true;
 	} );
@@ -35,7 +31,7 @@ describe( 'PasteFromOffice/normalizers/msword', () => {
 			dataTransfer: createDataTransfer( { 'text/html': 'foo bar' } )
 		};
 
-		normalizer.setInputData( data ).exec();
+		normalizer.transform( data );
 
 		expect( data.isTransformedWithPasteFromOffice ).to.be.undefined;
 	} );
@@ -47,7 +43,7 @@ describe( 'PasteFromOffice/normalizers/msword', () => {
 			} )
 		};
 
-		normalizer.setInputData( data ).exec();
+		normalizer.transform( data );
 
 		expect( data.content ).to.be.instanceOf( DocumentFragment );
 	} );
@@ -61,15 +57,17 @@ describe( 'PasteFromOffice/normalizers/msword', () => {
 				{
 					'text/html': '<html><head><meta name="Generator"  content=Microsoft Word 15></head></html>'
 				}
-			].forEach( ( data, index ) => {
+			].forEach( ( html, index ) => {
 				it( `should be active for markup #${ index }`, () => {
-					expect( normalizer.isActive ).to.be.false;
+					const data = {
+						dataTransfer: createDataTransfer( html )
+					};
 
-					normalizer.setInputData( {
-						dataTransfer: createDataTransfer( data )
-					} );
+					expect( data.isTransformedWithPasteFromOffice ).to.be.undefined;
 
-					expect( normalizer.isActive ).to.be.true;
+					normalizer.transform( data );
+
+					expect( data.isTransformedWithPasteFromOffice ).to.be.true;
 				} );
 			} );
 		} );
@@ -82,15 +80,17 @@ describe( 'PasteFromOffice/normalizers/msword', () => {
 				{
 					'text/html': '<p id="docs-internal-guid-12345"></p>'
 				}
-			].forEach( ( data, index ) => {
+			].forEach( ( html, index ) => {
 				it( `should be not active for wrong markup #${ index }`, () => {
-					expect( normalizer.isActive ).to.be.false;
+					const data = {
+						dataTransfer: createDataTransfer( html )
+					};
+
+					expect( data.isTransformedWithPasteFromOffice ).to.be.undefined;
 
-					normalizer.setInputData( {
-						dataTransfer: createDataTransfer( data )
-					} );
+					normalizer.transform( data );
 
-					expect( normalizer.isActive ).to.be.false;
+					expect( data.isTransformedWithPasteFromOffice ).to.be.undefined;
 				} );
 			} );
 		} );