diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-24 08:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 08:44:42 +0100 |
| commit | 34632de1024fac6e5d88312bd707f9064b6fc3f4 (patch) | |
| tree | ff17ab07a9047e1422bd73bc329effe23c5940d8 /tests | |
| parent | 1397b84777b0507e2b2f9dcaebe2ca48698ebe74 (diff) | |
| parent | 9bd4c406e3e0b7430a45e4833a6def7bde51d9e3 (diff) | |
| download | nextcloud-server-34632de1024fac6e5d88312bd707f9064b6fc3f4.tar.gz nextcloud-server-34632de1024fac6e5d88312bd707f9064b6fc3f4.zip | |
Merge pull request #4025 from nextcloud/downstream-27292
Update karma
Diffstat (limited to 'tests')
| -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, |