Skip to content

Commit 7a07323

Browse files
committed
Merge branch 'release/5.0.3'
2 parents 84700d5 + 0451f3a commit 7a07323

File tree

3 files changed

+61
-3
lines changed

3 files changed

+61
-3
lines changed

dist/angular-fusioncharts.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

karma.conf.js

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Karma configuration
2+
// Generated on Mon Feb 18 2019 19:21:11 GMT+0530 (IST)
3+
4+
module.exports = function(config) {
5+
config.set({
6+
// base path that will be used to resolve all patterns (eg. files, exclude)
7+
basePath: '',
8+
9+
// frameworks to use
10+
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
11+
frameworks: ['jasmine'],
12+
13+
// list of files / patterns to load in the browser
14+
files: [],
15+
16+
// list of files / patterns to exclude
17+
exclude: [],
18+
19+
// preprocess matching files before serving them to the browser
20+
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
21+
preprocessors: {},
22+
23+
// test results reporter to use
24+
// possible values: 'dots', 'progress'
25+
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
26+
reporters: ['progress'],
27+
28+
// web server port
29+
port: 9876,
30+
31+
// enable / disable colors in the output (reporters and logs)
32+
colors: true,
33+
34+
// level of logging
35+
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
36+
logLevel: config.LOG_INFO,
37+
38+
// enable / disable watching file and executing tests whenever any file changes
39+
autoWatch: true,
40+
41+
// start these browsers
42+
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
43+
browsers: ['Chrome'],
44+
45+
// Continuous Integration mode
46+
// if true, Karma captures browsers, runs the tests and exits
47+
singleRun: false,
48+
49+
// Concurrency level
50+
// how many browser should be started simultaneous
51+
concurrency: Infinity
52+
});
53+
};

package.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angularjs-fusioncharts",
3-
"version": "5.0.2",
3+
"version": "5.0.3",
44
"description": "Angular plugin for FusionCharts",
55
"main": "dist/angular-fusioncharts.js",
66
"repository": {
@@ -20,12 +20,17 @@
2020
"dependencies": {},
2121
"devDependencies": {
2222
"angular": "^1.7.2",
23+
"angular-mocks": "^1.7.7",
2324
"ejs": "^1.0.0",
2425
"fusioncharts": "^3.13.3-sr.1",
2526
"grunt": "^0.4.5",
2627
"grunt-contrib-connect": "^2.0.0",
2728
"grunt-contrib-copy": "^0.7.0",
2829
"grunt-contrib-uglify": "^0.6.0",
29-
"grunt-contrib-watch": "^1.1.0"
30+
"grunt-contrib-watch": "^1.1.0",
31+
"jasmine-core": "^3.3.0",
32+
"karma": "^4.0.0",
33+
"karma-chrome-launcher": "^2.2.0",
34+
"karma-jasmine": "^2.0.1"
3035
}
3136
}

0 commit comments

Comments
 (0)