nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Update karma, use sinon from npm 

Update karma library and use sinon JS library provided by
karma-jasmine-sinon instead of local file.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Vincent Petry 2017-03-02 10:11:23 +01:00 committed by Morris Jobke
parent e18d928d9b
commit 46a32045d7
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
3 changed files with 11 additions and 5958 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/package.json
View File

@ -11,14 +11,19 @@
"contributors": [],
"dependencies": {},
"devDependencies": {
"karma": "~1.3.0",
"karma-jasmine": "~1.0.2",
"karma-junit-reporter": "*",
"bower": "~1.8.0",
"handlebars": "^4.0.5",
"jasmine-core": "^2.5.2",
"jasmine-sinon": "^0.4.0",
"jsdoc": "~3.4.0",
"karma": "^1.5.0",
"karma-coverage": "*",
"karma-jasmine": "^1.1.0",
"karma-jasmine-sinon": "^1.0.4",
"karma-junit-reporter": "*",
"karma-phantomjs-launcher": "*",
"phantomjs-prebuilt": "*",
"jasmine-core": "~2.5.2",
"node-sass": "~4.1.1"
},
"engine": "node >= 0.8"
"engine": "node >= 6.9"
}

5949
core/js/tests/lib/sinon-1.15.4.js
View File

File diff suppressed because it is too large Load Diff

5
tests/karma.config.js
View File

@ -158,9 +158,6 @@ module.exports = function(config) {
testCore = true;
}
// extra test libs
files.push(corePath + 'tests/lib/sinon-1.15.4.js');
// core mocks
files.push(corePath + 'tests/specHelper.js');
@ -237,7 +234,7 @@ module.exports = function(config) {
basePath: '..',
// frameworks to use
frameworks: ['jasmine'],
frameworks: ['jasmine', 'jasmine-sinon'],
// list of files / patterns to load in the browser
files: files,