From b79e8b81304fd5358e7f137d7e16afa4b35c951d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 6 Aug 2014 16:11:17 +0200 Subject: [PATCH] fixed jshint error in test-main --- src/test/test-main.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/test-main.js b/src/test/test-main.js index 1cc8036c0c9..cf955bc1852 100644 --- a/src/test/test-main.js +++ b/src/test/test-main.js @@ -1,9 +1,3 @@ -for (var file in window.__karma__.files) { - if (/spec\.js$/.test(file)) { - tests.push(file.replace(/^\/base\//, 'http://localhost:9876/base/')); - } -} - require.config({ baseUrl: 'http://localhost:9876/base/app', @@ -93,7 +87,6 @@ require.config({ 'angular-loader': ['angular'], 'angular-mocks': ['angular'], 'angular-resource': ['angular'], - 'angular-route': ['angular'], 'angular-touch': ['angular'], 'bindonce': ['angular'], 'angular-strap': ['angular', 'bootstrap','timepicker', 'datepicker'], @@ -112,6 +105,13 @@ require([ ], function(angular) { 'use strict'; + for (var file in window.__karma__.files) { + if (/spec\.js$/.test(file)) { + window.tests.push(file.replace(/^\/base\//, 'http://localhost:9876/base/')); + } + } + + angular.module('grafana', ['ngRoute']); angular.module('grafana.services', ['ngRoute', '$strap.directives']); angular.module('grafana.panels', []);