From e314abb1a2e0d884e4627c2dba42eb0f2ac360c1 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 16 Aug 2016 23:57:55 +0200
Subject: [PATCH] Fix tests

---
 src/dom_components/view/ComponentView.js   |  4 +++-
 test/specs/css_composer/e2e/CssComposer.js | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js
index dc1bce595..61ab586e7 100644
--- a/src/dom_components/view/ComponentView.js
+++ b/src/dom_components/view/ComponentView.js
@@ -156,7 +156,9 @@ define(['backbone', './ComponentsView'],
 				str = str.trim();
 
 				if(str)
-					this.$el.attr('class',str);
+					this.$el.attr('class', str);
+				else
+					this.$el.removeAttr('class');
 
 				// Regenerate status class
 				this.updateStatus();
diff --git a/test/specs/css_composer/e2e/CssComposer.js b/test/specs/css_composer/e2e/CssComposer.js
index 9364cf61f..b319f59fd 100644
--- a/test/specs/css_composer/e2e/CssComposer.js
+++ b/test/specs/css_composer/e2e/CssComposer.js
@@ -19,7 +19,7 @@ define(['GrapesJS'],function(Grapes) {
                 container: 'csscomposer-fixture',
               });
               this.cssc = this.gjs.editor.get('CssComposer');
-              this.clsm = this.gjs.editor.get('ClassManager');
+              this.clsm = this.gjs.editor.get('SelectorManager');
               this.domc = this.gjs.editor.Components;
               this.$fixture.empty().appendTo(this.$fixtures);
               this.gjs.render();
@@ -51,23 +51,23 @@ define(['GrapesJS'],function(Grapes) {
               });
               var cssc = gj.editor.get('CssComposer');
               cssc.getRules().length.should.equal(this.rulesSet.length);
-              var cls = gj.editor.get('ClassManager').getClasses();
+              var cls = gj.editor.get('SelectorManager').getAll();
               cls.length.should.equal(3);
             });
 
 
-            it('New rule adds correctly the class inside classe manager', function() {
+            it('New rule adds correctly the class inside selector manager', function() {
               var rules = this.cssc.getRules();
               rules.add({ selectors: [{name: 'test1'}] });
-              this.clsm.getClasses().at(0).get('name').should.equal('test1');
+              this.clsm.getAll().at(0).get('name').should.equal('test1');
             });
 
-            it('New rules are correctly imported inside classe manager', function() {
+            it('New rules are correctly imported inside selector manager', function() {
               var rules = this.cssc.getRules();
               this.rulesSet.forEach(function(item){
                 rules.add(item);
               });
-              var cls = this.clsm.getClasses();
+              var cls = this.clsm.getAll();
               cls.length.should.equal(3);
               cls.at(0).get('name').should.equal('test1');
               cls.at(1).get('name').should.equal('test2');