From dc249cf94568aebf698ff344b11848dbba950fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 18 Aug 2017 15:01:29 +0200 Subject: [PATCH] fixed unit tests --- .../app/features/org/specs/user_group_details_ctrl_specs.ts | 3 ++- .../app/features/playlist/specs/playlist_edit_ctrl_specs.ts | 4 +++- public/test/test-main.js | 1 + tasks/options/watch.js | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/public/app/features/org/specs/user_group_details_ctrl_specs.ts b/public/app/features/org/specs/user_group_details_ctrl_specs.ts index 7c68d678dbd..327dad7ac83 100644 --- a/public/app/features/org/specs/user_group_details_ctrl_specs.ts +++ b/public/app/features/org/specs/user_group_details_ctrl_specs.ts @@ -19,7 +19,8 @@ var backendSrv = { ctx.ctrl = $controller(UserGroupDetailsCtrl, { $scope: ctx.scope, backendSrv: backendSrv, - $routeParams: {id: 1} + $routeParams: {id: 1}, + navModelSrv: {getNav: sinon.stub()} }); })); diff --git a/public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts b/public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts index e27eb53e644..b2fee5d85d0 100644 --- a/public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts +++ b/public/app/features/playlist/specs/playlist_edit_ctrl_specs.ts @@ -6,7 +6,9 @@ describe('PlaylistEditCtrl', () => { var ctx: any; beforeEach(() => { let navModelSrv = { - getPlaylistsNav: page => {}, + getNav: () => { + return { breadcrumbs: [], node: {}}; + }, }; ctx = new PlaylistEditCtrl(null, null, null, null, { current: { params: {} } }, navModelSrv); diff --git a/public/test/test-main.js b/public/test/test-main.js index 777e9d76afb..45077bb7b98 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -10,6 +10,7 @@ baseURL: '/base/', defaultJSExtensions: true, paths: { + 'gemini-scrollbar': 'vendor/npm/gemini-scrollbar/index.js', 'mousetrap': 'vendor/npm/mousetrap/mousetrap.js', 'eventemitter3': 'vendor/npm/eventemitter3/index.js', 'remarkable': 'vendor/npm/remarkable/dist/remarkable.js', diff --git a/tasks/options/watch.js b/tasks/options/watch.js index c3449524243..082f97fec77 100644 --- a/tasks/options/watch.js +++ b/tasks/options/watch.js @@ -24,6 +24,7 @@ module.exports = function(config, grunt) { gaze([ config.srcDir + '/sass/**/*', config.srcDir + '/app/**/*', + config.srcDir + '/test/**/*', config.srcDir + '/vendor/npm/gemini-scrollbar/*.js', ], function(err, watcher) {