knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated code and tests to stop recline clobbering view.el. Issue #350.

Browse Source
This commit is contained in:
Dan Wilson
2013-05-13 17:59:03 +01:00
parent 38256b455b
commit 8ea1a81c0a
18 changed files with 111 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/view.flot.test.js
View File

@@ -29,8 +29,8 @@ test('initialize', function () {
// check we have updated editor with state info
equal(view.elSidebar.find('.editor-type select').val(), 'lines');
equal(view.elSidebar.find('.editor-group select').val(), 'x');
var out = _.map(view.elSidebar.find('.editor-series select'), function($el) {
return $($el).val();
var out = _.map(view.elSidebar.find('.editor-series select'), function(el) {
return $(el).val();
});
deepEqual(out, ['y', 'z']);

8
test/view.map.test.js
View File

@@ -162,13 +162,13 @@ test('Popup', function () {
$('.fixtures').append(view.el);
view.render();
var marker = view.el.find('.leaflet-marker-icon').first();
var marker = view.$el.find('.leaflet-marker-icon').first();
assertPresent(marker);
_.values(view.features._layers)[0].fire('click');
var popup = view.el.find('.leaflet-popup-content');
var popup = view.$el.find('.leaflet-popup-content');
assertPresent(popup);
@@ -195,9 +195,9 @@ test('Popup - Custom', function () {
};
view.render();
var marker = view.el.find('.leaflet-marker-icon').first();
var marker = view.$el.find('.leaflet-marker-icon').first();
_.values(view.features._layers)[0].fire('click');
var popup = view.el.find('.leaflet-popup-content');
var popup = view.$el.find('.leaflet-popup-content');
assertPresent(popup);

4
test/view.multiview.test.js
View File

@@ -60,9 +60,9 @@ test('initialize state', function () {
ok(explorer.state.get('currentView'), 'graph');
// check the correct view is visible
var css = explorer.el.find('.navigation a[data-view="graph"]').attr('class').split(' ');
var css = explorer.$el.find('.navigation a[data-view="graph"]').attr('class').split(' ');
ok(_.contains(css, 'active'), css);
var css = explorer.el.find('.navigation a[data-view="grid"]').attr('class').split(' ');
var css = explorer.$el.find('.navigation a[data-view="grid"]').attr('class').split(' ');
ok(!(_.contains(css, 'active')), css);
// check pass through of view config

2
test/view.timeline.test.js
View File

@@ -47,7 +47,7 @@ test('render etc', function () {
assertPresent('.vmm-timeline', view.el);
assertPresent('.timenav', view.el);
assertPresent('.timenav', view.el);
equal(view.el.find('.marker.active h4').text(), '2011');
equal(view.$el.find('.marker.active h4').text(), '2011');
view.remove();
});

36
test/widget.filtereditor.test.js
View File

@@ -7,10 +7,10 @@ test('basics', function () {
});
$('.fixtures').append(view.el);
assertPresent('.js-add-filter', view.elSidebar);
var $addForm = view.el.find('form.js-add');
var $addForm = view.$el.find('form.js-add');
ok(!$addForm.is(":visible"));
view.el.find('.js-add-filter').click();
ok(!view.el.find('.js-add-filter').is(":visible"));
view.$el.find('.js-add-filter').click();
ok(!view.$el.find('.js-add-filter').is(":visible"));
ok($addForm.is(":visible"));
// submit the form
@@ -19,7 +19,7 @@ test('basics', function () {
// now check we have new filter
ok(!$addForm.is(":visible"));
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
equal($editForm.find('.filter-term').length, 1)
equal(dataset.queryState.attributes.filters[0].field, 'country');
@@ -30,13 +30,13 @@ test('basics', function () {
equal(dataset.records.length, 3);
// now set a second range filter ...
view.el.find('.js-add-filter').click();
var $addForm = view.el.find('form.js-add');
view.$el.find('.js-add-filter').click();
var $addForm = view.$el.find('form.js-add');
$addForm.find('select.fields').val('x');
$addForm.find('select.filterType').val('range');
$addForm.submit();
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
$editForm.find('.filter-range input').first().val('2');
$editForm.find('.filter-range input').last().val('4');
$editForm.submit();
@@ -45,15 +45,15 @@ test('basics', function () {
equal(dataset.records.length, 2);
// now remove filter
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
$editForm.find('.js-remove-filter').last().click();
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
equal($editForm.find('.filter').length, 1)
equal(dataset.records.length, 3);
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
$editForm.find('.js-remove-filter').last().click();
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
equal($editForm.find('.filter').length, 0)
equal(dataset.records.length, 6);
@@ -68,18 +68,18 @@ test('add 2 filters of same type', function () {
$('.fixtures').append(view.el);
// add 2 term filters
var $addForm = view.el.find('form.js-add');
view.el.find('.js-add-filter').click();
var $addForm = view.$el.find('form.js-add');
view.$el.find('.js-add-filter').click();
$addForm.find('select.fields').val('country');
$addForm.submit();
var $addForm = view.el.find('form.js-add');
view.el.find('.js-add-filter').click();
var $addForm = view.$el.find('form.js-add');
view.$el.find('.js-add-filter').click();
$addForm.find('select.fields').val('id');
$addForm.submit();
var fields = [];
view.el.find('form.js-edit .filter-term input').each(function(idx, item) {
view.$el.find('form.js-edit .filter-term input').each(function(idx, item) {
fields.push($(item).attr('data-filter-field'));
});
deepEqual(fields, ['country', 'id']);
@@ -94,14 +94,14 @@ test('geo_distance', function () {
});
$('.fixtures').append(view.el);
var $addForm = view.el.find('form.js-add');
var $addForm = view.$el.find('form.js-add');
// submit the form
$addForm.find('select.filterType').val('geo_distance');
$addForm.find('select.fields').val('lon');
$addForm.submit();
// now check we have new filter
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
equal($editForm.find('.filter-geo_distance').length, 1)
deepEqual(_.sortBy(_.keys(dataset.queryState.attributes.filters[0]),_.identity),
["distance", "field", "point", "type", "unit"]);

23
test/widget.valuefilter.test.js
View File

@@ -7,10 +7,10 @@ test('basics', function () {
});
$('.fixtures').append(view.el);
assertPresent('.js-add-filter', view.elSidebar);
var $addForm = view.el.find('form.js-add');
var $addForm = view.$el.find('form.js-add');
ok(!$addForm.is(":visible"));
view.el.find('.js-add-filter').click();
ok(!view.el.find('.js-add-filter').is(":visible"));
view.$el.find('.js-add-filter').click();
ok(!view.$el.find('.js-add-filter').is(":visible"));
ok($addForm.is(":visible"));
// submit the form
@@ -19,7 +19,7 @@ test('basics', function () {
// now check we have new filter
ok(!$addForm.is(":visible"));
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
equal($editForm.find('.filter-term').length, 1);
equal(dataset.queryState.attributes.filters[0].field, 'country');
@@ -30,9 +30,9 @@ test('basics', function () {
equal(dataset.records.length, 3);
// now remove filter
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
$editForm.find('.js-remove-filter').last().click();
$editForm = view.el.find('form.js-edit');
$editForm = view.$el.find('form.js-edit');
equal($editForm.find('.filter').length, 0);
equal(dataset.records.length, 6);
@@ -47,18 +47,19 @@ test('add 2 filters', function () {
$('.fixtures').append(view.el);
// add 2 term filters
var $addForm = view.el.find('form.js-add');
view.el.find('.js-add-filter').click();
var $addForm = view.$el.find('form.js-add');
view.$el.find('.js-add-filter').click();
$addForm.find('select.fields').val('country');
$addForm.submit();
$addForm = view.el.find('form.js-add');
view.el.find('.js-add-filter').click();
$addForm = view.$el.find('form.js-add');
view.$el.find('.js-add-filter').click();
$addForm.find('select.fields').val('id');
$addForm.submit();
var fields = [];
view.el.find('form.js-edit .filter-term input').each(function(idx, item) {
view.$el.find('form.js-edit .filter-term input').each(function(idx, item) {
fields.push($(item).attr('data-filter-field'));
});
deepEqual(fields, ['country', 'id']);