Commit 47bec0fd by Tobias Skarhed

Fix requested changes

parent 529883b6
...@@ -3,7 +3,7 @@ import { GraphCtrl } from '../module'; ...@@ -3,7 +3,7 @@ import { GraphCtrl } from '../module';
jest.mock('../graph', () => ({})); jest.mock('../graph', () => ({}));
describe('GraphCtrl', function() { describe('GraphCtrl', () => {
let injector = { let injector = {
get: () => { get: () => {
return { return {
...@@ -34,15 +34,12 @@ describe('GraphCtrl', function() { ...@@ -34,15 +34,12 @@ describe('GraphCtrl', function() {
beforeEach(() => { beforeEach(() => {
ctx.ctrl = new GraphCtrl(scope, injector, {}); ctx.ctrl = new GraphCtrl(scope, injector, {});
});
beforeEach(() => {
ctx.ctrl.annotationsPromise = Promise.resolve({}); ctx.ctrl.annotationsPromise = Promise.resolve({});
ctx.ctrl.updateTimeRange(); ctx.ctrl.updateTimeRange();
}); });
describe('when time series are outside range', function() { describe('when time series are outside range', () => {
beforeEach(function() { beforeEach(() => {
var data = [ var data = [
{ {
target: 'test.cpu1', target: 'test.cpu1',
...@@ -54,13 +51,13 @@ describe('GraphCtrl', function() { ...@@ -54,13 +51,13 @@ describe('GraphCtrl', function() {
ctx.ctrl.onDataReceived(data); ctx.ctrl.onDataReceived(data);
}); });
it('should set datapointsOutside', function() { it('should set datapointsOutside', () => {
expect(ctx.ctrl.dataWarning.title).toBe('Data points outside time range'); expect(ctx.ctrl.dataWarning.title).toBe('Data points outside time range');
}); });
}); });
describe('when time series are inside range', function() { describe('when time series are inside range', () => {
beforeEach(function() { beforeEach(() => {
var range = { var range = {
from: moment() from: moment()
.subtract(1, 'days') .subtract(1, 'days')
...@@ -79,18 +76,18 @@ describe('GraphCtrl', function() { ...@@ -79,18 +76,18 @@ describe('GraphCtrl', function() {
ctx.ctrl.onDataReceived(data); ctx.ctrl.onDataReceived(data);
}); });
it('should set datapointsOutside', function() { it('should set datapointsOutside', () => {
expect(ctx.ctrl.dataWarning).toBe(null); expect(ctx.ctrl.dataWarning).toBe(null);
}); });
}); });
describe('datapointsCount given 2 series', function() { describe('datapointsCount given 2 series', () => {
beforeEach(function() { beforeEach(() => {
var data = [{ target: 'test.cpu1', datapoints: [] }, { target: 'test.cpu2', datapoints: [] }]; var data = [{ target: 'test.cpu1', datapoints: [] }, { target: 'test.cpu2', datapoints: [] }];
ctx.ctrl.onDataReceived(data); ctx.ctrl.onDataReceived(data);
}); });
it('should set datapointsCount warning', function() { it('should set datapointsCount warning', () => {
expect(ctx.ctrl.dataWarning.title).toBe('No data points'); expect(ctx.ctrl.dataWarning.title).toBe('No data points');
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment