Skip to content
This repository was archived by the owner on May 25, 2019. It is now read-only.

Commit edce422

Browse files
committed
chore(dep): update dependencied
1 parent 64058a8 commit edce422

3 files changed

Lines changed: 75 additions & 51 deletions

File tree

bower.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
],
1111
"main": "./ui-map.js",
1212
"dependencies": {
13-
"angular": ">= 1.0.2",
14-
"angular-ui-utils": "latest"
13+
"angular": "1.x",
14+
"angular-ui-utils": "0.x"
1515
},
1616
"devDependencies": {
17-
"angular-mocks": ">= 1.0.2",
18-
"angular-ui-docs": "angular-ui/angular-ui-docs"
17+
"angular-mocks": "1.x"
1918
}
2019
}

package.json

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,24 @@
88
"main": "./ui-map.js",
99
"dependencies": {},
1010
"devDependencies": {
11-
"grunt": "~0.4.1",
12-
"grunt-karma": "~0.4.x",
13-
"grunt-contrib-jshint": "~0.5.3",
14-
"grunt-contrib-uglify": "~0.2.0",
15-
"grunt-contrib-copy": "~0.4.1",
16-
"grunt-contrib-watch": "~0.5.1",
17-
"grunt-conventional-changelog": "~1.0.0"
11+
"angular-ui-publisher": "1.x",
12+
"grunt": "0.4.x",
13+
"grunt-contrib-copy": "0.5.x",
14+
"grunt-contrib-jshint": "0.8.x",
15+
"grunt-contrib-uglify": "0.2.x",
16+
"grunt-contrib-watch": "0.5.x",
17+
"grunt-conventional-changelog": "1.x",
18+
"grunt-karma": "0.6.x",
19+
"karma": "0.10.x",
20+
"karma-chrome-launcher": "0.1.x",
21+
"karma-coffee-preprocessor": "0.1.x",
22+
"karma-firefox-launcher": "0.1.x",
23+
"karma-html2js-preprocessor": "0.1.x",
24+
"karma-jasmine": "0.1.x",
25+
"karma-phantomjs-launcher": "0.1.x",
26+
"karma-requirejs": "0.2.x",
27+
"karma-script-launcher": "0.1.x",
28+
"requirejs": "2.1.x"
1829
},
1930
"scripts": {},
2031
"repository": {

test/karma.conf.js

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,73 @@
11
// Karma configuration
2-
// Generated on Thu May 16 2013 16:32:29 GMT+0200 (CEST)
2+
// Generated on Sat Dec 28 2013 18:07:39 GMT+0100 (CET)
33

4+
module.exports = function(config) {
5+
config.set({
46

5-
// base path, that will be used to resolve files and exclude
6-
basePath = '..';
7+
// base path, that will be used to resolve files and exclude
8+
basePath: '..',
79

810

9-
// list of files / patterns to load in the browser
10-
files = [
11-
JASMINE,
12-
JASMINE_ADAPTER,
13-
'bower_components/angular/angular.js',
14-
'bower_components/angular-mocks/angular-mocks.js',
15-
'bower_components/angular-ui-utils/modules/event/event.js',
16-
'ui-map.js',
17-
'test/googlemaps.js',
18-
'test/*Spec.js'
19-
];
11+
// frameworks to use
12+
frameworks: ['jasmine'],
2013

2114

22-
// list of files to exclude
23-
exclude = [
24-
25-
];
15+
// list of files / patterns to load in the browser
16+
files: [
17+
'bower_components/angular/angular.js',
18+
'bower_components/angular-mocks/angular-mocks.js',
19+
'bower_components/angular-ui-utils/modules/event/event.js',
20+
'ui-map.js',
21+
'test/googlemaps.js',
22+
'test/*Spec.js'
23+
],
2624

2725

28-
// test results reporter to use
29-
// possible values: 'dots', 'progress', 'junit'
30-
reporters = ['dots'];
26+
// list of files to exclude
27+
exclude: [
3128

29+
],
3230

33-
// enable / disable colors in the output (reporters and logs)
34-
colors = true;
3531

32+
// test results reporter to use
33+
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
34+
reporters: ['progress'],
3635

37-
// level of logging
38-
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
39-
logLevel = LOG_INFO;
4036

37+
// web server port
38+
port: 9876,
4139

42-
// enable / disable watching file and executing tests whenever any file changes
43-
autoWatch = false;
4440

41+
// enable / disable colors in the output (reporters and logs)
42+
colors: true,
4543

46-
// Start these browsers, currently available:
47-
// - Chrome
48-
// - ChromeCanary
49-
// - Firefox
50-
// - Opera
51-
// - Safari (only Mac)
52-
// - PhantomJS
53-
// - IE (only Windows)
54-
browsers = ['Chrome', 'Firefox', 'PhantomJS'];
5544

45+
// level of logging
46+
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
47+
logLevel: config.LOG_INFO,
5648

57-
// Continuous Integration mode
58-
// if true, it capture browsers, run tests and exit
59-
singleRun = false;
49+
50+
// enable / disable watching file and executing tests whenever any file changes
51+
autoWatch: true,
52+
53+
54+
// Start these browsers, currently available:
55+
// - Chrome
56+
// - ChromeCanary
57+
// - Firefox
58+
// - Opera (has to be installed with `npm install karma-opera-launcher`)
59+
// - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
60+
// - PhantomJS
61+
// - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
62+
browsers: ['Chrome', 'Firefox', 'PhantomJS'],
63+
64+
65+
// If browser does not capture in given timeout [ms], kill it
66+
captureTimeout: 60000,
67+
68+
69+
// Continuous Integration mode
70+
// if true, it capture browsers, run tests and exit
71+
singleRun: false
72+
});
73+
};

0 commit comments

Comments
 (0)