Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Aligned view tests to changes in view document.
Browse files Browse the repository at this point in the history
  • Loading branch information
@oskarwrobel
oskarwrobel committed Jan 9, 2018
1 parent f45fe42 commit 3e217b3
Show file tree
Hide file tree
Showing 14 changed files with 66 additions and 68 deletions.
30 changes: 10 additions & 20 deletions tests/view/document/document.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

/* globals document */

import RootEditableElement from '../../../src/view/rooteditableelement';
import createElement from '@ckeditor/ckeditor5-utils/src/dom/createelement';
import Document from '../../../src/view/document';
import Observer from '../../../src/view/observer/observer';
Expand All @@ -21,6 +20,7 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
import count from '@ckeditor/ckeditor5-utils/src/count';
import log from '@ckeditor/ckeditor5-utils/src/log';
import global from '@ckeditor/ckeditor5-utils/src/dom/global';
import createViewRoot from '../_utils/createroot';

testUtils.createSinonSandbox();

Expand Down Expand Up @@ -92,7 +92,7 @@ describe( 'Document', () => {
describe( 'attachDomRoot()', () => {
it( 'should attach DOM element to main view element', () => {
const domDiv = document.createElement( 'div' );
const viewRoot = createRoot( 'div', 'main', viewDocument );
const viewRoot = createViewRoot( viewDocument, 'div', 'main' );

expect( count( viewDocument.domRoots ) ).to.equal( 0 );

Expand All @@ -108,7 +108,7 @@ describe( 'Document', () => {

it( 'should attach DOM element to custom view element', () => {
const domH1 = document.createElement( 'h1' );
const viewH1 = createRoot( 'h1', 'header', viewDocument );
const viewH1 = createViewRoot( viewDocument, 'h1', 'header' );

expect( count( viewDocument.domRoots ) ).to.equal( 0 );

Expand Down Expand Up @@ -136,7 +136,7 @@ describe( 'Document', () => {
const observerMock = viewDocument.addObserver( ObserverMock );
const observerMockGlobalCount = viewDocument.addObserver( ObserverMockGlobalCount );

createRoot( 'div', 'root1', viewDocument );
createViewRoot( viewDocument, 'div', 'root1' );
viewDocument.attachDomRoot( document.createElement( 'div' ), 'root1' );

sinon.assert.calledOnce( observerMock.observe );
Expand All @@ -146,15 +146,15 @@ describe( 'Document', () => {

describe( 'getRoot()', () => {
it( 'should return "main" root', () => {
createRoot( 'div', 'main', viewDocument );
createViewRoot( viewDocument, 'div', 'main' );

expect( count( viewDocument.roots ) ).to.equal( 1 );

expect( viewDocument.getRoot() ).to.equal( viewDocument.roots.get( 'main' ) );
} );

it( 'should return named root', () => {
createRoot( 'h1', 'header', viewDocument );
createViewRoot( viewDocument, 'h1', 'header' );

expect( count( viewDocument.roots ) ).to.equal( 1 );

Expand Down Expand Up @@ -229,8 +229,8 @@ describe( 'Document', () => {
} );

it( 'should call observe on each root', () => {
createRoot( 'div', 'roo1', viewDocument );
createRoot( 'div', 'roo2', viewDocument );
createViewRoot( viewDocument, 'div', 'roo1' );
createViewRoot( viewDocument, 'div', 'roo2' );

viewDocument.attachDomRoot( document.createElement( 'div' ), 'roo1' );
viewDocument.attachDomRoot( document.createElement( 'div' ), 'roo2' );
Expand Down Expand Up @@ -271,7 +271,7 @@ describe( 'Document', () => {
} );

it( 'scrolls to the first range in selection with an offset', () => {
const root = createRoot( 'div', 'main', viewDocument );
const root = createViewRoot( viewDocument, 'div', 'main' );
const stub = testUtils.sinon.stub( global.window, 'scrollTo' );
const range = ViewRange.createIn( root );

Expand Down Expand Up @@ -340,7 +340,7 @@ describe( 'Document', () => {
domEditable = document.createElement( 'div' );
domEditable.setAttribute( 'contenteditable', 'true' );
document.body.appendChild( domEditable );
viewEditable = createRoot( 'div', 'main', viewDocument );
viewEditable = createViewRoot( viewDocument, 'div', 'main' );
viewDocument.attachDomRoot( domEditable );
viewDocument.selection.addRange( ViewRange.createFromParentsAndOffsets( viewEditable, 0, viewEditable, 0 ) );
} );
Expand Down Expand Up @@ -408,13 +408,3 @@ describe( 'Document', () => {
} );
} );
} );

function createRoot( name, rootName, viewDoc ) {
const viewRoot = new RootEditableElement( name );

viewRoot.rootName = rootName;
viewRoot.document = viewDoc;
viewDoc.roots.add( viewRoot );

return viewRoot;
}
14 changes: 2 additions & 12 deletions tests/view/document/jumpoverinlinefiller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

/* globals document */

import RootEditableElement from '../../../src/view/rooteditableelement';
import ViewRange from '../../../src/view/range';
import ViewDocument from '../../../src/view/document';
import { INLINE_FILLER_LENGTH, isInlineFiller, startsWithFiller } from '../../../src/view/filler';

import createViewRoot from '../_utils/createroot';
import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
import createElement from '@ckeditor/ckeditor5-utils/src/dom/createelement';

Expand All @@ -25,7 +25,7 @@ describe( 'Document', () => {
document.body.appendChild( domRoot );

viewDocument = new ViewDocument();
createRoot( 'div', 'main', viewDocument );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domRoot );

document.getSelection().removeAllRanges();
Expand Down Expand Up @@ -135,13 +135,3 @@ describe( 'Document', () => {
} );
} );
} );

function createRoot( name, rootName, viewDoc ) {
const viewRoot = new RootEditableElement( name );

viewRoot.rootName = rootName;
viewRoot.document = viewDoc;
viewDoc.roots.add( viewRoot );

return viewRoot;
}
14 changes: 2 additions & 12 deletions tests/view/document/jumpoveruielement.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

import ViewDocument from '../../../src/view/document';
import UIElement from '../../../src/view/uielement';
import RootEditableElement from '../../../src/view/rooteditableelement';
import ViewContainerElement from '../../../src/view/containerelement';
import ViewAttribtueElement from '../../../src/view/attributeelement';
import ViewText from '../../../src/view/text';
import ViewRange from '../../../src/view/range';
import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
import createElement from '@ckeditor/ckeditor5-utils/src/dom/createelement';
import createViewRoot from '../_utils/createroot';
import { setData as setViewData } from '../../../src/dev-utils/view';
import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';

Expand All @@ -36,7 +36,7 @@ describe( 'Document', () => {
document.body.appendChild( domRoot );

viewDocument = new ViewDocument();
viewRoot = createRoot( 'div', 'main', viewDocument );
viewRoot = createViewRoot( viewDocument );
viewDocument.attachDomRoot( domRoot );

domSelection = document.getSelection();
Expand Down Expand Up @@ -82,16 +82,6 @@ describe( 'Document', () => {
}
}

function createRoot( name, rootName, viewDoc ) {
const viewRoot = new RootEditableElement( name );

viewRoot.rootName = rootName;
viewRoot.document = viewDoc;
viewDoc.roots.add( viewRoot );

return viewRoot;
}

describe( 'jump over ui element handler', () => {
describe( 'collapsed selection', () => {
it( 'do nothing when another key is pressed', () => {
Expand Down
7 changes: 5 additions & 2 deletions tests/view/manual/clickobserver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Document from '../../../src/view/document';
import DomEventObserver from '../../../src/view/observer/domeventobserver';
import createViewRoot from '../_utils/createroot';

const viewDocument = new Document();

Expand Down Expand Up @@ -45,8 +46,10 @@ document.getElementById( 'disable1' ).addEventListener( 'click', () => observer1
// Random order.
viewDocument.addObserver( ClickObserver1 );

viewDocument.createRoot( document.getElementById( 'clickerA' ), 'clickerA' );
createViewRoot( viewDocument, 'div', 'clickerA' );
viewDocument.attachDomRoot( document.getElementById( 'clickerA' ), 'clickerA' );

viewDocument.addObserver( ClickObserver2 );

viewDocument.createRoot( document.getElementById( 'clickerB' ), 'clickerB' );
createViewRoot( viewDocument, 'div', 'clickerB' );
viewDocument.attachDomRoot( document.getElementById( 'clickerB' ), 'clickerB' );
5 changes: 4 additions & 1 deletion tests/view/manual/fakeselection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
import ViewDocument from '../../../src/view/document';
import DomEventObserver from '../../../src/view/observer/domeventobserver';
import ViewRange from '../../../src/view/range';
import createViewRoot from '../_utils/createroot';
import { setData } from '../../../src/dev-utils/view';

const viewDocument = new ViewDocument();
const domEditable = document.getElementById( 'editor' );
const viewRoot = viewDocument.createRoot( domEditable );
const viewRoot = createViewRoot();
let viewStrong;

viewDocument.attachDomRoot( domEditable );

// Add mouseup oberver.
viewDocument.addObserver( class extends DomEventObserver {
get domEventType() {
Expand Down
19 changes: 13 additions & 6 deletions tests/view/observer/domeventobserver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import DomEventObserver from '../../../src/view/observer/domeventobserver';
import Observer from '../../../src/view/observer/observer';
import ViewDocument from '../../../src/view/document';
import UIElement from '../../../src/view/uielement';
import createViewRoot from '../_utils/createroot';

class ClickObserver extends DomEventObserver {
constructor( document ) {
Expand Down Expand Up @@ -66,7 +67,8 @@ describe( 'DomEventObserver', () => {
const domEvent = new MouseEvent( 'click' );
const evtSpy = sinon.spy();

viewDocument.createRoot( domElement, 'root' );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domElement );
viewDocument.addObserver( ClickObserver );
viewDocument.on( 'click', evtSpy );

Expand All @@ -88,7 +90,8 @@ describe( 'DomEventObserver', () => {
const evtSpy1 = sinon.spy();
const evtSpy2 = sinon.spy();

viewDocument.createRoot( domElement, 'root' );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domElement );
viewDocument.addObserver( MultiObserver );
viewDocument.on( 'evt1', evtSpy1 );
viewDocument.on( 'evt2', evtSpy2 );
Expand All @@ -105,7 +108,8 @@ describe( 'DomEventObserver', () => {
const domEvent = new MouseEvent( 'click' );
const evtSpy = sinon.spy();

viewDocument.createRoot( domElement, 'root' );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domElement );
const testObserver = viewDocument.addObserver( ClickObserver );
viewDocument.on( 'click', evtSpy );

Expand All @@ -121,7 +125,8 @@ describe( 'DomEventObserver', () => {
const domEvent = new MouseEvent( 'click' );
const evtSpy = sinon.spy();

viewDocument.createRoot( domElement, 'root' );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domElement );
const testObserver = viewDocument.addObserver( ClickObserver );
viewDocument.on( 'click', evtSpy );

Expand All @@ -143,7 +148,8 @@ describe( 'DomEventObserver', () => {
const childDomElement = document.createElement( 'p' );
const domEvent = new MouseEvent( 'click' );
domElement.appendChild( childDomElement );
viewDocument.createRoot( domElement, 'root' );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domElement );
viewDocument.addObserver( ClickCapturingObserver );

viewDocument.on( 'click', ( evt, domEventData ) => {
Expand All @@ -168,7 +174,8 @@ describe( 'DomEventObserver', () => {

beforeEach( () => {
domRoot = document.createElement( 'div' );
const viewRoot = viewDocument.createRoot( domRoot, 'root' );
const viewRoot = createViewRoot( viewDocument );
viewDocument.attachDomRoot( domRoot );
uiElement = new MyUIElement( 'p' );
viewRoot.appendChildren( uiElement );
viewDocument.render();
Expand Down
4 changes: 3 additions & 1 deletion tests/view/observer/fakeselectionobserver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import createElement from '@ckeditor/ckeditor5-utils/src/dom/createelement';
import FakeSelectionObserver from '../../../src/view/observer/fakeselectionobserver';
import ViewDocument from '../../../src/view/document';
import DomEventData from '../../../src/view/observer/domeventdata';
import createViewRoot from '../_utils/createroot';
import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
import { setData, stringify } from '../../../src/dev-utils/view';

Expand All @@ -28,7 +29,8 @@ describe( 'FakeSelectionObserver', () => {

beforeEach( () => {
viewDocument = new ViewDocument();
root = viewDocument.createRoot( domRoot );
root = createViewRoot( viewDocument );
viewDocument.attachDomRoot( domRoot );
observer = viewDocument.getObserver( FakeSelectionObserver );
viewDocument.selection.setFake();
} );
Expand Down
7 changes: 5 additions & 2 deletions tests/view/observer/focusobserver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import FocusObserver from '../../../src/view/observer/focusobserver';
import ViewDocument from '../../../src/view/document';
import ViewRange from '../../../src/view/range';
import createViewRoot from '../_utils/createroot';
import { setData } from '../../../src/dev-utils/view';

describe( 'FocusObserver', () => {
Expand Down Expand Up @@ -72,7 +73,8 @@ describe( 'FocusObserver', () => {
domMain = document.createElement( 'div' );
domHeader = document.createElement( 'h1' );

viewMain = viewDocument.createRoot( domMain );
viewMain = createViewRoot( viewDocument );
viewDocument.attachDomRoot( domMain );
} );

it( 'should set isFocused to true on focus', () => {
Expand Down Expand Up @@ -149,7 +151,8 @@ describe( 'FocusObserver', () => {
document.body.appendChild( domRoot );

viewDocument = new ViewDocument();
viewDocument.createRoot( domRoot );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domRoot );

observer = viewDocument.getObserver( FocusObserver );
} );
Expand Down
10 changes: 7 additions & 3 deletions tests/view/observer/mutationobserver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import ViewDocument from '../../../src/view/document';
import MutationObserver from '../../../src/view/observer/mutationobserver';
import UIElement from '../../../src/view/uielement';
import createViewRoot from '../_utils/createroot';
import { parse } from '../../../src/dev-utils/view';

describe( 'MutationObserver', () => {
Expand All @@ -22,7 +23,8 @@ describe( 'MutationObserver', () => {
domEditor = document.getElementById( 'main' );
lastMutations = null;

viewDocument.createRoot( domEditor );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domEditor );
viewDocument.selection.removeAllRanges();
document.getSelection().removeAllRanges();

Expand Down Expand Up @@ -62,7 +64,8 @@ describe( 'MutationObserver', () => {
it( 'should not observe if disabled', () => {
const additional = document.getElementById( 'additional' );
mutationObserver.disable();
viewDocument.createRoot( additional, 'additional' );
createViewRoot( viewDocument, 'div', 'additional' );
viewDocument.attachDomRoot( additional, 'additional' );

additional.textContent = 'foobar';
mutationObserver.flush();
Expand Down Expand Up @@ -196,7 +199,8 @@ describe( 'MutationObserver', () => {
const domAdditionalEditor = document.getElementById( 'additional' );

// Prepare AdditionalEditor
viewDocument.createRoot( domAdditionalEditor, 'additional' );
createViewRoot( viewDocument, 'div', 'additional' );
viewDocument.attachDomRoot( domAdditionalEditor, 'additional' );

viewDocument.getRoot( 'additional' ).appendChildren(
parse( '<container:p>foo</container:p><container:p>bar</container:p>' ) );
Expand Down
7 changes: 5 additions & 2 deletions tests/view/observer/selectionobserver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import ViewDocument from '../../../src/view/document';
import SelectionObserver from '../../../src/view/observer/selectionobserver';
import FocusObserver from '../../../src/view/observer/focusobserver';
import log from '@ckeditor/ckeditor5-utils/src/log';
import createViewRoot from '../_utils/createroot';
import { parse } from '../../../src/dev-utils/view';

testUtils.createSinonSandbox();
Expand All @@ -27,7 +28,8 @@ describe( 'SelectionObserver', () => {
domDocument.body.appendChild( domRoot );

viewDocument = new ViewDocument();
viewDocument.createRoot( domMain );
createViewRoot( viewDocument );
viewDocument.attachDomRoot( domMain );

selectionObserver = viewDocument.getObserver( SelectionObserver );

Expand Down Expand Up @@ -83,7 +85,8 @@ describe( 'SelectionObserver', () => {

it( 'should add only one listener to one document', done => {
// Add second roots to ensure that listener is added once.
viewDocument.createRoot( domDocument.getElementById( 'additional' ), 'additional' );
createViewRoot( viewDocument, 'div', 'additional' );
viewDocument.attachDomRoot( domDocument.getElementById( 'additional' ), 'additional' );

viewDocument.on( 'selectionChange', () => {
done();
Expand Down
Loading

0 comments on commit 3e217b3

Please sign in to comment.