From 111d6aebf8f9811979ae75635980b966249789cd Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Fri, 11 Feb 2022 14:57:10 +0100 Subject: [PATCH] Update tests --- src/editor/index.js | 2 + src/rich_text_editor/model/RichTextEditor.js | 2 - test/specs/code_manager/index.js | 1 - test/specs/dom_components/index.js | 58 ++++++++----------- test/specs/dom_components/model/Component.js | 2 +- .../dom_components/view/ComponentTextView.js | 18 +++--- test/specs/dom_components/view/ComponentV.js | 34 +++++++---- test/specs/panels/index.js | 27 +-------- test/specs/storage_manager/index.js | 7 +-- 9 files changed, 66 insertions(+), 85 deletions(-) diff --git a/src/editor/index.js b/src/editor/index.js index ebb0f889b..9aee8018c 100644 --- a/src/editor/index.js +++ b/src/editor/index.js @@ -79,6 +79,8 @@ export default (config = {}, opts = {}) => { */ editor: em, + modules: [], + /** * Initialize editor model * @return {this} diff --git a/src/rich_text_editor/model/RichTextEditor.js b/src/rich_text_editor/model/RichTextEditor.js index 7b0edf41d..a65d0fc71 100644 --- a/src/rich_text_editor/model/RichTextEditor.js +++ b/src/rich_text_editor/model/RichTextEditor.js @@ -132,8 +132,6 @@ export default class RichTextEditor { } settings.styleWithCSS && this.exec('styleWithCSS'); - this.syncActions(); - return this; } diff --git a/test/specs/code_manager/index.js b/test/specs/code_manager/index.js index 7975d6dee..a1057751f 100644 --- a/test/specs/code_manager/index.js +++ b/test/specs/code_manager/index.js @@ -1,5 +1,4 @@ import CodeManager from 'code_manager'; -import Models from './model/CodeModels'; describe('Code Manager', () => { describe('Main', () => { diff --git a/test/specs/dom_components/index.js b/test/specs/dom_components/index.js index a988733b3..4c9a58a8f 100644 --- a/test/specs/dom_components/index.js +++ b/test/specs/dom_components/index.js @@ -1,10 +1,5 @@ import DomComponents from 'dom_components'; import Components from 'dom_components/model/Components'; -import ComponentModels from './model/Component'; -import ComponentView from './view/ComponentV'; -import ComponentsView from './view/ComponentsView'; -import ComponentTextView from './view/ComponentTextView'; -import ComponentImageView from './view/ComponentImageView'; import Editor from 'editor/model/Editor'; import utils from './../../test_utils.js'; @@ -16,7 +11,7 @@ describe('DOM Components', () => { var storagMock = utils.storageMock(); var editorModel = { config: { - loadCompsOnRender: 0 + loadCompsOnRender: 0, }, get() { return {}; @@ -35,14 +30,14 @@ describe('DOM Components', () => { }, getCacheLoad() { return storagMock.load(); - } + }, }; // Methods var setSmConfig = () => { config.stm = storagMock; config.stm.getConfig = () => ({ storeHtml: 1, - storeComponents: 1 + storeComponents: 1, }); }; var setEm = () => { @@ -51,12 +46,12 @@ describe('DOM Components', () => { beforeEach(() => { em = new Editor({ - avoidInlineStyle: 1 + avoidInlineStyle: 1, }); em.get('PageManager').onLoad(); config = { em, - storeWrapper: 1 + storeWrapper: 1, }; obj = em.get('DomComponents'); // obj = new DomComponents().init(config); @@ -79,9 +74,9 @@ describe('DOM Components', () => { getConfig() { return { storeHtml: 1, - storeComponents: 1 + storeComponents: 1, }; - } + }, }; expect(obj.storageKey()).toEqual(['html', 'components']); }); @@ -94,7 +89,7 @@ describe('DOM Components', () => { (obj = em.get('DomComponents').init(config)); var expected = { html: 'testHtml', - components: JSON.stringify(obj.getWrapper()) + components: JSON.stringify(obj.getWrapper()), }; expect(obj.store(1)).toEqual(expected); }); @@ -112,7 +107,7 @@ describe('DOM Components', () => { const result = [{}, {}]; expect( obj.load({ - components: '[{}, {}]' + components: '[{}, {}]', }) ).toEqual(result); }); @@ -121,7 +116,7 @@ describe('DOM Components', () => { const result = [{}, {}]; expect( obj.load({ - components: result + components: result, }) ).toEqual(result); }); @@ -130,7 +125,7 @@ describe('DOM Components', () => { const result = {}; expect( obj.load({ - components: result + components: result, }) ).toEqual(result); }); @@ -164,16 +159,13 @@ describe('DOM Components', () => { `); expect(em.getHtml()).toEqual(`
Text
`); expect(obj.getComponents().length).toEqual(1); - obj - .getComponents() - .first() - .addStyle({ margin: '10px' }); + obj.getComponents().first().addStyle({ margin: '10px' }); expect(cc.getAll().length).toEqual(1); expect(cc.getIdRule(id).getStyle()).toEqual({ color: 'red', 'background-color': 'red', padding: '50px 100px', - margin: '10px' + margin: '10px', }); }); @@ -185,9 +177,9 @@ describe('DOM Components', () => { obj.addType(id, { model: { defaults: { - testProp - } - } + testProp, + }, + }, }); expect(obj.componentTypes.length).toEqual(initialTypes + 1); obj.addComponent(`
`); @@ -203,7 +195,7 @@ describe('DOM Components', () => { obj.addType(id, { isComponent: el => { return el.getAttribute('test-prop') === testProp; - } + }, }); expect(obj.componentTypes[0].id).toEqual(id); obj.addComponent(`
`); @@ -220,14 +212,14 @@ describe('DOM Components', () => { obj.addType(id, { model: { defaults: () => ({ - testProp - }) + testProp, + }), }, view: { onRender() { this.el.style.backgroundColor = 'red'; - } - } + }, + }, }); expect(obj.getTypes().length).toBe(initialTypes); obj.addComponent(``); @@ -245,9 +237,9 @@ describe('DOM Components', () => { extend: 'image', model: { defaults: { - testProp - } - } + testProp, + }, + }, }); obj.addComponent(``); expect(obj.getTypes()[0].id).toEqual(id); @@ -264,7 +256,7 @@ describe('DOM Components', () => { const testProp = 'testValue'; obj.addType(id, { extend: 'image', - isComponent: el => el.getAttribute('test-prop') === testProp + isComponent: el => el.getAttribute('test-prop') === testProp, }); obj.addComponent(``); expect(obj.getTypes()[0].id).toEqual(id); diff --git a/test/specs/dom_components/model/Component.js b/test/specs/dom_components/model/Component.js index 71cfaf4f1..d3ad46606 100644 --- a/test/specs/dom_components/model/Component.js +++ b/test/specs/dom_components/model/Component.js @@ -75,7 +75,7 @@ describe('Component', () => { }); test('Has expected name', () => { - expect(obj.getName()).toEqual('Box'); + expect(obj.getName()).toEqual('Div'); }); test('Has expected name 2', () => { diff --git a/test/specs/dom_components/view/ComponentTextView.js b/test/specs/dom_components/view/ComponentTextView.js index 4a35fb63f..e74dd7aad 100644 --- a/test/specs/dom_components/view/ComponentTextView.js +++ b/test/specs/dom_components/view/ComponentTextView.js @@ -2,18 +2,20 @@ import ComponentTextView from 'dom_components/view/ComponentTextView'; import Component from 'dom_components/model/Component'; describe('ComponentTextView', () => { - var fixtures; - var model; - var view; + let fixtures; + let model; + let view; + let el; beforeEach(() => { model = new Component(); view = new ComponentTextView({ - model + model, }); document.body.innerHTML = '
'; fixtures = document.body.querySelector('#fixtures'); - fixtures.appendChild(view.render().el); + el = view.render().el; + fixtures.appendChild(el); }); afterEach(() => { @@ -22,7 +24,7 @@ describe('ComponentTextView', () => { test('Component empty', () => { expect(fixtures.innerHTML).toEqual( - '
' + `
` ); }); @@ -47,11 +49,11 @@ describe('ComponentTextView', () => { fakeRteContent = 'fakeRteContent'; fakeRte = { - getContent: jest.fn(() => fakeRteContent) + getContent: jest.fn(() => fakeRteContent), }; fakeChildContainer = { - innerHTML: 'fakeChildInnerHTML' + innerHTML: 'fakeChildInnerHTML', }; spyOn(view, 'getChildrenContainer').and.returnValue(fakeChildContainer); diff --git a/test/specs/dom_components/view/ComponentV.js b/test/specs/dom_components/view/ComponentV.js index 8cafada77..ef066bdb8 100644 --- a/test/specs/dom_components/view/ComponentV.js +++ b/test/specs/dom_components/view/ComponentV.js @@ -4,13 +4,13 @@ import DomComponents from 'dom_components'; import Editor from 'editor/model/Editor'; describe('ComponentView', () => { - var fixtures; - var model; - var view; - var hClass = 'hc-state'; - var dcomp; - var compOpts; + let fixtures; + let model; + let view; + let dcomp; + let compOpts; let em; + let el; beforeEach(() => { em = new Editor({}); @@ -26,7 +26,8 @@ describe('ComponentView', () => { em.get('StyleManager').render(); // Enable to listen em.setState document.body.innerHTML = '
'; fixtures = document.body.querySelector('#fixtures'); - fixtures.appendChild(view.render().el); + el = view.render().el; + fixtures.appendChild(el); }); afterEach(() => { @@ -34,19 +35,25 @@ describe('ComponentView', () => { }); test('Component empty', () => { - expect(fixtures.innerHTML).toEqual('
'); + expect(fixtures.innerHTML).toEqual( + `
` + ); }); test('Clean form helper state', () => { em.setSelected(model); em.setState('test'); em.setState(); - expect(fixtures.innerHTML).toEqual('
'); + expect(fixtures.innerHTML).toEqual( + `
` + ); }); test('Add helper class on status update', () => { model.set('status', 'selected'); - expect(fixtures.innerHTML).toEqual('
'); + expect(fixtures.innerHTML).toEqual( + `
` + ); }); test('Get string of classes', () => { @@ -114,9 +121,12 @@ describe('ComponentView', () => { componentTypes: dcomp.componentTypes, }); fixtures.innerHTML = ''; - fixtures.appendChild(view.render().el); + el = view.render().el; + fixtures.appendChild(el); + const firstId = el.children[0].id; + const secondId = el.children[1].id; expect(view.$el.html()).toEqual( - '
' + `
` ); }); diff --git a/test/specs/panels/index.js b/test/specs/panels/index.js index ec48c5cd6..d1dc52ca9 100644 --- a/test/specs/panels/index.js +++ b/test/specs/panels/index.js @@ -1,10 +1,4 @@ import Panels from 'panels'; -import e2e from './e2e/PanelsE2e'; -import Models from './model/PanelModels'; -import PanelView from './view/PanelView'; -import PanelsView from './view/PanelsView'; -import ButtonView from './view/ButtonView'; -import ButtonsView from './view/ButtonsView'; describe('Panels', () => { describe('Main', () => { @@ -60,12 +54,7 @@ describe('Panels', () => { var panel = obj.addPanel({ id: 'test' }); var btn = obj.addButton('test', { id: 'btn' }); expect(panel.get('buttons').length).toEqual(1); - expect( - panel - .get('buttons') - .at(0) - .get('id') - ).toEqual('btn'); + expect(panel.get('buttons').at(0).get('id')).toEqual('btn'); }); test('getButton returns null in case there is no requested panel', () => { @@ -114,12 +103,7 @@ describe('Panels', () => { var panel = obj.addPanel({ id: 'test' }); var btn = obj.addButton('test', { id: 'btn' }); expect(panel.get('buttons').length).toEqual(1); - expect( - panel - .get('buttons') - .at(0) - .get('id') - ).toEqual('btn'); + expect(panel.get('buttons').at(0).get('id')).toEqual('btn'); expect(obj.removeButton('test', { id: 'btn' })).toEqual(btn); expect(panel.get('buttons').length).toEqual(0); }); @@ -128,12 +112,7 @@ describe('Panels', () => { var panel = obj.addPanel({ id: 'test' }); var btn = obj.addButton('test', { id: 'btn' }); expect(panel.get('buttons').length).toEqual(1); - expect( - panel - .get('buttons') - .at(0) - .get('id') - ).toEqual('btn'); + expect(panel.get('buttons').at(0).get('id')).toEqual('btn'); expect(obj.removeButton('test', 'btn')).toEqual(btn); expect(panel.get('buttons').length).toEqual(0); }); diff --git a/test/specs/storage_manager/index.js b/test/specs/storage_manager/index.js index 55f725da8..f657f25eb 100644 --- a/test/specs/storage_manager/index.js +++ b/test/specs/storage_manager/index.js @@ -1,5 +1,4 @@ import StorageManager from 'storage_manager'; -import Models from './model/Models'; describe('Storage Manager', () => { describe('Main', () => { @@ -69,13 +68,13 @@ describe('Storage Manager', () => { }, load(keys) { return storeValue; - } + }, }; beforeEach(() => { storeValue = []; obj = new StorageManager().init({ - type: storageId + type: storageId, }); obj.add(storageId, storage); }); @@ -87,7 +86,7 @@ describe('Storage Manager', () => { test('Store and load data', () => { var data = { item: 'testData', - item2: 'testData2' + item2: 'testData2', }; var data2 = {}; var id = obj.getConfig().id;