8
0
Просмотр исходного кода

Merge pull request #161 from ckeditor/t/153

Tests: Fixed failed tests on other browsers than Chrome when using BrowserStack. Closes #153.
Szymon Kupś 8 лет назад
Родитель
Сommit
7544841531

+ 5 - 4
packages/ckeditor5-image/tests/image/imageengine.js

@@ -10,6 +10,7 @@ import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils
 import buildViewConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildviewconverter';
 import buildModelConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildmodelconverter';
 import { isImageWidget } from '../../src/image/utils';
+import normalizeHtml from '@ckeditor/ckeditor5-utils/tests/_utils/normalizehtml';
 
 describe( 'ImageEngine', () => {
 	let editor, document, viewDocument;
@@ -54,9 +55,9 @@ describe( 'ImageEngine', () => {
 					'<image src="foo.png" alt="alt text" srcset=\'{ "data": "small.png 148w, big.png 1024w" }\'></image>'
 				);
 
-				expect( editor.getData() ).to.equal(
+				expect( normalizeHtml( editor.getData() ) ).to.equal(
 					'<figure class="image">' +
-						'<img srcset="small.png 148w, big.png 1024w" sizes="100vw" alt="alt text" src="foo.png">' +
+						'<img alt="alt text" sizes="100vw" src="foo.png" srcset="small.png 148w, big.png 1024w"></img>' +
 					'</figure>'
 				);
 			} );
@@ -70,9 +71,9 @@ describe( 'ImageEngine', () => {
 					'</image>'
 				);
 
-				expect( editor.getData() ).to.equal(
+				expect( normalizeHtml( editor.getData() ) ).to.equal(
 					'<figure class="image">' +
-						'<img srcset="small.png 148w, big.png 1024w" sizes="100vw" width="1024" alt="alt text" src="foo.png">' +
+						'<img alt="alt text" sizes="100vw" src="foo.png" srcset="small.png 148w, big.png 1024w" width="1024"></img>' +
 					'</figure>'
 				);
 			} );

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

@@ -36,6 +36,7 @@ describe( 'Image integration', () => {
 					contextualToolbar.toolbarView.items.add( button );
 
 					newEditor.editing.view.isFocused = true;
+					newEditor.editing.view.getDomRoot().focus();
 				} );
 		} );