From 9fcf8d00b4b2362bf247dff144d7060b13bcffad Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 21 Apr 2016 13:40:43 +0100
Subject: [PATCH] Silence some 404s from the tests

Add an edit.png so we don't get a 404 every time we load some event tiles
---
 karma.conf.js     |   9 +++++++++
 test/img/edit.png | Bin 0 -> 460 bytes
 2 files changed, 9 insertions(+)
 create mode 100644 test/img/edit.png

diff --git a/karma.conf.js b/karma.conf.js
index 52eea45f12..1ae2494add 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -51,8 +51,17 @@ module.exports = function (config) {
         files: [
             testFile,
             gsCss,
+
+            // some images to reduce noise from the tests
+            {pattern: 'test/img/*', watched: false, included: false,
+             served: true, nocache: false},
         ],
 
+        // redirect img links to the karma server
+        proxies: {
+            "/img/": "/base/test/img/",
+        },
+
         // list of files to exclude
         //
         // This doesn't work. It turns out that it's webpack which does the
diff --git a/test/img/edit.png b/test/img/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f373d3f3dc7dfbb4186e4347fad43920bd04279
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$hDk(0R45gVlCf&SP!xv$Tx)R<B%3%0jY1+0U3HR9ox2tK2udHp!Dp~<U{~!M
zh?6c3MFayH7eNa`6hxt7()*{qA&3;ukbA@VzjMw#=V*vnu~@vV)oRsbGWnuunn{=M
z`}S_Pdv7+IZ{zX!Tgf$bX*3%5hGBH_`TSijmqRL*3S8Um7PHw5)9G~XIL=eOUjI}K
z2({a7Z@FB`1ec9IYN#c6!}6G^TrO+rbUF;CE~nE8gTVl@bWpS3?>myQVlu+3ygXZ$
zrL^HmsMqUZu~<OYbrcE(91aIPo6Wj{jo_QkO+m6mWHK3)N~J(TEg8Y?sYWRH9I8|*
z5JCiQYRUZmDMFtAK@k~*?4iw;)2@N2B_lXo&WR>x1@)$Ad4coqLoFF_9IaN%;hfg%
zwLh6me3|*;FsY%IjNlq^Bl`Wme>@&xnr7IDXr|R_1!|}z6Qi@+?S9E9ADhkQk#kBU
z5{Sp+@H`K$>tZw-VK^MlZQFiOD;Mr61F(c^m;46@h9Cq<lTzpa0000<MNUMnLSTYK
Ck<2du

literal 0
HcmV?d00001