github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

update pinned tests, fix dupe/de-dupe functionality and verify via tests

Browse source
This commit is contained in:
Joe Fleming 2015-04-15 15:20:50 -07:00
parent ea1cd766f4
commit 706fac455f
2 changed files with 41 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kibana/components/filter_bar/lib/filterActions.js
View file

@ -66,15 +66,15 @@ define(function (require) {
function pinFilter(filter, force) {
var pinned = _.isUndefined(force) ? !filter.meta.pinned : force;
if (!pinned) {
filter.meta.pinned = !filter.meta.pinned;
} else {
// var pinnedFilter = _.cloneDeep(filter);
if (pinned && !filter.meta.pinned) {
// append unpinned filter, use angular.extend to remove hashes
var pinnedFilter = _.cloneDeep(angular.extend({}, filter));
pinnedFilter.meta.pinned = !!pinned;
pinnedFilter.meta.pinned = false;
$scope.filters.push(pinnedFilter);
}
filter.meta.pinned = pinned;
saveState();
return filter;
}

42
test/unit/specs/components/filter_bar/_filterPin.js
View file

@ -50,20 +50,31 @@ define(function (require) {
fn = filterActions($rootScope).pinFilter;
});
it('should set pinned state to true', function () {
it('should set pinned state from false to true and append', function () {
var filter = $rootScope.filters[1];
var filterCount = $rootScope.filters.length;
expect(filter.meta.pinned).to.be(false);
filter = fn(filter);
expect(filter.meta.pinned).to.be(true);
// should also duplicate filter as pinned
expect($rootScope.filters.length).to.be(filterCount + 1);
});
it('should set pinned state to false', function () {
it('should set pinned state from true to false and de-dupe', function () {
var filter = $rootScope.filters[0];
var filterCount = $rootScope.filters.length;
var dupeFilter = _.cloneDeep(filter);
dupeFilter.meta.pinned = false;
$rootScope.filters.push(dupeFilter);
expect($rootScope.filters.length).to.be(filterCount + 1);
expect(filter.meta.pinned).to.be(true);
filter = fn(filter);
expect(filter.meta.pinned).to.be(false);
// check that the 2 now-unpinned filters are de-duped
expect($rootScope.filters.length).to.be(filterCount);
});
it('should force pin filter to true', function () {
@ -72,10 +83,22 @@ define(function (require) {
expect(filter.meta.pinned).to.be(true);
filter = fn(filter, true);
expect(filter.meta.pinned).to.be(true);
filter = $rootScope.filters[1];
expect(filter.meta.pinned).to.be(false);
filter = fn(filter, true);
expect(filter.meta.pinned).to.be(true);
});
it('should force pin filter to false', function () {
var filter = $rootScope.filters[1];
var filter = $rootScope.filters[0];
expect(filter.meta.pinned).to.be(true);
filter = fn(filter, false);
expect(filter.meta.pinned).to.be(false);
filter = $rootScope.filters[1];
expect(filter.meta.pinned).to.be(false);
filter = fn(filter, false);
@ -91,15 +114,22 @@ define(function (require) {
});
it('should pin all filters to global state', function () {
var filterCount = $rootScope.filters.length;
var unfilteredCount = _.filter($rootScope.filters, { meta: { pinned: false }}).length;
fn(true);
var pinned = _.filter($rootScope.filters, { meta: { pinned: true }});
expect(pinned.length).to.be($rootScope.filters.length);
// all existing filters were pinned
expect(pinned.length).to.be(filterCount);
// all previously unpinned filters were duplicated
expect($rootScope.filters.length).to.be(filterCount + unfilteredCount);
});
it('should unpin all filters from global state', function () {
var filterCount = $rootScope.filters.length;
fn(false);
var pinned = _.filter($rootScope.filters, { meta: { pinned: false }});
expect(pinned.length).to.be($rootScope.filters.length);
var unpinned = _.filter($rootScope.filters, { meta: { pinned: false }});
// all filters were unpinned, no duplicates remain
expect(unpinned.length).to.be(filterCount);
});
});