Skip to content

N
nexpie-grafana-theme
Commit 3985e52a by Torkel Ödegaard
Options

Fixed unit tests broken after angular 1.3 upgrade

parent fee44d83
Showing with 5 additions and 5 deletions
src/test/test-main.js
...@@ -16,10 +16,10 @@ require.config({ ...@@ -16,10 +16,10 @@ require.config({
filesaver: '../vendor/filesaver', filesaver: '../vendor/filesaver',
angular: '../vendor/angular/angular', angular: '../vendor/angular/angular',
'angular-route': '../vendor/angular/angular-route',
angularMocks: '../vendor/angular/angular-mocks', angularMocks: '../vendor/angular/angular-mocks',
'angular-dragdrop': '../vendor/angular/angular-dragdrop', 'angular-dragdrop': '../vendor/angular/angular-dragdrop',
'angular-strap': '../vendor/angular/angular-strap', 'angular-strap': '../vendor/angular/angular-strap',
'angular-sanitize': '../vendor/angular/angular-sanitize',
timepicker: '../vendor/angular/timepicker', timepicker: '../vendor/angular/timepicker',
datepicker: '../vendor/angular/datepicker', datepicker: '../vendor/angular/datepicker',
bindonce: '../vendor/angular/bindonce', bindonce: '../vendor/angular/bindonce',
...@@ -81,7 +81,7 @@ require.config({ ...@@ -81,7 +81,7 @@ require.config({
'jquery.flot.stackpercent':['jquery', 'jquery.flot'], 'jquery.flot.stackpercent':['jquery', 'jquery.flot'],
'jquery.flot.time': ['jquery', 'jquery.flot'], 'jquery.flot.time': ['jquery', 'jquery.flot'],
'angular-sanitize': ['angular'], 'angular-route': ['angular'],
'angular-cookies': ['angular'], 'angular-cookies': ['angular'],
'angular-dragdrop': ['jquery','jquery-ui','angular'], 'angular-dragdrop': ['jquery','jquery-ui','angular'],
'angular-loader': ['angular'], 'angular-loader': ['angular'],
...@@ -101,11 +101,11 @@ require.config({ ...@@ -101,11 +101,11 @@ require.config({
require([ require([
'angular', 'angular',
'angular-route',
'angularMocks', 'angularMocks',
'jquery', 'jquery',
'underscore', 'underscore',
'bootstrap', 'bootstrap',
'angular-sanitize',
'angular-strap', 'angular-strap',
'angular-dragdrop', 'angular-dragdrop',
'extend-jquery', 'extend-jquery',
...@@ -113,8 +113,8 @@ require([ ...@@ -113,8 +113,8 @@ require([
], function(angular) { ], function(angular) {
'use strict'; 'use strict';
angular.module('grafana', []); angular.module('grafana', ['ngRoute']);
angular.module('grafana.services', ['$strap.directives']); angular.module('grafana.services', ['ngRoute', '$strap.directives']);
angular.module('grafana.panels', []); angular.module('grafana.panels', []);
angular.module('grafana.filters', []); angular.module('grafana.filters', []);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment