diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-01-13 14:47:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 14:47:06 +0100 |
| commit | 0f792fedefb0b31367e59b1d5abe1db20371d04f (patch) | |
| tree | 1bdf4b937454a8cd972434c43725f5d940466524 /tests | |
| parent | 91beb178a7cf00749cdaab3c8eefa2536e53976d (diff) | |
| parent | dd88e70dffc9f7f4dbd83fdb2f2408af8827eb4c (diff) | |
| download | nextcloud-server-0f792fedefb0b31367e59b1d5abe1db20371d04f.tar.gz nextcloud-server-0f792fedefb0b31367e59b1d5abe1db20371d04f.zip | |
Merge pull request #3060 from nextcloud/cleanup-js-tests
Cleanup js tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/karma.config.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js index afb1fa81463..c499451c7dc 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -220,11 +220,15 @@ module.exports = function(config) { // serve images to avoid warnings files.push({pattern: 'core/img/**/*', watched: false, included: false, served: true}); + files.push({pattern: 'core/css/images/*', watched: false, included: false, served: true}); // include core CSS files.push({pattern: 'core/css/*.css', watched: true, included: true, served: true}); files.push({pattern: 'tests/css/*.css', watched: true, included: true, served: true}); + // Allow fonts + files.push({pattern: 'core/fonts/*', watched: false, included: false, served: true}); + config.set({ // base path, that will be used to resolve files and exclude @@ -245,8 +249,9 @@ module.exports = function(config) { // prevent warnings for images '/base/tests/img/': 'http://localhost:9876/base/core/img/', '/base/tests/css/': 'http://localhost:9876/base/core/css/', + '/base/core/css/images/': 'http://localhost:9876/base/core/css/images/', '/actions/': 'http://localhost:9876/base/core/img/actions/', - '/context.html//core/fonts/': 'http://localhost:9876/base/core/fonts/' + '/base/core/fonts/': 'http://localhost:9876/base/core/fonts/' }, // test results reporter to use @@ -267,7 +272,7 @@ module.exports = function(config) { reporters: [ { type: 'html' }, { type: 'cobertura' }, - { type: 'lcovonly' }, + { type: 'lcovonly' } ] }, |