summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/command/feeds.bats21
-rw-r--r--tests/command/items.bats74
2 files changed, 34 insertions, 61 deletions
diff --git a/tests/command/feeds.bats b/tests/command/feeds.bats
index 8ee95bf0a..97b4c27d1 100644
--- a/tests/command/feeds.bats
+++ b/tests/command/feeds.bats
@@ -11,7 +11,7 @@ TESTSUITE="Feeds"
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"
+ ./occ news:feed:delete "$user" "$ID" -v
done
}
@@ -50,10 +50,9 @@ teardown() {
}
@test "[$TESTSUITE] List all items" {
- ./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}"
+ ID=$(./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
TAG=$(curl --silent "https://api.github.com/repos/nextcloud/news/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
- ID=$(./occ news:feed:list 'admin' | grep 'github\.com' -1 | head -1 | grep -oE '[0-9]*')
run ./occ news:item:list-feed "$user" "$ID" --limit 200
assert_success
@@ -62,27 +61,23 @@ teardown() {
}
@test "[$TESTSUITE] Read all" {
- run ./occ news:feed:list "$user"
- assert_output "[]"
- ID=$(./occ news:feed:add "$user" "$NC_FEED" --title "Something-${BATS_SUITE_TEST_NUMBER}"| grep "Something-${BATS_SUITE_TEST_NUMBER}" -2 | head -1 | grep -oE '[0-9]*')
+ ID=$(./occ news:feed:add "$user" "$NC_FEED" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:feed:read "$user" "$ID" -v
assert_output --partial "items as read"
+
+ # Needed for some reason because the teardown doesn't work after this step.
+ run ./occ news:feed:delete "$user" "$ID" -v
+ assert_success
}
@test "[$TESTSUITE] Delete one" {
- run ./occ news:feed:list "$user"
- assert_output "[]"
-
- ./occ news:feed:add "$user" "$NC_FEED" --title "Something-${BATS_SUITE_TEST_NUMBER}"
+ ID=$(./occ news:feed:add "$user" "$NC_FEED" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:feed:list "$user"
assert_success
- echo "$output" | grep "Something-${BATS_SUITE_TEST_NUMBER}"
-
- ID=$(./occ news:feed:list 'admin' | grep "Something-${BATS_SUITE_TEST_NUMBER}" -2 | head -1 | grep -oE '[0-9]*')
run ./occ news:feed:delete "$user" "$ID"
assert_success
}
diff --git a/tests/command/items.bats b/tests/command/items.bats
index ef9494056..ab2fb312c 100644
--- a/tests/command/items.bats
+++ b/tests/command/items.bats
@@ -1,14 +1,14 @@
#!/usr/bin/env bats
-load "helpers/settings"
TESTSUITE="Items"
setup() {
- ./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}"
-
+ load "../test_helper/bats-support/load"
+ load "../test_helper/bats-assert/load"
+ load "helpers/settings"
TAG=$(curl --silent "https://api.github.com/repos/nextcloud/news/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
- ID=$(./occ news:feed:list 'admin' | grep 'github\.com' -1 | head -1 | grep -oE '[0-9]*')
+
}
teardown(){
@@ -19,81 +19,59 @@ teardown(){
}
@test "[$TESTSUITE] List 200 items in feed" {
+ ID=$(./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:item:list-feed "$user" "$ID" --limit 200
- [ "$status" -eq 0 ]
+ assert_success
- if ! echo "$output" | grep "$TAG"; then
- ret_status=$?
- echo "Release not found in feed list"
- return $ret_status
- fi
+ assert_output --partial $TAG
}
@test "[$TESTSUITE] List all items in feed" {
+ ID=$(./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:item:list-feed "$user" "$ID" --limit 0
- [ "$status" -eq 0 ]
+ assert_success
- if ! echo "$output" | grep "$TAG"; then
- ret_status=$?
- echo "Release not found in feed list"
- return $ret_status
- fi
+ assert_output --partial $TAG
}
@test "[$TESTSUITE] List 200 items in folder" {
+ ID=$(./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:item:list-folder "$user" --limit 200
- [ "$status" -eq 0 ]
+ assert_success
- if ! echo "$output" | grep "$TAG"; then
- ret_status=$?
- echo "Release not found in folder list"
- return $ret_status
- fi
+ assert_output --partial $TAG
}
@test "[$TESTSUITE] List all items in folder" {
+ ID=$(./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:item:list-folder "$user" --limit 0
- [ "$status" -eq 0 ]
+ assert_success
- if ! echo "$output" | grep "$TAG"; then
- ret_status=$?
- echo "Release not found in folder list"
- return $ret_status
- fi
+ assert_output --partial $TAG
}
@test "[$TESTSUITE] List 200 items" {
+ ID=$(./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:item:list "$user" --limit 200
- [ "$status" -eq 0 ]
+ assert_success
- if ! echo "$output" | grep "$TAG"; then
- ret_status=$?
- echo "Release not found in list"
- return $ret_status
- fi
+ assert_output --partial $TAG
}
@test "[$TESTSUITE] List all items" {
+ ID=$(./occ news:feed:add "$user" "https://github.com/nextcloud/news/releases.atom" --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:item:list "$user" --limit 0
- [ "$status" -eq 0 ]
+ assert_success
- if ! echo "$output" | grep "$TAG"; then
- ret_status=$?
- echo "Release not found in list"
- return $ret_status
- fi
+ assert_output --partial $TAG
}
@test "[$TESTSUITE] Test author fallback" {
- ./occ news:feed:add "$user" $HEISE_FEED --title "Something-${BATS_SUITE_TEST_NUMBER}"
- ID=$(./occ news:feed:list 'admin' | grep 'heise\.de' -1 | head -1 | grep -oE '[0-9]*')
+ ID=$(./occ news:feed:add "$user" $HEISE_FEED --title "Something-${BATS_SUITE_TEST_NUMBER}" | grep -Po '"id": \K([0-9]+)')
run ./occ news:item:list-feed "$user" "$ID" --limit 200
- [ "$status" -eq 0 ]
+ assert_success
+
- if ! echo "$output" | grep '"author": "heise online",'; then
- ret_status=$?
- echo "Author fallback did not work"
- return $ret_status
- fi
+ assert_output --partial '"author": "heise online",'
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 02:01:21 +0000