summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-01-10 16:29:39 +0100
committerGitHub <noreply@github.com>2017-01-10 16:29:39 +0100
commit40239decb1b36f1daff53710e01d81e18c24f4fc (patch)
treeb692048967ce7a6ac54a4e821349d2dc0629c8f8 /tests
parentb727edf17e18e9e0aa9060e6a936078a8d5a8d13 (diff)
parente6a3e8bcd0e6cba912404d206588f67e31ca44f0 (diff)
downloadnextcloud-server-40239decb1b36f1daff53710e01d81e18c24f4fc.tar.gz
nextcloud-server-40239decb1b36f1daff53710e01d81e18c24f4fc.zip
Merge pull request #3012 from nextcloud/fix-karma-image-warnings
show fewer warnings in karma test runs
Diffstat (limited to 'tests')
-rw-r--r--tests/karma.config.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 933d6c57410..afb1fa81463 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -243,8 +243,9 @@ module.exports = function(config) {
proxies: {
// prevent warnings for images
- '/context.html//core/img/': 'http://localhost:9876/base/core/img/',
- '/context.html//core/css/': 'http://localhost:9876/base/core/css/',
+ '/base/tests/img/': 'http://localhost:9876/base/core/img/',
+ '/base/tests/css/': 'http://localhost:9876/base/core/css/',
+ '/actions/': 'http://localhost:9876/base/core/img/actions/',
'/context.html//core/fonts/': 'http://localhost:9876/base/core/fonts/'
},