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

[#174,refactor][s]: rename currentRecords to records on Dataset.

Browse Source
This commit is contained in:
Rufus Pollock
2012-07-05 15:37:17 +01:00
parent 21296aa18c
commit a58f5e5bb0
22 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/backend.csv.test.js
View File

@@ -29,8 +29,8 @@ test("parseCSV", function() {
backend: 'csv'
});
dataset.fetch();
equal(dataset.currentRecords.length, 3);
var row = dataset.currentRecords.models[0].toJSON();
equal(dataset.records.length, 3);
var row = dataset.records.models[0].toJSON();
deepEqual(row, {Name: 'Jones, Jay', Value: 10});
});

4
test/backend.dataproxy.test.js
View File

@@ -95,14 +95,14 @@ test('DataProxy Backend', function() {
dataset.fetch().then(function() {
deepEqual(['__id__', 'date', 'price'], _.pluck(dataset.fields.toJSON(), 'id'));
equal(10, dataset.recordCount)
equal(dataset.currentRecords.models[0].get('date'), "1950-01");
equal(dataset.records.models[0].get('date'), "1950-01");
// needed only if not stubbing
// start();
});
dataset.query({q: '1950-01'}).then(function() {
equal(dataset.recordCount, 1);
equal(dataset.currentRecords.models[0].get('price'), '34.73');
equal(dataset.records.models[0].get('price'), '34.73');
});
$.ajax.restore();
});

2
test/backend.elasticsearch.test.js
View File

@@ -302,7 +302,7 @@ test("write", function() {
id: id,
title: 'my title'
});
dataset.currentRecords.add(rec);
dataset.records.add(rec);
// have to do this explicitly as we not really supporting adding new items atm
dataset._changes.creates.push(rec.toJSON());
var jqxhr = dataset.save();

2
test/backend.gdocs.test.js
View File

@@ -181,7 +181,7 @@ test("GDocs Backend", function() {
});
dataset.fetch().then(function() {
var docList = dataset.currentRecords;
var docList = dataset.records;
deepEqual(['column-2', 'column-1'], _.pluck(dataset.fields.toJSON(), 'id'));
equal(3, docList.length);
equal("A", docList.models[0].get('column-1'));

14
test/backend.memory.test.js
View File

@@ -206,7 +206,7 @@ test('query sort', function () {
]
};
dataset.query(queryObj).then(function() {
var doc0 = dataset.currentRecords.models[0].toJSON();
var doc0 = dataset.records.models[0].toJSON();
equal(doc0.x, 6);
});
});
@@ -215,13 +215,13 @@ test('query string', function () {
var dataset = makeBackendDataset();
dataset.fetch();
dataset.query({q: 'UK'}).then(function() {
equal(dataset.currentRecords.length, 3);
deepEqual(dataset.currentRecords.pluck('country'), ['UK', 'UK', 'UK']);
equal(dataset.records.length, 3);
deepEqual(dataset.records.pluck('country'), ['UK', 'UK', 'UK']);
});
dataset.query({q: 'UK 6'}).then(function() {
equal(dataset.currentRecords.length, 1);
deepEqual(dataset.currentRecords.models[0].id, 1);
equal(dataset.records.length, 1);
deepEqual(dataset.records.models[0].id, 1);
});
});
@@ -229,8 +229,8 @@ test('filters', function () {
var dataset = makeBackendDataset();
dataset.queryState.addFilter({type: 'term', field: 'country', term: 'UK'});
dataset.query().then(function() {
equal(dataset.currentRecords.length, 3);
deepEqual(dataset.currentRecords.pluck('country'), ['UK', 'UK', 'UK']);
equal(dataset.records.length, 3);
deepEqual(dataset.records.pluck('country'), ['UK', 'UK', 'UK']);
});
});

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

@@ -74,11 +74,11 @@ test('Lat/Lon geom fields', function () {
equal(_getFeaturesCount(view.features),6);
// Delete a record
view.model.currentRecords.remove(view.model.currentRecords.get('1'));
view.model.records.remove(view.model.records.get('1'));
equal(_getFeaturesCount(view.features),5);
// Add a new one
view.model.currentRecords.add({id: 7, x: 7, y: 14, z: 21, country: 'KX', label: 'seventh', lat:13.23, lon:23.56}),
view.model.records.add({id: 7, x: 7, y: 14, z: 21, country: 'KX', label: 'seventh', lat:13.23, lon:23.56}),
equal(_getFeaturesCount(view.features),6);
view.remove();
@@ -98,11 +98,11 @@ test('GeoJSON geom field', function () {
equal(_getFeaturesCount(view.features),3);
// Delete a record
view.model.currentRecords.remove(view.model.currentRecords.get('2'));
view.model.records.remove(view.model.records.get('2'));
equal(_getFeaturesCount(view.features),2);
// Add it back
view.model.currentRecords.add({id: 2, x: 3, y: 6, z: 9, geom: {type:"LineString",coordinates:[[100.0, 0.0],[101.0, 1.0]]}}),
view.model.records.add({id: 2, x: 3, y: 6, z: 9, geom: {type:"LineString",coordinates:[[100.0, 0.0],[101.0, 1.0]]}}),
equal(_getFeaturesCount(view.features),3);
view.remove();

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

@@ -16,7 +16,7 @@ test('basic', function () {
assertPresent('.slick-header-column[title="x"]');
equal($('.slick-header-column').length,dataset.fields.length);
equal(dataset.currentRecords.length,view.grid.getDataLength());
equal(dataset.records.length,view.grid.getDataLength());
view.remove();
});

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

@@ -27,14 +27,14 @@ test('basics', function () {
$editForm.find('input').val('UK');
$editForm.submit();
equal(dataset.queryState.attributes.filters[0].term, 'UK');
equal(dataset.currentRecords.length, 3);
equal(dataset.records.length, 3);
// now remove filter
$editForm.find('.js-remove-filter').click();
// hmmm, not working yet but works by eye!
// $editForm = view.el.find('form.js-edit');
// equal($editForm.find('.filter-term').length, 0)
// equal(dataset.currentRecords.length, 6);
// equal(dataset.records.length, 6);
view.remove();
});