From 8a203a329c1bfae84e7204bd0fda452c6ad11903 Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Fri, 9 Oct 2020 21:17:40 +0200
Subject: Fix minor issues, prepare for foreign keys and check feeds

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
---
 .github/workflows/integration-tests.yml | 37 ++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 171c6d43b..bdd35cca9 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -96,23 +96,44 @@ jobs:
           app: 'news'
           check-code: true
 
-      - name: Functional tests
+      - name: Functional tests maintenance
+        working-directory: ../server
         run: |
-          cd ../server
           ./occ migrations:migrate news
           ./occ maintenance:repair
-          ./occ news:generate-explore --votes 100 "https://nextcloud.com/blog/feed/"
+
+      - name: Functional tests explore
+        working-directory: ../server
+        run: ./occ news:generate-explore --votes 100 "https://nextcloud.com/blog/feed/"
+
+      - name: Functional tests folder
+        working-directory: ../server
+        run: |
           ./occ news:folder:add 'admin' 'Something'
           ./occ news:folder:list 'admin' | grep 'Something'
+
+      - name: Functional tests feed
+        working-directory: ../server
+        run: |
           ./occ news:feed:add 'admin' "https://nextcloud.com/blog/feed/"
           ./occ news:feed:list 'admin' | grep 'nextcloud\.com'
-          ./occ news:opml:export 'admin' | grep 'nextcloud\.com'
+
+      - name: Functional tests opml
+        working-directory: ../server
+        run: ./occ news:opml:export 'admin' | grep 'nextcloud\.com'
+
+      - name: Functional tests cleanup
+        working-directory: ../server
+        run: |
           ./occ news:folder:delete 'admin' $(./occ news:folder:list 'admin' | grep 'Something' -1  | head -1 | grep -oE '[0-9]*')
           ./occ news:feed:delete 'admin' $(./occ news:feed:list 'admin' | grep 'nextcloud\.com' -1  | head -1 | grep -oE '[0-9]*')
 
       - name: Prep PHP tests
-        run: cd ../server/apps/news && make php-test-dependencies
+        working-directory: ../server/apps/news
+        run: make php-test-dependencies
       - name: Integration tests
-        run: cd ../server/apps/news && make integration-test
-
-
+        working-directory: ../server/apps/news
+        run: make integration-test
+      - name: Feed tests
+        working-directory: ../server/apps/news
+        run: make feed-test
\ No newline at end of file
-- 
cgit v1.2.3