1 files changed, 32 insertions, 53 deletions

diff --git a/tests/command/items.bats b/tests/command/items.bats
index 8a7111299..ab2fb312c 100644
--- a/tests/command/items.bats
+++ b/tests/command/items.bats
@@ -1,98 +1,77 @@
 #!/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() {
-  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" {
+  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 ]
-
-  if ! echo "$output" | grep '"author": "heise online",'; then
-    ret_status=$?
-    echo "Author fallback did not work"
-    return $ret_status
-  fi
-}
\ No newline at end of file
+  assert_success
+
+
+  assert_output --partial '"author": "heise online",'
+}