From 96ea42edceb535ad2a607d8f8c336266153f0839 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sat, 9 Nov 2019 21:13:40 +0100 Subject: [PATCH] Fix tests --- src/canvas/index.js | 6 +- src/canvas/view/FrameView.js | 28 +------- src/dom_components/model/Components.js | 2 +- src/dom_components/view/ComponentView.js | 3 +- src/editor/config/config.js | 4 +- test/specs/dom_components/model/Component.js | 67 +++++-------------- .../dom_components/view/ComponentsView.js | 5 +- test/specs/grapesjs/index.js | 14 ++-- test/specs/keymaps/index.js | 2 +- 9 files changed, 35 insertions(+), 96 deletions(-) diff --git a/src/canvas/index.js b/src/canvas/index.js index 11a52b86b..6ba0083c9 100644 --- a/src/canvas/index.js +++ b/src/canvas/index.js @@ -133,7 +133,8 @@ export default () => { * @return {HTMLIFrameElement} */ getFrameEl() { - return CanvasView.frame.el; + const { frame } = CanvasView; + return frame && frame.el; }, getFramesEl() { @@ -153,7 +154,8 @@ export default () => { * @return {HTMLDocument} */ getDocument() { - return this.getFrameEl().contentDocument; + const frame = this.getFrameEl(); + return frame && frame.contentDocument; }, /** diff --git a/src/canvas/view/FrameView.js b/src/canvas/view/FrameView.js index 13328ca07..1d2db3894 100644 --- a/src/canvas/view/FrameView.js +++ b/src/canvas/view/FrameView.js @@ -259,33 +259,7 @@ export default Backbone.View.extend({ append( body, ` `; const added = dcomp.addComponent(block); + const addComps = added.components(); // Let's check if everthing is working as expected expect(Object.keys(dcomp.componentsById).length).toBe(3); // + 1 wrapper expect(added.getId()).toBe(id); - expect( - added - .components() - .at(0) - .getId() - ).toBe(idB); + expect(addComps.at(0).getId()).toBe(idB); const cc = em.get('CssComposer'); - expect(cc.getAll().length).toBe(3); - expect( - cc - .getAll() - .at(0) - .selectorsToString() - ).toBe(`#${id}`); - expect( - cc - .getAll() - .at(1) - .selectorsToString() - ).toBe(`#${id}:hover`); - expect( - cc - .getAll() - .at(2) - .selectorsToString() - ).toBe(`#${idB}`); + const rules = cc.getAll(); + expect(rules.length).toBe(3); + expect(rules.at(0).selectorsToString()).toBe(`#${id}`); + expect(rules.at(1).selectorsToString()).toBe(`#${id}:hover`); + expect(rules.at(2).selectorsToString()).toBe(`#${idB}`); // Now let's add the same block const added2 = dcomp.addComponent(block); + const addComps2 = added2.components(); const id2 = added2.getId(); const newId = `${id}-2`; const newIdB = `${idB}-2`; expect(id2).toBe(newId); - expect( - added2 - .components() - .at(0) - .getId() - ).toBe(newIdB); - expect(cc.getAll().length).toBe(6); - expect( - cc - .getAll() - .at(3) - .selectorsToString() - ).toBe(`#${newId}`); - expect( - cc - .getAll() - .at(4) - .selectorsToString() - ).toBe(`#${newId}:hover`); - expect( - cc - .getAll() - .at(5) - .selectorsToString() - ).toBe(`#${newIdB}`); + expect(addComps2.at(0).getId()).toBe(newIdB); + expect(rules.length).toBe(6); + expect(rules.at(3).selectorsToString()).toBe(`#${newId}`); + expect(rules.at(4).selectorsToString()).toBe(`#${newId}:hover`); + expect(rules.at(5).selectorsToString()).toBe(`#${newIdB}`); }); }); diff --git a/test/specs/dom_components/view/ComponentsView.js b/test/specs/dom_components/view/ComponentsView.js index 345253d16..2cf5656c4 100644 --- a/test/specs/dom_components/view/ComponentsView.js +++ b/test/specs/dom_components/view/ComponentsView.js @@ -1,18 +1,19 @@ import DomComponents from 'dom_components'; import ComponentsView from 'dom_components/view/ComponentsView'; import Components from 'dom_components/model/Components'; +import Editor from 'editor/model/Editor'; describe('ComponentsView', () => { - var $fixtures; - var $fixture; var model; var view; var dcomp; var compOpts; + const em = new Editor(); beforeEach(() => { dcomp = new DomComponents(); compOpts = { + em, componentTypes: dcomp.componentTypes }; model = new Components([], compOpts); diff --git a/test/specs/grapesjs/index.js b/test/specs/grapesjs/index.js index 759b33005..a10bd6702 100644 --- a/test/specs/grapesjs/index.js +++ b/test/specs/grapesjs/index.js @@ -85,19 +85,17 @@ describe('GrapesJS', () => { expect(editor.getStyle().length).toEqual(0); }); - test('Editor canvas baseCSS can be overwritten', () => { + test.only('Editor canvas baseCSS can be overwritten', () => { config.components = htmlString; config.baseCss = '#wrapper { background-color: #eee; }'; config.protectedCss = ''; + const editor = obj.init(config); + const body = editor.Canvas.getBody(); - var editor = obj.init(config); - - expect(window.frames[0].document.documentElement.outerHTML).toContain( - config.baseCss + expect(body.outerHTML).toContain(config.baseCss); + expect(body.outerHTML.replace(/\s+/g, ` `)).not.toContain( + `body { margin: 0;` ); - expect( - window.frames[0].document.documentElement.outerHTML.replace(/\s+/g, ` `) - ).not.toContain(`body { margin: 0;`); }); test('Editor canvas baseCSS defaults to sensible values if not defined', () => { diff --git a/test/specs/keymaps/index.js b/test/specs/keymaps/index.js index 6c507d681..9bbd8a660 100644 --- a/test/specs/keymaps/index.js +++ b/test/specs/keymaps/index.js @@ -41,7 +41,7 @@ describe('Keymaps', () => { const id = 'test'; const keys = 'ctrl+a'; const handler = () => {}; - const model = obj.add(id, 'ctrl+a', handler); + const model = obj.add(id, keys, handler); const removed = obj.remove(id); expect(obj.get(id)).toEqual(undefined); expect(obj.getAll()).toEqual({});