From 00bc6ed96057c71ff782889b3ab4491319e35693 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Mon, 5 Dec 2016 14:21:08 +0100 Subject: [PATCH] Fix tests --- src/dom_components/view/ComponentImageView.js | 2 +- test/specs/dom_components/view/ComponentImageView.js | 2 +- test/specs/style_manager/model/Models.js | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/dom_components/view/ComponentImageView.js b/src/dom_components/view/ComponentImageView.js index e1f4d64f7..d505c2244 100644 --- a/src/dom_components/view/ComponentImageView.js +++ b/src/dom_components/view/ComponentImageView.js @@ -58,7 +58,7 @@ define(['backbone', './ComponentView'], this.updateAttributes(); this.updateClasses(); - var actCls = this.$el.attr('class'); + var actCls = this.$el.attr('class') || ''; if(!this.model.get('src')) this.$el.attr('class', (actCls + ' ' + this.classEmpty).trim()); diff --git a/test/specs/dom_components/view/ComponentImageView.js b/test/specs/dom_components/view/ComponentImageView.js index ca9d5be7e..edba84274 100644 --- a/test/specs/dom_components/view/ComponentImageView.js +++ b/test/specs/dom_components/view/ComponentImageView.js @@ -55,4 +55,4 @@ define([path + 'ComponentImageView', 'DomComponents/model/Component'], } }; -}); \ No newline at end of file +}); diff --git a/test/specs/style_manager/model/Models.js b/test/specs/style_manager/model/Models.js index 3538da36e..93d0790b0 100644 --- a/test/specs/style_manager/model/Models.js +++ b/test/specs/style_manager/model/Models.js @@ -341,21 +341,25 @@ define([path + 'Sector', property: 'margin', type: 'composite', properties:[{ + fixedValues: ['initial', 'inherit', 'auto'], property : 'margin-top', type : 'integer', units : ['px','%'], - defaults : 0, + defaults : 0 },{ + fixedValues: ['initial', 'inherit', 'auto'], property : 'margin-right', type : 'integer', units : ['px','%'], defaults : 0, },{ + fixedValues: ['initial', 'inherit', 'auto'], property : 'margin-bottom', type : 'integer', units : ['px','%'], defaults : 0, },{ + fixedValues: ['initial', 'inherit', 'auto'], property : 'margin-left', type : 'integer', units : ['px','%'],