");
+
+ scope.height = '200px';
+ scope.panel = {
+ legend: {},
+ grid: {},
+ y_formats: [],
+ seriesOverrides: []
+ };
+ scope.dashboard = { timezone: 'browser' };
+ scope.range = {
+ from: new Date('2014-08-09 10:00:00'),
+ to: new Date('2014-09-09 13:00:00')
+ };
+ ctx.data = [];
+ ctx.data.push(new TimeSeries({
+ datapoints: [[1,1],[2,2]],
+ info: { alias: 'series1', enable: true }
+ }));
+ ctx.data.push(new TimeSeries({
+ datapoints: [[1,1],[2,2]],
+ info: { alias: 'series2', enable: true }
+ }));
+
+ setupFunc(scope, ctx.data);
+
+ $compile(element)(scope);
+ scope.$digest();
+ $.plot = ctx.plotSpy = sinon.spy();
+
+ scope.$emit('render', ctx.data);
+ ctx.plotData = ctx.plotSpy.getCall(0).args[1];
+ ctx.plotOptions = ctx.plotSpy.getCall(0).args[2];
+ }));
+ };
+
+ func(ctx);
+ });
+ }
+
+ graphScenario('simple lines options', function(ctx) {
+ ctx.setup(function(scope) {
+ scope.panel.lines = true;
+ scope.panel.fill = 5;
+ scope.panel.linewidth = 3;
+ scope.panel.steppedLine = true;
+ });
+
+ it('should configure plot with correct options', function() {
+ expect(ctx.plotOptions.series.lines.show).to.be(true);
+ expect(ctx.plotOptions.series.lines.fill).to.be(0.5);
+ expect(ctx.plotOptions.series.lines.lineWidth).to.be(3);
+ expect(ctx.plotOptions.series.lines.steps).to.be(true);
+ });
+ });
+
+ graphScenario('series option overrides, fill & points', function(ctx) {
+ ctx.setup(function(scope, data) {
+ scope.panel.lines = true;
+ scope.panel.fill = 5;
+ scope.panel.seriesOverrides = [
+ { alias: 'test', fill: 0, points: true }
+ ];
+
+ data[1].info.alias = 'test';
+ });
+
+ it('should match second series and fill zero, and enable points', function() {
+ expect(ctx.plotOptions.series.lines.fill).to.be(0.5);
+ expect(ctx.plotData[1].lines.fill).to.be(0.001);
+ expect(ctx.plotData[1].points.show).to.be(true);
+ });
+ });
+
+ graphScenario('should order series order according to zindex', function(ctx) {
+ ctx.setup(function(scope) {
+ scope.panel.seriesOverrides = [{ alias: 'series1', zindex: 2 }];
+ });
+
+ it('should move zindex 2 last', function() {
+ expect(ctx.plotData[0].info.alias).to.be('series2');
+ expect(ctx.plotData[1].info.alias).to.be('series1');
+ });
+ });
+
+ });
+});
+
diff --git a/src/test/specs/helpers.js b/src/test/specs/helpers.js
index cd31779cc99..de2be527f9f 100644
--- a/src/test/specs/helpers.js
+++ b/src/test/specs/helpers.js
@@ -69,7 +69,7 @@ define([
}
return {
from : kbn.parseDate(this.time.from),
- to : kbn.parseDate(this.time.to)
+ to : kbn.parseDate(this.time.to)
};
};
diff --git a/src/test/specs/seriesOverridesCtrl-specs.js b/src/test/specs/seriesOverridesCtrl-specs.js
new file mode 100644
index 00000000000..e211b6dab35
--- /dev/null
+++ b/src/test/specs/seriesOverridesCtrl-specs.js
@@ -0,0 +1,51 @@
+define([
+ './helpers',
+ 'panels/graph/seriesOverridesCtrl'
+], function(helpers) {
+ 'use strict';
+
+ describe('SeriesOverridesCtrl', function() {
+ var ctx = new helpers.ControllerTestContext();
+
+ beforeEach(module('grafana.services'));
+ beforeEach(module('grafana.panels.graph'));
+
+ beforeEach(ctx.providePhase());
+ beforeEach(ctx.createControllerPhase('SeriesOverridesCtrl'));
+ beforeEach(function() {
+ ctx.scope.render = function() {};
+ });
+
+ describe('Controller should init overrideMenu', function() {
+ it('click should include option and value index', function() {
+ expect(ctx.scope.overrideMenu[1].submenu[1].click).to.be('setOverride(1,1)');
+ });
+ });
+
+ describe('When setting an override', function() {
+ beforeEach(function() {
+ ctx.scope.setOverride(1, 0);
+ });
+
+ it('should set override property', function() {
+ expect(ctx.scope.override.lines).to.be(true);
+ });
+
+ it('should update view model', function() {
+ expect(ctx.scope.currentOverrides[0].name).to.be('Lines');
+ expect(ctx.scope.currentOverrides[0].value).to.be('true');
+ });
+ });
+
+ describe('When removing overide', function() {
+ it('click should include option and value index', function() {
+ ctx.scope.setOverride(1,0);
+ ctx.scope.removeOverride({ propertyName: 'lines' });
+ expect(ctx.scope.currentOverrides.length).to.be(0);
+ });
+ });
+
+ });
+
+});
+
diff --git a/src/test/specs/timeSeries-specs.js b/src/test/specs/timeSeries-specs.js
new file mode 100644
index 00000000000..cf28c1aa450
--- /dev/null
+++ b/src/test/specs/timeSeries-specs.js
@@ -0,0 +1,115 @@
+define([
+ 'components/timeSeries'
+], function(TimeSeries) {
+ 'use strict';
+
+ describe("TimeSeries", function() {
+ var points, series;
+ var yAxisFormats = ['short', 'ms'];
+ var testData = {
+ info: { alias: 'test' },
+ datapoints: [
+ [1,2],[null,3],[10,4],[8,5]
+ ]
+ };
+
+ describe('when getting flot pairs', function() {
+ it('with connected style, should ignore nulls', function() {
+ series = new TimeSeries(testData);
+ points = series.getFlotPairs('connected', yAxisFormats);
+ expect(points.length).to.be(3);
+ });
+
+ it('with null as zero style, should replace nulls with zero', function() {
+ series = new TimeSeries(testData);
+ points = series.getFlotPairs('null as zero', yAxisFormats);
+ expect(points.length).to.be(4);
+ expect(points[1][1]).to.be(0);
+ });
+ });
+
+ describe('series overrides', function() {
+ var series;
+ beforeEach(function() {
+ series = new TimeSeries(testData);
+ });
+
+ describe('fill & points', function() {
+ beforeEach(function() {
+ series.info.alias = 'test';
+ series.applySeriesOverrides([{ alias: 'test', fill: 0, points: true }]);
+ });
+
+ it('should set fill zero, and enable points', function() {
+ expect(series.lines.fill).to.be(0.001);
+ expect(series.points.show).to.be(true);
+ });
+ });
+
+ describe('series option overrides, bars, true & lines false', function() {
+ beforeEach(function() {
+ series.info.alias = 'test';
+ series.applySeriesOverrides([{ alias: 'test', bars: true, lines: false }]);
+ });
+
+ it('should disable lines, and enable bars', function() {
+ expect(series.lines.show).to.be(false);
+ expect(series.bars.show).to.be(true);
+ });
+ });
+
+ describe('series option overrides, linewidth, stack', function() {
+ beforeEach(function() {
+ series.info.alias = 'test';
+ series.applySeriesOverrides([{ alias: 'test', linewidth: 5, stack: false }]);
+ });
+
+ it('should disable stack, and set lineWidth', function() {
+ expect(series.stack).to.be(false);
+ expect(series.lines.lineWidth).to.be(5);
+ });
+ });
+
+ describe('series option overrides, pointradius, steppedLine', function() {
+ beforeEach(function() {
+ series.info.alias = 'test';
+ series.applySeriesOverrides([{ alias: 'test', pointradius: 5, steppedLine: true }]);
+ });
+
+ it('should set pointradius, and set steppedLine', function() {
+ expect(series.points.radius).to.be(5);
+ expect(series.lines.steps).to.be(true);
+ });
+ });
+
+ describe('override match on regex', function() {
+ beforeEach(function() {
+ series.info.alias = 'test_01';
+ series.applySeriesOverrides([{ alias: '/.*01/', lines: false }]);
+ });
+
+ it('should match second series', function() {
+ expect(series.lines.show).to.be(false);
+ });
+ });
+
+ describe('override series y-axis, and z-index', function() {
+ beforeEach(function() {
+ series.info.alias = 'test';
+ series.applySeriesOverrides([{ alias: 'test', yaxis: 2, zindex: 2 }]);
+ });
+
+ it('should set yaxis', function() {
+ expect(series.info.yaxis).to.be(2);
+ });
+
+ it('should set zindex', function() {
+ expect(series.zindex).to.be(2);
+ });
+ });
+
+ });
+
+ });
+
+});
diff --git a/src/test/test-main.js b/src/test/test-main.js
index 9c7cfe73341..4e231c8c1aa 100644
--- a/src/test/test-main.js
+++ b/src/test/test-main.js
@@ -118,10 +118,13 @@ require([
'specs/lexer-specs',
'specs/parser-specs',
'specs/gfunc-specs',
+ 'specs/timeSeries-specs',
'specs/row-ctrl-specs',
'specs/graphiteTargetCtrl-specs',
'specs/influxdb-datasource-specs',
'specs/graph-ctrl-specs',
+ 'specs/grafanaGraph-specs',
+ 'specs/seriesOverridesCtrl-specs',
'specs/filterSrv-specs',
'specs/kbn-format-specs',
'specs/dashboardSrv-specs',