From 8f0a9e6b6923d7f7514bbc90611cd2b3d6757670 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Wed, 8 Jun 2016 23:28:58 +0200
Subject: [PATCH] Add tests

---
 src/editor/config/config.js |  3 +++
 src/editor/model/Editor.js  |  8 ++++++--
 src/grapesjs/main.js        |  7 +++++++
 test/specs/grapesjs/main.js | 11 ++++++-----
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/editor/config/config.js b/src/editor/config/config.js
index 398e2303b..f90be3e49 100644
--- a/src/editor/config/config.js
+++ b/src/editor/config/config.js
@@ -70,6 +70,9 @@ define(function () {
 		//Configurations for Css Composer
 		cssComposer				: {},
 
+		// Dom element
+		el: '',
+
 	};
 	return config;
 });
\ No newline at end of file
diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index 7ca5e8152..3cca1fc2d 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -43,12 +43,15 @@ define([
 			},
 
 			initialize: function(c) {
-				this.config		= c;
+				this.config = c;
 				this.pfx = this.config.storagePrefix;
 				this.compName	= this.pfx + 'components' + this.config.id;
 				this.rulesName	= this.pfx + 'rules' + this.config.id;
 				this.set('Config', c);
 
+				//console.log(c);
+				//getCacheLoad
+
 				this.initParser();
 				this.initStorage();
 				this.initClassManager();
@@ -89,7 +92,8 @@ define([
 			 * @private
 			 * */
 			initCssComposer: function() {
-				this.config.cssComposer.defaults = this.config.style;
+				if(this.config.style)
+					this.config.cssComposer.defaults = this.config.style;
 				var cfg = this.config.cssComposer,
 				df = '';
 				pfx	= cfg.stylePrefix || 'css-';
diff --git a/src/grapesjs/main.js b/src/grapesjs/main.js
index 7ce04009d..6a1e98cf4 100644
--- a/src/grapesjs/main.js
+++ b/src/grapesjs/main.js
@@ -32,6 +32,13 @@ define(function (require) {
        * @return {grapesjs.Editor} GrapesJS Editor instance
        */
       init: function(config) {
+        var c = config || {};
+        var els = c.container;
+
+        if(!els)
+          throw new Error("'container' is required");
+
+        config.el = document.querySelector(els);
         var editor = new Editor(config);
         //- new EditorView({model: editor}).render();
         //- inject and start plugins (plugins)
diff --git a/test/specs/grapesjs/main.js b/test/specs/grapesjs/main.js
index 1c7f3cbf5..642b99095 100644
--- a/test/specs/grapesjs/main.js
+++ b/test/specs/grapesjs/main.js
@@ -1,5 +1,5 @@
-define(['GrapesJS', 'PluginManager'],
- function(GrapesJS, PluginManager) {
+define(['GrapesJS', 'PluginManager', 'chai'],
+ function(GrapesJS, PluginManager, chai) {
 
   describe('GrapesJS', function() {
 
@@ -40,7 +40,7 @@ define(['GrapesJS', 'PluginManager'],
       });
 
       it('Init new editor', function() {
-        var editor = obj.init();
+        var editor = obj.init(config);
         editor.should.not.be.empty;
       });
 
@@ -65,16 +65,17 @@ define(['GrapesJS', 'PluginManager'],
       it('Init editor with css', function() {
         config.style = cssString;
         var editor = obj.init(config);
-        console.log(editor.CssComposer.getRules());
         var rules = editor.CssComposer.getRules();
         rules.length.should.equal(2);
         rules.at(0).get('selectors').at(0).get('name').should.equal('test2');
       });
 
-      it('Init editor from element', function() {
+      it.skip('Init editor from element', function() {
         config.fromElement = 1;
         fixture.html(documentEl);
+        console.log('START');
         var editor = obj.init(config);
+        console.log('END');
         var html = editor.getHtml();
         var css = editor.getCss();
         (html ? html : '').should.equal(htmlString);