Merge branch 'cartovl-130' of github.com:CartoDB/Windshaft-cartodb into cartovl-130

# Conflicts:
#	test/acceptance/date-wrapping.spec.js
This commit is contained in:
Javier Goizueta
2018-06-05 15:43:13 +02:00
+2
View File
@@ -45,6 +45,8 @@ describe('date-wrapping', () => {
assert.ifError(err);
assert.deepEqual(layergroup.metadata.layers[0].meta.dates_as_numbers, ['date']);
testClient.drain(done);
assert.deepEqual(layergroup.metadata.layers[0].meta.dates_as_numbers.sort(), expected.sort());
done();
});
});