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

tests: found the unhandled promise issue in the dash import tests

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-10-08 15:56:42 +02:00
parent b228c23dbe
commit 9e61cacd16
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/dashboard/specs/dash_import_ctrl_specs.ts
View File

@ -53,9 +53,10 @@ describe('DashImportCtrl', function() {
// setup api mock // setup api mock
backendSrv.get = sinon.spy(() => { backendSrv.get = sinon.spy(() => {
return Promise.resolve({ return Promise.resolve({
json: {}
}); });
}); });
ctx.ctrl.checkGnetDashboard(); return ctx.ctrl.checkGnetDashboard();
}); });
it('should call gnet api with correct dashboard id', function() { it('should call gnet api with correct dashboard id', function() {
@ -69,9 +70,10 @@ describe('DashImportCtrl', function() {
// setup api mock // setup api mock
backendSrv.get = sinon.spy(() => { backendSrv.get = sinon.spy(() => {
return Promise.resolve({ return Promise.resolve({
json: {}
}); });
}); });
ctx.ctrl.checkGnetDashboard(); return ctx.ctrl.checkGnetDashboard();
}); });
it('should call gnet api with correct dashboard id', function() { it('should call gnet api with correct dashboard id', function() {

2
public/test/index.ts
View File

@ -21,7 +21,7 @@ angular.module('grafana.directives', []);
angular.module('grafana.filters', []); angular.module('grafana.filters', []);
angular.module('grafana.routes', ['ngRoute']); angular.module('grafana.routes', ['ngRoute']);
const context = (<any>require).context('../', true, /specs/); const context = (<any>require).context('../', true, /specs\.(tsx?|js)/);
for (let key of context.keys()) { for (let key of context.keys()) {
context(key); context(key);
} }