Merge pull request #39 from ckeditor/t/38

t/38: Adapt ClassicTestEditor to Controller–less architecture.
ckeditor · Nov 8, 2016 · 304e2df · 304e2df
2 parents 7389672 + faebb06
commit 304e2df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/tests/_utils-tests/classictesteditor.js b/tests/_utils-tests/classictesteditor.js
@@ -8,7 +8,7 @@
 import StandardEditor from 'ckeditor5/core/editor/standardeditor.js';
 import ClassicTestEditor from 'tests/core/_utils/classictesteditor.js';
 import HtmlDataProcessor from 'ckeditor5/engine/dataprocessor/htmldataprocessor.js';
-import BoxedEditorUI from 'ckeditor5/ui/editorui/boxed/boxededitorui.js';
+import BoxedEditorUIView from 'ckeditor5/ui/editorui/boxed/boxededitoruiview.js';
 import Feature from 'ckeditor5/core/feature.js';
 
 import { getData } from 'ckeditor5/engine/dev-utils/model.js';
@@ -32,6 +32,7 @@ describe( 'ClassicTestEditor', () => {
 
 			expect( editor.config.get( 'foo' ) ).to.equal( 1 );
 			expect( editor ).to.have.property( 'element', editorElement );
+			expect( editor ).to.have.property( 'ui' ).to.instanceOf( BoxedEditorUIView );
 		} );
 
 		it( 'creates model and view roots', () => {
@@ -57,7 +58,7 @@ describe( 'ClassicTestEditor', () => {
 		it( 'creates and initilizes the UI', () => {
 			return ClassicTestEditor.create( editorElement, { foo: 1 } )
 				.then( editor => {
-					expect( editor.ui ).to.be.instanceof( BoxedEditorUI );
+					expect( editor.ui ).to.be.instanceof( BoxedEditorUIView );
 				} );
 		} );
 

diff --git a/tests/_utils/classictesteditor.js b/tests/_utils/classictesteditor.js
@@ -4,10 +4,7 @@
  */
 
 import StandardEditor from 'ckeditor5/core/editor/standardeditor.js';
-
 import HtmlDataProcessor from 'ckeditor5/engine/dataprocessor/htmldataprocessor.js';
-
-import BoxedEditorUI from 'ckeditor5/ui/editorui/boxed/boxededitorui.js';
 import BoxedEditorUIView from 'ckeditor5/ui/editorui/boxed/boxededitoruiview.js';
 
 /**
@@ -24,13 +21,10 @@ export default class ClassicTestEditor extends StandardEditor {
 		super( element, config );
 
 		this.document.createRoot();
-
 		this.editing.createRoot( 'div' );
-
 		this.data.processor = new HtmlDataProcessor();
 
-		this.ui = new BoxedEditorUI( this );
-		this.ui.view = new BoxedEditorUIView( this.locale );
+		this.ui = new BoxedEditorUIView( this, this.locale );
 	}
 
 	/**