Browse Source

Fix sectors tests

no-jquery
Artur Arseniev 9 years ago
parent
commit
eed4942067
  1. 6
      src/utils/extender.js
  2. 23
      test/specs/style_manager/index.js
  3. 34
      test/specs/style_manager/view/SectorView.js
  4. 17
      test/specs/style_manager/view/SectorsView.js

6
src/utils/extender.js

@ -223,15 +223,15 @@ module.exports = ({$, Backbone}) => {
}
fn.click = function(h) {
return this.on('click', h);
return h ? this.on('click', h) : this.trigger('click');
}
fn.change = function(h) {
return this.on('change', h);
return h ? this.on('change', h) : this.trigger('change');
}
fn.keydown = function(h) {
return this.on('keydown', h);
return h ? this.on('keydown', h) : this.trigger('keydown');
}
fn.delegate = function(selector, events, data, handler) {

23
test/specs/style_manager/index.js

@ -176,16 +176,19 @@ describe('StyleManager', () => {
});
Models.run();
SectorView.run();
SectorsView.run();
PropertyView.run();
PropertySelectView.run();
PropertyRadioView.run();
PropertyIntegerView.run();
PropertyColorView.run();
PropertyCompositeView.run();
PropertyStackView.run();
LayerView.run();
describe.only('Views', () => {
SectorView.run();
SectorsView.run();
PropertyView.run();
PropertySelectView.run();
PropertyRadioView.run();
PropertyIntegerView.run();
PropertyColorView.run();
PropertyCompositeView.run();
PropertyStackView.run();
LayerView.run();
});
});
});

34
test/specs/style_manager/view/SectorView.js

@ -6,33 +6,24 @@ module.exports = {
describe('SectorView', () => {
var $fixtures;
var $fixture;
var fixtures;
var model;
var view;
before(() => {
$fixtures = $("#fixtures");
$fixture = $('<div class="sector-fixture"></div>');
});
beforeEach(() => {
model = new Sector();
view = new SectorView({
model
});
$fixture.empty().appendTo($fixtures);
$fixture.html(view.render().el);
document.body.innerHTML = '<div id="fixtures"></div>';
fixtures = document.body.querySelector('#fixtures');
fixtures.appendChild(view.render().el);
});
afterEach(() => {
view.remove();
});
after(() => {
$fixture.remove();
});
it('Rendered correctly', () => {
var sector = view.el;
expect(sector.querySelector('.title')).toExist();
@ -43,7 +34,7 @@ module.exports = {
it('No properties', () => {
var props = view.el.querySelector('.properties');
expect(props.innerHTML).toEqual('<div class="clear"></div>');
expect(props.innerHTML).toEqual('');
});
it('Update on open', () => {
@ -75,15 +66,14 @@ module.exports = {
view = new SectorView({
model
});
$fixture.empty().appendTo($fixtures);
$fixture.html(view.render().el);
});
afterEach(() => {
view.remove();
//$fixture.empty().appendTo($fixtures);
//$fixture.html(view.render().el);
document.body.innerHTML = '<div id="fixtures"></div>';
fixtures = document.body.querySelector('#fixtures');
fixtures.appendChild(view.render().el);
});
it('Rendered correctly2', () => {
it('Rendered correctly', () => {
var sector = view.el;
var props = sector.querySelector('.properties');
expect(sector.querySelector('.title').innerHTML).toContain('TestName');
@ -94,7 +84,7 @@ module.exports = {
it('Has properties', () => {
var props = view.el.querySelector('.properties');
expect(props.children.length).toEqual(4); // Last one is 'clear' element
expect(props.children.length).toEqual(3);
});
});

17
test/specs/style_manager/view/SectorsView.js

@ -6,33 +6,24 @@ module.exports = {
describe('SectorsView', () => {
var $fixtures;
var $fixture;
var fixtures;
var model;
var view;
before(() => {
$fixtures = $("#fixtures");
$fixture = $('<div class="sectors-fixture"></div>');
});
beforeEach(() => {
model = new Sectors([]);
view = new SectorsView({
collection: model
});
$fixture.empty().appendTo($fixtures);
$fixture.html(view.render().el);
document.body.innerHTML = '<div id="fixtures"></div>';
fixtures = document.body.querySelector('#fixtures');
fixtures.appendChild(view.render().el);
});
afterEach(() => {
view.collection.reset();
});
after(() => {
$fixture.remove();
});
it("Collection is empty", () => {
expect(view.el.innerHTML).toEqual('');
});

Loading…
Cancel
Save