From bb952eaacee0f60482b9272e3f363c9cddfc5d41 Mon Sep 17 00:00:00 2001
From: Val Rudi <mail.valik@gmail.com>
Date: Sun, 8 Apr 2018 23:44:56 +0300
Subject: [PATCH] Get mediaCondition from Editor model config. Fixed tests -
 add storable to Editor model, proper CssComposer init

---
 src/css_composer/view/CssRulesView.js       | 4 +++-
 src/editor/model/Editor.js                  | 1 +
 test/specs/code_manager/model/CodeModels.js | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/css_composer/view/CssRulesView.js b/src/css_composer/view/CssRulesView.js
index a09e41953..42297d6d1 100644
--- a/src/css_composer/view/CssRulesView.js
+++ b/src/css_composer/view/CssRulesView.js
@@ -80,7 +80,9 @@ module.exports = require('backbone').View.extend({
   getMediaWidth(mediaText) {
     return (
       mediaText &&
-      mediaText.replace(`(${this.config.mediaCondition}: `, '').replace(')', '')
+      mediaText
+        .replace(`(${this.em.getConfig('mediaCondition')}: `, '')
+        .replace(')', '')
     );
   },
 
diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index 9032fa049..9cdfa75d8 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -52,6 +52,7 @@ module.exports = Backbone.Model.extend({
     this.set('Config', c);
     this.set('modules', []);
     this.set('toLoad', []);
+    this.set('storables', []);
 
     if (c.el && c.fromElement) this.config.components = c.el.innerHTML;
 
diff --git a/test/specs/code_manager/model/CodeModels.js b/test/specs/code_manager/model/CodeModels.js
index d625a539d..8ad18e2c1 100644
--- a/test/specs/code_manager/model/CodeModels.js
+++ b/test/specs/code_manager/model/CodeModels.js
@@ -71,9 +71,12 @@ module.exports = {
     });
 
     describe('CssGenerator', () => {
-      var newCssComp = () => new CssComposer().init();
+      let newCssComp;
+
       beforeEach(() => {
         em = new Editor({});
+        newCssComp = () => new CssComposer().init({ em });
+
         cc = em.get('CssComposer');
         obj = new CssGenerator();
         dcomp = new DomComponents();