From 0148dd45b2ca862f3d6222bee89537ef3be0b579 Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Mon, 18 Jun 2012 21:21:03 +0100 Subject: [PATCH] [test,addendum][xs]: fixes for tests after changes in last commit b64daea1a763ba40d450d8234f7b3ac0c8f15c16. --- test/backend/elasticsearch.test.js | 5 +++-- test/model.test.js | 3 ++- test/widget.filtereditor.test.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/backend/elasticsearch.test.js b/test/backend/elasticsearch.test.js index 9170b5cb..c63821c8 100644 --- a/test/backend/elasticsearch.test.js +++ b/test/backend/elasticsearch.test.js @@ -41,7 +41,7 @@ test("queryNormalize", function() { and: [ { term: { - xyz: 'XXX' + xyz: 'xxx' } } ] @@ -65,7 +65,8 @@ test("queryNormalize", function() { and: [ { geo_distance: { - distance: '10km', + distance: 10, + unit: 'km', 'xyz': { lon: 0, lat: 0 } } } diff --git a/test/model.test.js b/test/model.test.js index 0c1fe167..556eb80a 100644 --- a/test/model.test.js +++ b/test/model.test.js @@ -161,7 +161,8 @@ test('Query.addFilter', function () { query.addFilter({type: 'geo_distance', field: 'xyz'}); var exp = { - distance: '10km', + distance: 10, + unit: 'km', point: { lon: 0, lat: 0 diff --git a/test/widget.filtereditor.test.js b/test/widget.filtereditor.test.js index 36f16e40..825cd5e5 100644 --- a/test/widget.filtereditor.test.js +++ b/test/widget.filtereditor.test.js @@ -56,7 +56,7 @@ test('geo_distance', function () { $editForm = view.el.find('form.js-edit'); equal($editForm.find('.filter-geo_distance').length, 1) deepEqual(_.keys(dataset.queryState.attributes.filters[0]), ['distance', - 'point', 'type', 'field']); + 'unit', 'point', 'type', 'field']); // now set filter value and apply $editForm.find('input[name="lat"]').val(10);