From 65a9669502c1748ad3115aaf588007d5e46f352b Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 20 Dec 2017 13:28:44 +0300 Subject: [PATCH] improve triggers panel tests --- dist/panel-triggers/specs/migrations.spec.js | 58 ++++---------------- src/panel-triggers/specs/migrations.spec.js | 58 ++++---------------- 2 files changed, 20 insertions(+), 96 deletions(-) diff --git a/dist/panel-triggers/specs/migrations.spec.js b/dist/panel-triggers/specs/migrations.spec.js index 23eb7b1..b5c0541 100644 --- a/dist/panel-triggers/specs/migrations.spec.js +++ b/dist/panel-triggers/specs/migrations.spec.js @@ -1,5 +1,7 @@ +import _ from 'lodash'; import {TriggerPanelCtrl} from '../triggers_panel_ctrl'; -import {DEFAULT_TARGET, DEFAULT_SEVERITY} from '../triggers_panel_ctrl'; +import {DEFAULT_TARGET, DEFAULT_SEVERITY, PANEL_DEFAULTS} from '../triggers_panel_ctrl'; +import {CURRENT_SCHEMA_VERSION} from '../migrations'; describe('Triggers Panel schema migration', () => { let ctx = {}; @@ -43,35 +45,18 @@ describe('Triggers Panel schema migration', () => { it('should update old panel schema', () => { let updatedPanelCtrl = new TriggerPanelCtrl(ctx.scope, {}, timeoutMock, datasourceSrvMock, {}, {}, {}); - let expected = { - schemaVersion: 4, + let expected = _.defaultsDeep({ + schemaVersion: CURRENT_SCHEMA_VERSION, datasources: ['zabbix'], targets: { 'zabbix': DEFAULT_TARGET }, - hostField: true, - hostTechNameField: false, - hostGroups: false, - showTags: true, statusField: false, severityField: false, - descriptionField: true, - descriptionAtNewLine: false, - hostsInMaintenance: true, - showTriggers: 'all triggers', - sortTriggersBy: { text: 'last change', value: 'lastchange' }, - showEvents: { text: 'Problems', value: '1' }, limit: 10, - fontSize: '100%', - pageSize: 10, - highlightNewEvents: true, - highlightNewerThan: '1h', - customLastChangeFormat: false, - lastChangeFormat: "", - triggerSeverity: DEFAULT_SEVERITY, okEventColor: 'rgba(0, 245, 153, 0.45)', ackEventColor: 'rgba(0, 0, 0, 0)' - }; + }, PANEL_DEFAULTS); expect(updatedPanelCtrl.panel).toEqual(expected); }); @@ -80,36 +65,13 @@ describe('Triggers Panel schema migration', () => { ctx.scope.panel = {}; let updatedPanelCtrl = new TriggerPanelCtrl(ctx.scope, {}, {}, datasourceSrvMock, {}, {}, {}); - let expected = { - schemaVersion: 4, + let expected = _.defaultsDeep({ + schemaVersion: CURRENT_SCHEMA_VERSION, datasources: ['zabbix_default'], targets: { 'zabbix_default': DEFAULT_TARGET - }, - hostField: true, - hostTechNameField: false, - hostGroups: false, - showTags: true, - statusField: true, - severityField: true, - descriptionField: true, - descriptionAtNewLine: false, - hostsInMaintenance: true, - showTriggers: 'all triggers', - sortTriggersBy: { text: 'last change', value: 'lastchange' }, - showEvents: { text: 'Problems', value: '1' }, - limit: 100, - fontSize: '100%', - pageSize: 10, - highlightNewEvents: true, - highlightNewerThan: '1h', - customLastChangeFormat: false, - lastChangeFormat: "", - triggerSeverity: DEFAULT_SEVERITY, - okEventColor: 'rgb(56, 189, 113)', - ackEventColor: 'rgb(56, 219, 156)' - }; - + } + }, PANEL_DEFAULTS); expect(updatedPanelCtrl.panel).toEqual(expected); }); }); diff --git a/src/panel-triggers/specs/migrations.spec.js b/src/panel-triggers/specs/migrations.spec.js index 23eb7b1..b5c0541 100644 --- a/src/panel-triggers/specs/migrations.spec.js +++ b/src/panel-triggers/specs/migrations.spec.js @@ -1,5 +1,7 @@ +import _ from 'lodash'; import {TriggerPanelCtrl} from '../triggers_panel_ctrl'; -import {DEFAULT_TARGET, DEFAULT_SEVERITY} from '../triggers_panel_ctrl'; +import {DEFAULT_TARGET, DEFAULT_SEVERITY, PANEL_DEFAULTS} from '../triggers_panel_ctrl'; +import {CURRENT_SCHEMA_VERSION} from '../migrations'; describe('Triggers Panel schema migration', () => { let ctx = {}; @@ -43,35 +45,18 @@ describe('Triggers Panel schema migration', () => { it('should update old panel schema', () => { let updatedPanelCtrl = new TriggerPanelCtrl(ctx.scope, {}, timeoutMock, datasourceSrvMock, {}, {}, {}); - let expected = { - schemaVersion: 4, + let expected = _.defaultsDeep({ + schemaVersion: CURRENT_SCHEMA_VERSION, datasources: ['zabbix'], targets: { 'zabbix': DEFAULT_TARGET }, - hostField: true, - hostTechNameField: false, - hostGroups: false, - showTags: true, statusField: false, severityField: false, - descriptionField: true, - descriptionAtNewLine: false, - hostsInMaintenance: true, - showTriggers: 'all triggers', - sortTriggersBy: { text: 'last change', value: 'lastchange' }, - showEvents: { text: 'Problems', value: '1' }, limit: 10, - fontSize: '100%', - pageSize: 10, - highlightNewEvents: true, - highlightNewerThan: '1h', - customLastChangeFormat: false, - lastChangeFormat: "", - triggerSeverity: DEFAULT_SEVERITY, okEventColor: 'rgba(0, 245, 153, 0.45)', ackEventColor: 'rgba(0, 0, 0, 0)' - }; + }, PANEL_DEFAULTS); expect(updatedPanelCtrl.panel).toEqual(expected); }); @@ -80,36 +65,13 @@ describe('Triggers Panel schema migration', () => { ctx.scope.panel = {}; let updatedPanelCtrl = new TriggerPanelCtrl(ctx.scope, {}, {}, datasourceSrvMock, {}, {}, {}); - let expected = { - schemaVersion: 4, + let expected = _.defaultsDeep({ + schemaVersion: CURRENT_SCHEMA_VERSION, datasources: ['zabbix_default'], targets: { 'zabbix_default': DEFAULT_TARGET - }, - hostField: true, - hostTechNameField: false, - hostGroups: false, - showTags: true, - statusField: true, - severityField: true, - descriptionField: true, - descriptionAtNewLine: false, - hostsInMaintenance: true, - showTriggers: 'all triggers', - sortTriggersBy: { text: 'last change', value: 'lastchange' }, - showEvents: { text: 'Problems', value: '1' }, - limit: 100, - fontSize: '100%', - pageSize: 10, - highlightNewEvents: true, - highlightNewerThan: '1h', - customLastChangeFormat: false, - lastChangeFormat: "", - triggerSeverity: DEFAULT_SEVERITY, - okEventColor: 'rgb(56, 189, 113)', - ackEventColor: 'rgb(56, 219, 156)' - }; - + } + }, PANEL_DEFAULTS); expect(updatedPanelCtrl.panel).toEqual(expected); }); });