This is an automated email from the ASF dual-hosted git repository. mmiklavcic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push: new 80ae71f METRON-2062 Metron Alerts: Accidentally commited 'fdescribe' in unit tests (ruffle1986 via mmiklavc) closes apache/metron#1372 80ae71f is described below commit 80ae71f5ebeb3c6761951a70871fee208448f3e1 Author: ruffle1986 <ftamas.m...@gmail.com> AuthorDate: Mon Apr 15 14:58:03 2019 -0600 METRON-2062 Metron Alerts: Accidentally commited 'fdescribe' in unit tests (ruffle1986 via mmiklavc) closes apache/metron#1372 --- .../app/shared/time-range/time-range.component.spec.ts | 18 +++++++++++------- .../metron-alerts/src/app/utils/utils.spec.ts | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/metron-interface/metron-alerts/src/app/shared/time-range/time-range.component.spec.ts b/metron-interface/metron-alerts/src/app/shared/time-range/time-range.component.spec.ts index 51c64b2..15a12c1 100644 --- a/metron-interface/metron-alerts/src/app/shared/time-range/time-range.component.spec.ts +++ b/metron-interface/metron-alerts/src/app/shared/time-range/time-range.component.spec.ts @@ -61,31 +61,35 @@ describe('TimeRangeComponent', () => { component.datePickerFromDate = '2000-01-31 00:00:00'; component.datePickerToDate = '2000-02-28 00:00:00'; + const fromTS = new Date(component.datePickerFromDate).getTime(); + const toTS = new Date(component.datePickerToDate).getTime(); + spyOn(component.timeRangeChange, 'emit'); component.applyCustomDate(); - const filter = new Filter(TIMESTAMP_FIELD_NAME, '[949273200000 TO 951692400000]', false); - filter.dateFilterValue = new DateFilterValue(949273200000, 951692400000); + const filter = new Filter(TIMESTAMP_FIELD_NAME, `[${fromTS} TO ${toTS}]`, false); + filter.dateFilterValue = new DateFilterValue(fromTS, toTS); expect(component.timeRangeChange.emit).toHaveBeenCalledWith(filter); }); it('should apply current date and time if To field empty', () => { - const currentTs = new Date().getTime(); + jasmine.clock().mockDate(new Date('2000-02-01T12:00:01')); component.datePickerFromDate = '2000-01-31 00:00:00'; component.datePickerToDate = ''; + const fromTS = new Date(component.datePickerFromDate).getTime(); + const currentTs = new Date().getTime(); + spyOn(component.timeRangeChange, 'emit'); component.applyCustomDate(); - const filter = new Filter(TIMESTAMP_FIELD_NAME, `[949273200000 TO ${currentTs}]`, false); - filter.dateFilterValue = new DateFilterValue(949273200000, currentTs); + const filter = new Filter(TIMESTAMP_FIELD_NAME, `[${fromTS} TO ${currentTs}]`, false); + filter.dateFilterValue = new DateFilterValue(fromTS, currentTs); expect(component.timeRangeChange.emit).toHaveBeenCalledWith(filter); }); - - }); describe('Quick Ranges', () => { diff --git a/metron-interface/metron-alerts/src/app/utils/utils.spec.ts b/metron-interface/metron-alerts/src/app/utils/utils.spec.ts index b64c461..ef68685 100644 --- a/metron-interface/metron-alerts/src/app/utils/utils.spec.ts +++ b/metron-interface/metron-alerts/src/app/utils/utils.spec.ts @@ -18,7 +18,7 @@ import { Utils } from './utils'; import { DateFilterValue } from 'app/model/date-filter-value'; -fdescribe('utils.Utils', () => { +describe('utils.Utils', () => { it('Converting time range based on From/To', () => { expect(Utils.timeRangeToDateObj('949273200000 TO 951692400000')).toEqual(new DateFilterValue(949273200000, 951692400000));