Commit 4cc878b5 by Torkel Ödegaard

build: fixed build

parent fa79be1f
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
"grunt-webpack": "^3.0.2", "grunt-webpack": "^3.0.2",
"html-loader": "^0.5.1", "html-loader": "^0.5.1",
"html-webpack-plugin": "^2.30.1", "html-webpack-plugin": "^2.30.1",
"husky": "^0.14.3",
"jshint-stylish": "~2.2.1", "jshint-stylish": "~2.2.1",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"karma": "1.7.0", "karma": "1.7.0",
...@@ -63,6 +64,7 @@ ...@@ -63,6 +64,7 @@
"karma-sinon": "^1.0.5", "karma-sinon": "^1.0.5",
"karma-sourcemap-loader": "^0.3.7", "karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.4", "karma-webpack": "^2.0.4",
"lint-staged": "^4.2.3",
"load-grunt-tasks": "3.5.2", "load-grunt-tasks": "3.5.2",
"mocha": "3.5.0", "mocha": "3.5.0",
"ng-annotate-loader": "^0.6.1", "ng-annotate-loader": "^0.6.1",
...@@ -73,6 +75,7 @@ ...@@ -73,6 +75,7 @@
"postcss-browser-reporter": "^0.5.0", "postcss-browser-reporter": "^0.5.0",
"postcss-loader": "^2.0.6", "postcss-loader": "^2.0.6",
"postcss-reporter": "^5.0.0", "postcss-reporter": "^5.0.0",
"prettier": "1.7.3",
"react-test-renderer": "^16.0.0", "react-test-renderer": "^16.0.0",
"rxjs": "^5.4.3", "rxjs": "^5.4.3",
"sass-lint": "^1.10.2", "sass-lint": "^1.10.2",
...@@ -95,6 +98,7 @@ ...@@ -95,6 +98,7 @@
"watch": "./node_modules/.bin/webpack --progress --colors --watch --config scripts/webpack/webpack.dev.js", "watch": "./node_modules/.bin/webpack --progress --colors --watch --config scripts/webpack/webpack.dev.js",
"build": "./node_modules/grunt-cli/bin/grunt build", "build": "./node_modules/grunt-cli/bin/grunt build",
"test": "./node_modules/grunt-cli/bin/grunt test", "test": "./node_modules/grunt-cli/bin/grunt test",
"lint" : "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json --type-check",
"watch-test": "./node_modules/grunt-cli/bin/grunt karma:dev" "watch-test": "./node_modules/grunt-cli/bin/grunt karma:dev"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
......
import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common'; import {describe, beforeEach, it, expect, sinon, angularMocks} from 'test/lib/common';
import helpers from 'test/specs/helpers'; import helpers from 'test/specs/helpers';
import '../time_srv'; import '../time_srv';
...@@ -8,6 +8,7 @@ describe('timeSrv', function() { ...@@ -8,6 +8,7 @@ describe('timeSrv', function() {
var ctx = new helpers.ServiceTestContext(); var ctx = new helpers.ServiceTestContext();
var _dashboard: any = { var _dashboard: any = {
time: {from: 'now-6h', to: 'now'}, time: {from: 'now-6h', to: 'now'},
getTimezone: sinon.stub().returns('browser')
}; };
beforeEach(angularMocks.module('grafana.core')); beforeEach(angularMocks.module('grafana.core'));
......
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