From f5dc9a6acac1e3d94154b9924dfbd43fc2ff1507 Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Sun, 31 Mar 2024 14:51:59 +0200 Subject: Use local feedserver to test the logo/favicon logic Signed-off-by: Benjamin Brahmer --- 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 c6b8174b8..51557e36c 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 a46def8bd..3e19312b4 100644 --- a/tests/test_helper/feeds/Nextcloud.rss +++ b/tests/test_helper/feeds/Nextcloud.rss @@ -21,9 +21,9 @@ https://wordpress.org/?v=6.0.1 - https://nextcloud.com/wp-content/uploads/2022/03/favicon.png + http://localhost:8090/logo.png Nextcloud - https://nextcloud.com/ + http://localhost:8090 32 32 diff --git a/tests/test_helper/feeds/favicon.ico b/tests/test_helper/feeds/favicon.ico new file mode 100644 index 000000000..901f414da Binary files /dev/null and b/tests/test_helper/feeds/favicon.ico differ diff --git a/tests/test_helper/feeds/heise.xml b/tests/test_helper/feeds/heise.xml index fb9f90787..256a35de7 100644 --- a/tests/test_helper/feeds/heise.xml +++ b/tests/test_helper/feeds/heise.xml @@ -8,7 +8,7 @@ - + Copyright (c) 2022 Heise Medien diff --git a/tests/test_helper/feeds/logo.png b/tests/test_helper/feeds/logo.png new file mode 100644 index 000000000..a0ee9549d Binary files /dev/null and b/tests/test_helper/feeds/logo.png differ -- cgit v1.2.3