Skip to content

Commit

Permalink
canceled integration test changes
Browse files Browse the repository at this point in the history
  • Loading branch information
viatkinviatkin committed Mar 17, 2022
1 parent 2c3df39 commit 2a5fa70
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
10 changes: 9 additions & 1 deletion addon/components/map-tools/background-layers.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,18 @@ export default Ember.Component.extend({
*/
selectedLayer: null,

_backgroundLayersChange: Ember.observer('layers', function() {
_backgroundLayersChange: Ember.observer('layers.[]', function() {
this._updateItems();
}),

/**
Initializes DOM-related component's properties & logic.
*/
didInsertElement() {
this._super(...arguments);
this._updateItems();
},

_updateItems() {
let layers = this.get('layers');
let items = [];
Expand Down
26 changes: 13 additions & 13 deletions tests/integration/components/map-tools/background-layers-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@ test('isVisible true', function(assert) {
assert.equal(this.$().find('.flexberry-background-map-tool').length, 1);
assert.equal(this.$('.flexberry-background-map-tool').attr('title'), 'Background layers');

// assert.equal(this.$('.main-background-layers').length, 1);
// assert.equal(this.$('.child-background-layers').length, 2);
// assert.ok(this.$(this.$('.main-background-layers').children()[0]).hasClass('first-item'));
// assert.ok(this.$(this.$('.main-background-layers').children()[1]).hasClass('last-item'));
// assert.equal(this.$(this.$('.child-background-layers').children()[0]).attr('src'), 'pic1');
// assert.equal(this.$(this.$('.child-background-layers').children()[0]).attr('class'), 'picture active');
// assert.equal(this.$(this.$('.child-background-layers').children()[1]).text(), 'test layer1');
// assert.equal(this.$(this.$('.child-background-layers').children()[2]).attr('src'), 'pic2');
// assert.equal(this.$(this.$('.child-background-layers').children()[2]).attr('class'), 'picture ');
// assert.equal(this.$(this.$('.child-background-layers').children()[3]).text(), 'test layer2');
assert.equal(this.$('.main-background-layers').length, 1);
assert.equal(this.$('.child-background-layers').length, 2);
assert.ok(this.$(this.$('.main-background-layers').children()[0]).hasClass('first-item'));
assert.ok(this.$(this.$('.main-background-layers').children()[1]).hasClass('last-item'));
assert.equal(this.$(this.$('.child-background-layers').children()[0]).attr('src'), 'pic1');
assert.equal(this.$(this.$('.child-background-layers').children()[0]).attr('class'), 'picture active');
assert.equal(this.$(this.$('.child-background-layers').children()[1]).text(), 'test layer1');
assert.equal(this.$(this.$('.child-background-layers').children()[2]).attr('src'), 'pic2');
assert.equal(this.$(this.$('.child-background-layers').children()[2]).attr('class'), 'picture ');
assert.equal(this.$(this.$('.child-background-layers').children()[3]).text(), 'test layer2');

// this.$('.child-background-layers')[1].click();
// assert.equal(this.$(this.$('.child-background-layers').children()[0]).attr('class'), 'picture ');
// assert.equal(this.$(this.$('.child-background-layers').children()[2]).attr('class'), 'picture active');
this.$('.child-background-layers')[1].click();
assert.equal(this.$(this.$('.child-background-layers').children()[0]).attr('class'), 'picture ');
assert.equal(this.$(this.$('.child-background-layers').children()[2]).attr('class'), 'picture active');
});

0 comments on commit 2a5fa70

Please sign in to comment.