Browse Source

Fix color property view tests

no-jquery
Artur Arseniev 9 years ago
parent
commit
721a739196
  1. 8
      src/domain_abstract/ui/InputColor.js
  2. 24
      test/specs/style_manager/view/PropertyColorView.js

8
src/domain_abstract/ui/InputColor.js

@ -109,9 +109,17 @@ module.exports = Input.extend({
} }
} }
}); });
this.colorEl = colorEl; this.colorEl = colorEl;
} }
return this.colorEl; return this.colorEl;
}, },
render() {
Input.prototype.render.call(this);
// This will make the color input available on render
this.getColorEl();
return this;
}
}); });

24
test/specs/style_manager/view/PropertyColorView.js

@ -8,8 +8,7 @@ module.exports = {
describe('PropertyColorView', () => { describe('PropertyColorView', () => {
var component; var component;
var $fixtures; var fixtures;
var $fixture;
var target; var target;
var model; var model;
var view; var view;
@ -19,9 +18,7 @@ module.exports = {
var defValue = 'test2value'; var defValue = 'test2value';
before(() => { before(() => {
$.fn.spectrum = () => {}; $.fn.spectrum = function() {return this};
$fixtures = $("#fixtures");
$fixture = $('<div class="sm-fixture"></div>');
}); });
beforeEach(() => { beforeEach(() => {
@ -37,9 +34,10 @@ module.exports = {
model, model,
propTarget propTarget
}); });
$fixture.empty().appendTo($fixtures); document.body.innerHTML = '<div id="fixtures"></div>';
fixtures = document.body.firstChild;
view.render(); view.render();
$fixture.html(view.el); fixtures.appendChild(view.el);
}); });
afterEach(() => { afterEach(() => {
@ -47,7 +45,6 @@ module.exports = {
}); });
after(() => { after(() => {
$fixture.remove();
component = null; component = null;
view = null; view = null;
model = null; model = null;
@ -55,7 +52,7 @@ module.exports = {
it('Rendered correctly', () => { it('Rendered correctly', () => {
var prop = view.el; var prop = view.el;
expect($fixture.get(0).querySelector('.property')).toExist(); expect(fixtures.querySelector('.property')).toExist();
expect(prop.querySelector('.label')).toExist(); expect(prop.querySelector('.label')).toExist();
expect(prop.querySelector('.field')).toExist(); expect(prop.querySelector('.field')).toExist();
}); });
@ -63,7 +60,6 @@ module.exports = {
it('Inputs rendered', () => { it('Inputs rendered', () => {
var prop = view.el; var prop = view.el;
expect(prop.querySelector('input[type=text]')).toExist(); expect(prop.querySelector('input[type=text]')).toExist();
expect(prop.querySelector('.field-color-picker')).toExist();
}); });
it('Inputs should exist', () => { it('Inputs should exist', () => {
@ -109,9 +105,9 @@ module.exports = {
model, model,
propTarget: target propTarget: target
}); });
$fixture.empty().appendTo($fixtures); fixtures.innerHTML = '';
view.render(); view.render();
$fixture.html(view.el); fixtures.appendChild(view.el);
}); });
it('Update value and input on target swap', () => { it('Update value and input on target swap', () => {
@ -149,9 +145,9 @@ module.exports = {
view = new PropertyColorView({ view = new PropertyColorView({
model model
}); });
$fixture.empty().appendTo($fixtures); fixtures.innerHTML = '';
view.render(); view.render();
$fixture.html(view.el); fixtures.appendChild(view.el);
}); });
it('Value as default', () => { it('Value as default', () => {

Loading…
Cancel
Save