diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2017-03-02 10:11:23 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-03-23 23:35:41 -0600 |
| commit | 46a32045d76763f6ff3841e2f39fa0ba244eb858 (patch) | |
| tree | d8f4eb766f7a17d5ac97a1d1b223c31a142c66b7 /tests/karma.config.js | |
| parent | e18d928d9b7f193f3f12d608457bfeb0a83a00e5 (diff) | |
| download | nextcloud-server-46a32045d76763f6ff3841e2f39fa0ba244eb858.tar.gz nextcloud-server-46a32045d76763f6ff3841e2f39fa0ba244eb858.zip | |
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>
Diffstat (limited to 'tests/karma.config.js')
| -rw-r--r-- | tests/karma.config.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js index e9aa38dd66f..91052f62cd2 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -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, |