From eda2f7e5938d1cddc3f2973b42e6ceedca835b34 Mon Sep 17 00:00:00 2001
From: Benjamin Brahmer <info@b-brahmer.de>
Date: Sun, 31 Mar 2024 14:51:59 +0200
Subject: [PATCH] Use local feedserver to test the logo/favicon logic

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
---
 tests/command/feeds.bats              |   9 +++++----
 tests/test_helper/feeds/Nextcloud.rss |   4 ++--
 tests/test_helper/feeds/favicon.ico   | Bin 0 -> 4286 bytes
 tests/test_helper/feeds/heise.xml     |   2 +-
 tests/test_helper/feeds/logo.png      | Bin 0 -> 678 bytes
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 tests/test_helper/feeds/favicon.ico
 create mode 100644 tests/test_helper/feeds/logo.png

diff --git a/tests/command/feeds.bats b/tests/command/feeds.bats
index c6b8174b8e..51557e36ca 100644
--- a/tests/command/feeds.bats
+++ b/tests/command/feeds.bats
@@ -39,16 +39,17 @@ teardown() {
   assert_output --partial "Something-${BATS_SUITE_TEST_NUMBER}"
 }
 
+# Test if Feed-Logo is used if available (NC_FEED) and if favicon is used if no logo is provided (HEISE_FEED)
 @test "[$TESTSUITE] Favicon" {
 
-  ./occ news:feed:add "$user" "https://nextcloud.com/blog/static-feed/" --title "Something-${BATS_SUITE_TEST_NUMBER}"
-  ./occ news:feed:add "$user" "https://www.heise.de/rss/heise-atom.xml" --title "Something-${BATS_SUITE_TEST_NUMBER}"
+  ./occ news:feed:add "$user" "$NC_FEED" --title "Something-${BATS_SUITE_TEST_NUMBER}"
+  ./occ news:feed:add "$user" "$HEISE_FEED" --title "Something-${BATS_SUITE_TEST_NUMBER}"
 
   run ./occ news:feed:list "$user"
   assert_success
     
-  assert_output --partial '"faviconLink": "https:\/\/nextcloud.com\/c\/uploads\/2022\/03\/favicon.png",'
-  assert_output --partial  '"faviconLink": "https:\/\/www.heise.de\/favicon.ico?v='
+  assert_output --partial '"faviconLink": "http:\/\/localhost:8090\/logo.png",'
+  assert_output --partial  '"faviconLink": "http:\/\/localhost:8090\/favicon.ico'
 }
 
 @test "[$TESTSUITE] List all items" {
diff --git a/tests/test_helper/feeds/Nextcloud.rss b/tests/test_helper/feeds/Nextcloud.rss
index a46def8bdb..3e19312b41 100644
--- a/tests/test_helper/feeds/Nextcloud.rss
+++ b/tests/test_helper/feeds/Nextcloud.rss
@@ -21,9 +21,9 @@
 	<generator>https://wordpress.org/?v=6.0.1</generator>
 
 <image>
-	<url>https://nextcloud.com/wp-content/uploads/2022/03/favicon.png</url>
+	<url>http://localhost:8090/logo.png</url>
 	<title>Nextcloud</title>
-	<link>https://nextcloud.com/</link>
+	<link>http://localhost:8090</link>
 	<width>32</width>
 	<height>32</height>
 </image> 
diff --git a/tests/test_helper/feeds/favicon.ico b/tests/test_helper/feeds/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..901f414da0f48bdacc92d02fa63077019191785b
GIT binary patch
literal 4286
zcmZQzU<5)11qKkwutI==L5zWcK?8_^LJST-3=#(epd2o6vYEl>WD~<aApQ)*|7nCl
zX74@O$l#6a4xm^ojqJnej}uJ{%^)|NYGm-Gx7~32fZ=eeiD5s8f4YtH|JN56|Ns8}
zj%fUNUlmUO!R^2wmwSQg!0~-?s@i{2!N&*tDYgG2%$*mfsE}&?|Bv_gQffbve#ZYV
z&rJLO@!oEt@Q1rQ|KD2Shoqlod1llO{ArkK;qz#B>Hn8!XVL)A_<wzoBVKo2n4~~*
z`X@!h=O-ud+D}gYC&m7+&(Gnt|4b*}|KH!<kYXfBYF}Smgx7vhIdrO(?f=;>L7L!`
zO^gKXhn0mRl|J7u{r}2rV~X&FNs45J^Vx2p|Ns8{ASq2@SN!k)<r%spyMdbd@5WMh
zlI=e~K?b{b$Pm3Y--cxSL23T>>X84B_LNhE?`=x_f3lg0Ec-`lz8ehwKGnkV|HGZ_
z|9`x@OEdia&5i%JRs~{B8`R8y__EBK%S+MiC%gTP&mLTIX!d^s#{B_M{DZ>({jDuD
z3wuz!et&)a|E-n&$o}7VqLIOWz|tSE&kO1U0{f#K1K@^Mklio<4F^zMe4(LRzJU6h
Zpgu3m-UAE_%nhI+0y+bbod<w+0|1g=`{V!s

literal 0
HcmV?d00001

diff --git a/tests/test_helper/feeds/heise.xml b/tests/test_helper/feeds/heise.xml
index fb9f907873..256a35de72 100644
--- a/tests/test_helper/feeds/heise.xml
+++ b/tests/test_helper/feeds/heise.xml
@@ -8,7 +8,7 @@
     </author>
     
     <link rel="self" type="application/atom+xml" href="http://localhost:8090/heise.xml"/>
-    <link rel="alternate" type="text/html" href="https://www.heise.de/"/>
+    <link rel="alternate" type="text/html" href="http://localhost:8090"/>
     <rights>Copyright (c) 2022 Heise Medien</rights>
     
     <entry>
diff --git a/tests/test_helper/feeds/logo.png b/tests/test_helper/feeds/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0ee9549d21ea8f86235325f2bac5b75970708a8
GIT binary patch
literal 678
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10;#h!Bh%1n0XgtBtbP|kC
zF*E`ZnB5E!K_WroAeAgFr?%XBfA`&w>#x82ue_x;_2U2k|Ce5Vv;EG88*jb`uDTVn
z`gZxAM~R#6F*To*nQ-1_{x$cdH-x&+{`m9n-~a!*GcHT_pEsU;MRC#vw$@XEU1u4a
zPV#l0dGqb}qKmK3J^!jO>B5O8pG$W?ntAr+jI%Et7hRur=H>2tA9vpU;J4zI%9M+H
z?|<C?;3H?->5DJEzWe^WYTsj<w2&o0j|h|m`2{ohANaE0x1-f(-{(&s_j)%czJ9nA
zD94!O?d~GZeQicRki%Z$>Fdh=kX43NL-lgu-fKXigPtyqAr`0CPQEVGWFX)g-X-EH
zUj07y&ED7l|4#{IH&Hwye(trc^-gO~1_h;)CtSlq6kGxu+@1w?@Cn^oX)@nO>>`73
z@lOS=4nv2H4K5qH8QrIxl6Um6a9VmQV0Ez5;rRWYoO4X0r(Afqp>n%>`3ruDwuS30
zrHTt<5{;h5U-jAWZ1zrV9j2D0*Aurs+jz5W$20qbH{aUwx%U<PT3h#x^UUV`29+`*
zd+xo9m+MJr)Ot6A;et!$r>}cU4?kJH%=Ov)6<33oTQ)L(1$suc#5JNMC9x#cD!C{X
zNHG{07@F%EnCco?gcz7wnHX3Zn`;{wSs56dx^(FjiiX_$l+3hB+!}WGXO#gpFnGH9
KxvX<aXaWHJ{U_1@

literal 0
HcmV?d00001