diff --git a/test/setup.js b/test/setup.js index ad21f2765..760e78209 100644 --- a/test/setup.js +++ b/test/setup.js @@ -1,3 +1,4 @@ +import 'regenerator-runtime/runtime'; import 'whatwg-fetch'; import _ from 'underscore'; import sinon from 'sinon'; @@ -11,7 +12,7 @@ const localStorage = { }, removeItem(key, value) { delete this[key]; - } + }, }; global._ = _; diff --git a/test/specs/asset_manager/index.js b/test/specs/asset_manager/index.js index d4a0aa8f0..94b598da4 100644 --- a/test/specs/asset_manager/index.js +++ b/test/specs/asset_manager/index.js @@ -1,21 +1,9 @@ -import StorageManager from 'storage_manager'; import AssetManager from 'asset_manager'; describe('Asset Manager', () => { describe('Main', () => { - var obj; - var imgObj; - - var storage; - var storageId = 'testStorage'; - var storageMock = { - store(data) { - storage = data; - }, - load(keys) { - return storage; - } - }; + let obj; + let imgObj; beforeEach(() => { document.body.innerHTML = '
'; @@ -23,7 +11,7 @@ describe('Asset Manager', () => { type: 'image', src: 'path/to/image', width: 101, - height: 102 + height: 102, }; obj = new AssetManager(); obj.init(); @@ -81,37 +69,5 @@ describe('Asset Manager', () => { obj.add(imgObj); expect(obj.render()).toBeTruthy(); }); - - describe('With storage', () => { - var storageManager; - - beforeEach(() => { - document.body.innerHTML = '
'; - storageManager = new StorageManager().init({ - autoload: 0, - type: storageId - }); - obj = new AssetManager().init({ - stm: storageManager - }); - storageManager.add(storageId, storageMock); - document.body.querySelector('#asset-c').appendChild(obj.render()); - }); - - afterEach(() => { - storageManager = null; - }); - - test('Store and load data', () => { - obj.add(imgObj); - obj.store(); - obj.remove(imgObj.src); - obj.load({ assets: storage['gjs-assets'] }); - var asset = obj.get(imgObj.src); - expect(asset.get('width')).toEqual(imgObj.width); - expect(asset.get('height')).toEqual(imgObj.height); - expect(asset.get('type')).toEqual('image'); - }); - }); }); }); diff --git a/test/specs/css_composer/index.js b/test/specs/css_composer/index.js index 20dc78af5..bc38698ee 100644 --- a/test/specs/css_composer/index.js +++ b/test/specs/css_composer/index.js @@ -14,14 +14,14 @@ describe('Css Composer', () => { }, getCacheLoad() { return storagMock.load(); - } + }, }; var setSmConfig = () => { config.stm = storagMock; config.stm.getConfig = () => ({ storeCss: 1, - storeStyles: 1 + storeStyles: 1, }); }; var setEm = () => { @@ -49,19 +49,13 @@ describe('Css Composer', () => { }); test('storageKey returns array', () => { - expect(obj.storageKey() instanceof Array).toEqual(true); - }); - - test('storageKey returns correct composition', () => { - setSmConfig(); - expect(obj.storageKey()).toEqual(['css', 'styles']); + expect(obj.storageKey).toEqual('styles'); }); test('Store data', () => { setSmConfig(); setEm(); - var expected = { css: 'testCss', styles: '[]' }; - expect(obj.store(1)).toEqual(expected); + expect(JSON.parse(JSON.stringify(obj.store()))).toEqual({ styles: [] }); }); test('Rules are empty', () => { @@ -87,14 +81,7 @@ describe('Css Composer', () => { var sel = new obj.Selectors([{ name: 'test1' }]); var rule = obj.add(sel.models); expect(obj.getAll().length).toEqual(1); - expect( - obj - .getAll() - .at(0) - .get('selectors') - .at(0) - .get('name') - ).toEqual('test1'); + expect(obj.getAll().at(0).get('selectors').at(0).get('name')).toEqual('test1'); }); test('Returns correct rule with the same selector', () => { @@ -175,12 +162,8 @@ describe('Css Composer', () => { const rule = obj.getIdRule(name); expect(rule.selectorsToString()).toEqual(`#${name}`); expect(rule.styleToString()).toEqual(`color:red;`); - expect(rule.styleToString({ important: 1 })).toEqual( - `color:red !important;` - ); - expect(rule.styleToString({ important: ['color'] })).toEqual( - `color:red !important;` - ); + expect(rule.styleToString({ important: 1 })).toEqual(`color:red !important;`); + expect(rule.styleToString({ important: ['color'] })).toEqual(`color:red !important;`); }); test('Create a rule with id selector and state by using setIdRule()', () => { @@ -273,26 +256,24 @@ describe('Css Composer', () => { style: { color: 'blue' }, opts: { atRuleType: 'media', - atRuleParams: 'screen and (min-width: 480px)' - } + atRuleParams: 'screen and (min-width: 480px)', + }, }, { selector: '.class1:hover', style: { color: 'red' }, opts: { atRuleType: 'media', - atRuleParams: 'screen and (min-width: 480px)' - } - } + atRuleParams: 'screen and (min-width: 480px)', + }, + }, ]; toTest.forEach(test => { const { selector, style, opts } = test; const result = obj.setRule(selector, style, opts); expect(obj.getAll().length).toEqual(1); const rule = obj.getRule(selector, opts); - expect(rule.getAtRule()).toEqual( - `@${opts.atRuleType} ${opts.atRuleParams}` - ); + expect(rule.getAtRule()).toEqual(`@${opts.atRuleType} ${opts.atRuleParams}`); expect(rule.selectorsToString()).toEqual(selector); expect(rule.getStyle()).toEqual(style); }); @@ -308,15 +289,14 @@ describe('Css Composer', () => { { selector: '.class4, .class1 .class2', style: { color: 'blue' }, - opt: { atRuleType: 'media', atRuleParams: '(min-width: 480px)' } - } + opt: { atRuleType: 'media', atRuleParams: '(min-width: 480px)' }, + }, ]; toTest.forEach(test => { const { selector, style, opt = {} } = test; obj.setRule(selector, style, opt); const rule = obj.getRule(selector, opt); - const atRule = `${opt.atRuleType || ''} ${opt.atRuleParams || - ''}`.trim(); + const atRule = `${opt.atRuleType || ''} ${opt.atRuleParams || ''}`.trim(); expect(rule.getAtRule()).toEqual(atRule ? `@${atRule}` : ''); expect(rule.selectorsToString()).toEqual(selector); expect(rule.getStyle()).toEqual(style); @@ -356,7 +336,7 @@ describe('Css Composer', () => { `.test-rule{color:red;}`, `.test-rule:hover{color:blue;}`, `@media (max-width: 992px){.test-rule{color:darkred;}}`, - `@media (max-width: 992px){.test-rule:hover{color:darkblue;}}` + `@media (max-width: 992px){.test-rule:hover{color:darkblue;}}`, ]; const cssString = cssRules.join(''); obj.addCollection(cssString); @@ -388,9 +368,7 @@ describe('Css Composer', () => { expect(obj.get('.test-rule2', 'hover')).toBe(rule2); expect(rule3.get('mediaText')).toBe('(max-width: 992px)'); expect(obj.get('.test-rule3', null, '(max-width: 992px)')).toBe(rule3); - expect(obj.get('.test-rule4', 'hover', '(max-width: 992px)')).toBe( - rule4 - ); + expect(obj.get('.test-rule4', 'hover', '(max-width: 992px)')).toBe(rule4); }); }); }); diff --git a/test/specs/dom_components/index.js b/test/specs/dom_components/index.js index 6249acddc..39d9eab95 100644 --- a/test/specs/dom_components/index.js +++ b/test/specs/dom_components/index.js @@ -65,35 +65,6 @@ describe('DOM Components', () => { expect(DomComponents).toBeTruthy(); }); - test('storageKey returns array', () => { - expect(obj.storageKey() instanceof Array).toEqual(true); - }); - - test('storageKey returns correct composition', () => { - config.stm = { - getConfig() { - return { - storeHtml: 1, - storeComponents: 1, - }; - }, - }; - expect(obj.storageKey()).toEqual(['html', 'components']); - }); - - test('Store data', () => { - setSmConfig(); - (em.getHtml = () => { - return 'testHtml'; - }), - (obj = em.get('DomComponents').init(config)); - var expected = { - html: 'testHtml', - components: JSON.stringify(obj.getWrapper()), - }; - expect(obj.store(1)).toEqual(expected); - }); - test.skip('Store and load data', () => { setSmConfig(); setEm(); diff --git a/test/specs/grapesjs/index.js b/test/specs/grapesjs/index.js index 70a1da93d..8b3496f0c 100644 --- a/test/specs/grapesjs/index.js +++ b/test/specs/grapesjs/index.js @@ -12,12 +12,11 @@ describe('GrapesJS', () => { var storage; var storageId = 'testStorage'; var storageMock = { - store(data, clb) { + store(data) { storage = data; - clb(); }, - load(keys, clb) { - return clb(storage); + load() { + return storage; }, };