Skip to content

Commit fbde5fb

Browse files
author
Tim Roes
committed
Fix existing jest tests and add test todos
1 parent c78f3f1 commit fbde5fb

File tree

2 files changed

+21
-26
lines changed

2 files changed

+21
-26
lines changed

src/plugins/data/public/search/tabify/buckets.test.ts

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import { TabifyBuckets } from './buckets';
2121
import { AggGroupNames } from '../aggs';
22+
import moment from 'moment';
2223

2324
describe('Buckets wrapper', () => {
2425
const check = (aggResp: any, count: number, keys: string[]) => {
@@ -187,9 +188,9 @@ describe('Buckets wrapper', () => {
187188
},
188189
};
189190
const timeRange = {
190-
gte: 150,
191-
lte: 350,
192-
name: 'date',
191+
from: moment(150),
192+
to: moment(350),
193+
timeFields: ['date'],
193194
};
194195
const buckets = new TabifyBuckets(aggResp, aggParams, timeRange);
195196

@@ -204,9 +205,9 @@ describe('Buckets wrapper', () => {
204205
},
205206
};
206207
const timeRange = {
207-
gte: 150,
208-
lte: 350,
209-
name: 'date',
208+
from: moment(150),
209+
to: moment(350),
210+
timeFields: ['date'],
210211
};
211212
const buckets = new TabifyBuckets(aggResp, aggParams, timeRange);
212213

@@ -221,9 +222,9 @@ describe('Buckets wrapper', () => {
221222
},
222223
};
223224
const timeRange = {
224-
gte: 100,
225-
lte: 400,
226-
name: 'date',
225+
from: moment(100),
226+
to: moment(400),
227+
timeFields: ['date'],
227228
};
228229
const buckets = new TabifyBuckets(aggResp, aggParams, timeRange);
229230

@@ -238,13 +239,17 @@ describe('Buckets wrapper', () => {
238239
},
239240
};
240241
const timeRange = {
241-
gte: 150,
242-
lte: 350,
243-
name: 'date',
242+
from: moment(150),
243+
to: moment(350),
244+
timeFields: ['date'],
244245
};
245246
const buckets = new TabifyBuckets(aggResp, aggParams, timeRange);
246247

247248
expect(buckets).toHaveLength(4);
248249
});
250+
251+
test.todo('does drop bucket when multiple time fields specified');
252+
253+
test.todo('does drop all buckets with matchin time fields');
249254
});
250255
});

x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -262,20 +262,7 @@ describe('IndexPattern Data Source', () => {
262262
Object {
263263
"arguments": Object {
264264
"aggConfigs": Array [
265-
Object {
266-
"chain": Array [
267-
Object {
268-
"arguments": Object {
269-
"aggConfigs": Array [
270-
"[{\\"id\\":\\"col1\\",\\"enabled\\":true,\\"type\\":\\"count\\",\\"schema\\":\\"metric\\",\\"params\\":{}},{\\"id\\":\\"col2\\",\\"enabled\\":true,\\"type\\":\\"date_histogram\\",\\"schema\\":\\"segment\\",\\"params\\":{\\"field\\":\\"timestamp\\",\\"useNormalizedEsInterval\\":true,\\"interval\\":\\"1d\\",\\"drop_partials\\":false,\\"min_doc_count\\":0,\\"extended_bounds\\":{}}}]",
271-
],
272-
},
273-
"function": "lens_auto_date",
274-
"type": "function",
275-
},
276-
],
277-
"type": "expression",
278-
},
265+
"[{\\"id\\":\\"col1\\",\\"enabled\\":true,\\"type\\":\\"count\\",\\"schema\\":\\"metric\\",\\"params\\":{}},{\\"id\\":\\"col2\\",\\"enabled\\":true,\\"type\\":\\"date_histogram\\",\\"schema\\":\\"segment\\",\\"params\\":{\\"field\\":\\"timestamp\\",\\"useNormalizedEsInterval\\":true,\\"interval\\":\\"1d\\",\\"drop_partials\\":false,\\"min_doc_count\\":0,\\"extended_bounds\\":{}}}]",
279266
],
280267
"includeFormatHints": Array [
281268
true,
@@ -289,6 +276,9 @@ describe('IndexPattern Data Source', () => {
289276
"partialRows": Array [
290277
false,
291278
],
279+
"timeField": Array [
280+
"timestamp",
281+
],
292282
},
293283
"function": "esaggs",
294284
"type": "function",

0 commit comments

Comments
 (0)