IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: build & tests

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-11-17 16:18:30 +01:00
parent 7b17d134fc
commit 8160e68f93
3 changed files with 68 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jest.config.js
View File

@ -1,6 +1,6 @@
module.exports = { module.exports = {
verbose: true, verbose: false,
"globals": { "globals": {
"ts-jest": { "ts-jest": {
"tsConfigFile": "tsconfig.json" "tsConfigFile": "tsconfig.json"

34
public/app/core/components/search/search.html
View File

@ -51,27 +51,27 @@
</a> </a>
</div> </div>
</div> </div>
</div>
<div class="search-results-container" ng-if="!ctrl.tagsMode"> <div class="search-results-container" ng-if="!ctrl.tagsMode">
<h6 ng-hide="ctrl.results.length">No dashboards matching your query were found.</h6> <h6 ng-hide="ctrl.results.length">No dashboards matching your query were found.</h6>
<div ng-repeat="row in ctrl.results"> <div ng-repeat="row in ctrl.results">
<a class="search-item search-item--{{::row.type}}" ng-class="{'selected': $index == ctrl.selectedIndex}" ng-href="{{row.url}}"> <a class="search-item search-item--{{::row.type}}" ng-class="{'selected': $index == ctrl.selectedIndex}" ng-href="{{row.url}}">
<span class="search-result-tags"> <span class="search-result-tags">
<span ng-click="ctrl.filterByTag(tag, $event)" ng-repeat="tag in row.tags" tag-color-from-name="tag" class="label label-tag"> <span ng-click="ctrl.filterByTag(tag, $event)" ng-repeat="tag in row.tags" tag-color-from-name="tag" class="label label-tag">
{{tag}} {{tag}}
</span>
<span ng-click="ctrl.starDashboard(row, $event)">
<i class="fa" ng-class="{'fa-star': row.isStarred, 'fa-star-o': !row.isStarred}"></i>
</span>
</span> </span>
<span ng-click="ctrl.starDashboard(row, $event)">
<i class="fa" ng-class="{'fa-star': row.isStarred, 'fa-star-o': !row.isStarred}"></i>
</span>
</span>
<span class="search-result-link"> <span class="search-result-link">
<i class="fa search-result-icon"></i> <i class="fa search-result-icon"></i>
{{::row.title}} {{::row.title}}
</span> </span>
</a> </a>
</div>
</div> </div>
</div> </div>
</div> </div>

105
public/app/features/dashboard/specs/save_as_modal.jest.ts
View File

@ -1,67 +1,62 @@
import {SaveDashboardAsModalCtrl} from '../save_as_modal'; import { SaveDashboardAsModalCtrl } from '../save_as_modal';
import {describe, it, expect} from 'test/lib/common'; import { describe, it, expect } from 'test/lib/common';
describe('saving dashboard as', () => { describe('saving dashboard as', () => {
function scenario(name, panel, verify) { function scenario(name, panel, verify) {
describe(name, () => { describe(name, () => {
var json = { var json = {
title: "name", title: 'name',
rows: [ { panels: [ panels: [panel],
panel };
]}]
};
var mockDashboardSrv = { var mockDashboardSrv = {
getCurrent: function() { getCurrent: function() {
return { return {
id: 5, id: 5,
getSaveModelClone: function() { meta: {},
return json; getSaveModelClone: function() {
} return json;
}; },
} };
}; },
};
var ctrl = new SaveDashboardAsModalCtrl(mockDashboardSrv); var ctrl = new SaveDashboardAsModalCtrl(mockDashboardSrv);
var ctx: any = { var ctx: any = {
clone: ctrl.clone, clone: ctrl.clone,
ctrl: ctrl, ctrl: ctrl,
panel: {} panel: panel
}; };
for (let row of ctrl.clone.rows) {
for (let panel of row.panels) {
ctx.panel = panel;
}
}
it("verify", () => {
verify(ctx);
});
});
}
scenario("default values", {}, (ctx) => { it('verify', () => {
var clone = ctx.clone; verify(ctx);
expect(clone.id).toBe(null); });
expect(clone.title).toBe("name Copy");
expect(clone.editable).toBe(true);
expect(clone.hideControls).toBe(false);
}); });
}
var graphPanel = { id: 1, type: "graph", alert: { rule: 1}, thresholds: { value: 3000} }; scenario('default values', {}, ctx => {
var clone = ctx.clone;
expect(clone.id).toBe(null);
expect(clone.title).toBe('name Copy');
expect(clone.editable).toBe(true);
expect(clone.hideControls).toBe(false);
});
scenario("should remove alert from graph panel", graphPanel , (ctx) => { var graphPanel = { id: 1, type: 'graph', alert: { rule: 1 }, thresholds: { value: 3000 } };
expect(ctx.panel.alert).toBe(undefined);
});
scenario("should remove threshold from graph panel", graphPanel, (ctx) => { scenario('should remove alert from graph panel', graphPanel, ctx => {
expect(ctx.panel.thresholds).toBe(undefined); expect(ctx.panel.alert).toBe(undefined);
}); });
scenario("singlestat should keep threshold", { id: 1, type: "singlestat", thresholds: { value: 3000} }, (ctx) => { scenario('should remove threshold from graph panel', graphPanel, ctx => {
expect(ctx.panel.thresholds).not.toBe(undefined); expect(ctx.panel.thresholds).toBe(undefined);
}); });
scenario("table should keep threshold", { id: 1, type: "table", thresholds: { value: 3000} }, (ctx) => { scenario('singlestat should keep threshold', { id: 1, type: 'singlestat', thresholds: { value: 3000 } }, ctx => {
expect(ctx.panel.thresholds).not.toBe(undefined); expect(ctx.panel.thresholds).not.toBe(undefined);
}); });
scenario('table should keep threshold', { id: 1, type: 'table', thresholds: { value: 3000 } }, ctx => {
expect(ctx.panel.thresholds).not.toBe(undefined);
});
}); });