diff options
| author | Benjamin Brahmer <info@b-brahmer.de> | 2022-08-05 14:38:12 +0200 |
|---|---|---|
| committer | Benjamin Brahmer <info@b-brahmer.de> | 2022-08-05 14:38:12 +0200 |
| commit | b893682ee775d9db5192bb01947359ca28c0876c (patch) | |
| tree | e47eac8e352994c417cb1614be635e94a63aa7a6 | |
| parent | 459875d8a92ffb8a90a99b61d96da221b370fdde (diff) | |
fix more tests
Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
| -rw-r--r-- | tests/command/feeds.bats | 6 | ||||
| -rw-r--r-- | tests/command/folders.bats | 8 | ||||
| -rw-r--r-- | tests/command/items.bats | 9 | ||||
| -rw-r--r-- | tests/command/opml.bats | 8 |
4 files changed, 16 insertions, 15 deletions
diff --git a/tests/command/feeds.bats b/tests/command/feeds.bats index b6ac9668c..6bebe469d 100644 --- a/tests/command/feeds.bats +++ b/tests/command/feeds.bats @@ -5,10 +5,10 @@ load "helpers/settings" TESTSUITE="Feeds" teardown() { - ID=$(./occ news:feed:list 'admin' | grep "Something-${BATS_SUITE_TEST_NUMBER}" -2 | head -1 | grep -oE '[0-9]*') - if [ -n "$ID" ]; then + ID_LIST=($(./occ news:feed:list 'admin' | grep -Po '"id": \K([0-9]+)' | tr '\n' ' ')) + for ID in $ID_LIST; do ./occ news:feed:delete "$user" "$ID" - fi + done } @test "[$TESTSUITE] Create new" { diff --git a/tests/command/folders.bats b/tests/command/folders.bats index 48b15f05b..2568c13c9 100644 --- a/tests/command/folders.bats +++ b/tests/command/folders.bats @@ -5,10 +5,10 @@ load "helpers/settings" TESTSUITE="Folders" teardown() { - ID=$(./occ news:folder:list 'admin' | grep "Something-${BATS_SUITE_TEST_NUMBER}" -1 | head -1 | grep -oE '[0-9]*') - if [ -n "$ID" ]; then - ./occ news:folder:delete "$user" "$ID" - fi + ID_LIST=($(./occ news:feed:list 'admin' | grep -Po '"id": \K([0-9]+)' | tr '\n' ' ')) + for ID in $ID_LIST; do + ./occ news:feed:delete "$user" "$ID" + done } @test "[$TESTSUITE] Create new" { diff --git a/tests/command/items.bats b/tests/command/items.bats index 8a7111299..ef9494056 100644 --- a/tests/command/items.bats +++ b/tests/command/items.bats @@ -11,10 +11,11 @@ setup() { ID=$(./occ news:feed:list 'admin' | grep 'github\.com' -1 | head -1 | grep -oE '[0-9]*') } -teardown() { - if [ -n "$ID" ]; then +teardown(){ + ID_LIST=($(./occ news:feed:list 'admin' | grep -Po '"id": \K([0-9]+)' | tr '\n' ' ')) + for ID in $ID_LIST; do ./occ news:feed:delete "$user" "$ID" - fi + done } @test "[$TESTSUITE] List 200 items in feed" { @@ -95,4 +96,4 @@ teardown() { echo "Author fallback did not work" return $ret_status fi -}
\ No newline at end of file +} diff --git a/tests/command/opml.bats b/tests/command/opml.bats index b2d576e8e..bfdc8bf93 100644 --- a/tests/command/opml.bats +++ b/tests/command/opml.bats @@ -5,14 +5,14 @@ load "helpers/settings" TESTSUITE="OPML" teardown() { - ID=$(./occ news:feed:list 'admin' | grep "Something-${BATS_SUITE_TEST_NUMBER}" -1 | head -1 | grep -oE '[0-9]*') - if [ -n "$ID" ]; then + ID_LIST=($(./occ news:feed:list 'admin' | grep -Po '"id": \K([0-9]+)' | tr '\n' ' ')) + for ID in $ID_LIST; do ./occ news:feed:delete "$user" "$ID" - fi + done } @test "[$TESTSUITE] Export" { - run ./occ news:feed:add "$user" "https://nextcloud.com/blog/static-feed/" + run ./occ news:feed:add "$user" "https://nextcloud.com/blog/static-feed/" --title "Something-${BATS_SUITE_TEST_NUMBER}" [ "$status" -eq 0 ] run ./occ news:opml:export "$user" |