Skip to content
Snippets Groups Projects
Commit d5e5ebe5 authored by Sameer Al-Sakran's avatar Sameer Al-Sakran
Browse files

extend filter duration

parent 01139a82
No related branches found
No related tags found
No related merge requests found
......@@ -1561,14 +1561,14 @@ export const productQuestion = new Question(metadata, product_card);
const NoFieldsMetadata = getMetadata(assocIn(state, ["metadata", "tables", ORDERS_TABLE_ID, "fields"], []))
export const questionNoFields = new Question(NoFieldsMetadata, card);
export const orders_past_30_days_segment = {
export const orders_past_300_days_segment = {
"id": null,
"name": "Past 30 days",
"description": "Past 30 days created at",
"name": "Past 300 days",
"description": "Past 300 days created at",
"table_id": 1,
"definition": {
"source_table": 1,
"filter": ["time-interval", ["field-id", 1], -30, "day"]
"filter": ["time-interval", ["field-id", 1], -300, "day"]
}
};
......
......@@ -8,7 +8,7 @@ import { click } from "__support__/enzyme_utils"
import React from 'react';
import { mount } from "enzyme";
import {
orders_past_30_days_segment,
orders_past_300_days_segment,
unsavedOrderCountQuestion,
vendor_count_metric
} from "__support__/sample_dataset_fixture";
......@@ -37,7 +37,7 @@ describe("HomepageApp", () => {
// Delays are required for having separable creation times for each entity
questionId = (await createSavedQuestion(unsavedOrderCountQuestion)).id()
await delay(100);
segmentId = (await SegmentApi.create(orders_past_30_days_segment)).id;
segmentId = (await SegmentApi.create(orders_past_300_days_segment)).id;
await delay(100);
metricId = (await MetricApi.create(vendor_count_metric)).id;
await delay(100);
......@@ -67,8 +67,8 @@ describe("HomepageApp", () => {
expect(activityItems.at(0).text()).toMatch(/Vendor count/);
expect(activityStories.at(0).text()).toMatch(/Tells how many vendors we have/);
expect(activityItems.at(1).text()).toMatch(/Past 30 days/);
expect(activityStories.at(1).text()).toMatch(/Past 30 days created at/);
expect(activityItems.at(1).text()).toMatch(/Past 300 days/);
expect(activityStories.at(1).text()).toMatch(/Past 300 days created at/);
// eslint-disable-next-line no-irregular-whitespace
expect(activityItems.at(2).text()).toMatch(/You saved a question about Orders/);
......
......@@ -9,7 +9,7 @@ import Question from "metabase-lib/lib/Question";
import {
DATABASE_ID,
ORDERS_TABLE_ID,
orders_past_30_days_segment
orders_past_300_days_segment
} from "__support__/sample_dataset_fixture";
import StructuredQuery from "metabase-lib/lib/queries/StructuredQuery";
......@@ -55,7 +55,7 @@ describe('FieldList', () => {
it("should show the query definition tooltip correctly for a segment", async () => {
// TODO Atte Keinänen 6/27/17: Check why the result is wrapped in a promise that needs to be resolved manually
const segment = await (await createSegment(orders_past_30_days_segment)).payload;
const segment = await (await createSegment(orders_past_300_days_segment)).payload;
const store = await createTestStore()
await store.dispatch(fetchDatabases());
......@@ -80,6 +80,6 @@ describe('FieldList', () => {
expect(tooltipContent.length).toBe(1)
// eslint-disable-next-line no-irregular-whitespace
expect(tooltipContent.find(FilterWidget).last().text()).toMatch(/Created At -30day/);
expect(tooltipContent.find(FilterWidget).last().text()).toMatch(/Created At -300day/);
})
});
\ No newline at end of file
......@@ -15,7 +15,7 @@ import { delay } from "metabase/lib/promise"
import QueryBuilder from "metabase/query_builder/containers/QueryBuilder";
import DataReference from "metabase/query_builder/components/dataref/DataReference";
import { orders_past_30_days_segment } from "__support__/sample_dataset_fixture";
import { orders_past_300_days_segment } from "__support__/sample_dataset_fixture";
import { FETCH_TABLE_METADATA } from "metabase/redux/metadata";
import QueryDefinition from "metabase/query_builder/components/dataref/QueryDefinition";
import QueryButton from "metabase/components/QueryButton";
......@@ -32,7 +32,7 @@ describe("SegmentPane", () => {
beforeAll(async () => {
await login();
segment = await SegmentApi.create(orders_past_30_days_segment);
segment = await SegmentApi.create(orders_past_300_days_segment);
store = await createTestStore()
store.pushPath(Urls.plainQuestion());
......@@ -64,7 +64,7 @@ describe("SegmentPane", () => {
// then we can replace this with `store.waitForActions([FETCH_TABLE_FOREIGN_KEYS])` or similar
await delay(3000)
click(dataReference.find(`a[children="${orders_past_30_days_segment.name}"]`).first())
click(dataReference.find(`a[children="${orders_past_300_days_segment.name}"]`).first())
await store.waitForActions([FETCH_TABLE_METADATA]);
});
......@@ -72,7 +72,7 @@ describe("SegmentPane", () => {
it("shows you the correct segment definition", () => {
const queryDefinition = queryBuilder.find(DataReference).find(QueryDefinition);
// eslint-disable-next-line no-irregular-whitespace
expect(queryDefinition.text()).toMatch(/Created At -30day/);
expect(queryDefinition.text()).toMatch(/Created At -300day/);
})
it("lets you apply the filter to your current query", async () => {
......@@ -87,7 +87,7 @@ describe("SegmentPane", () => {
expect(queryBuilder.find(DataReference).find(UseForButton).length).toBe(0);
});
it("lets you see count of rows for past 30 days", async () => {
it("lets you see count of rows for past 300 days", async () => {
const numberQueryButton = queryBuilder.find(DataReference).find(QueryButton).at(0);
try {
......@@ -103,7 +103,7 @@ describe("SegmentPane", () => {
// expect(queryBuilder.find(Scalar).text()).toBe("1,236")
});
it("lets you see raw data for past 30 days", async () => {
it("lets you see raw data for past 300 days", async () => {
const allQueryButton = queryBuilder.find(DataReference).find(QueryButton).at(1);
try {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment