adding integration tests (#34)

* adds tests ``` ok 1 test admin eicar Upload ok 2 test admin clean upload ok 3 test admin pup Upload ok 4 test testuser eicar Upload ok 5 test testuser clean Upload ok 6 test testuser pup Upload ok 7 test upload when vaas does not function ok 8 test croned scan for admin files ok 9 test croned scan for testuser files ``` tagging tests still missing but having an idea * refactors the install script, so it does more stuff in parallel * adds occ console command to make testing more reliable * refactors APP_ID usage --------- Co-authored-by: Simonis, Matthias <[email protected]>
GDATASoftwareAG · Jun 12, 2024 · 8965e55 · 8965e55
1 parent dd8182f
commit 8965e55
Show file tree

Hide file tree

Showing 21 changed files with 1,800 additions and 178 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -23,11 +23,8 @@
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"postCreateCommand": "make build && composer install",
 	"features": {
-		"ghcr.io/devcontainers/features/node:1": {
-			"nodeGypDependencies": true,
-			"version": "lts",
-			"nvmVersion": "latest"
-		}
+		"ghcr.io/devcontainers/features/node:1": {},
+		"ghcr.io/edouard-lopez/devcontainer-features/bats:0": {}
 	}
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "root"

diff --git a/.github/workflows/release-app.yml b/.github/workflows/release-app.yml
@@ -8,51 +8,50 @@ on:
     branches: ["main"]
 
 jobs:
-  # test:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: actions/setup-node@v4
-  #       name: setup node
-  #       with:
-  #         node-version: 20
-  #     - name: Setup BATS
-  #       uses: mig4/setup-bats@v1
-  #       with:
-  #         bats-version: 1.11.0
-  #     - uses: docker-practice/actions-setup-docker@master
-  #     - name: install nextcloud
-  #       env:
-  #         CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
-  #         CLIENT_SECRET: ${{ secrets.VAAS_CLIENT_SECRET }}
-  #       run: ./install.sh
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        name: setup node
+        with:
+          node-version: 20
+
+      - name: Setup BATS
+        uses: mig4/setup-bats@v1
+        with:
+          bats-version: 1.11.0
+
+      - uses: docker-practice/actions-setup-docker@master
+      - name: install nextcloud
+        env:
+          CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.VAAS_CLIENT_SECRET }}
+        run: ./install.sh
 
-  #     - name: run tests
-  #       env:
-  #         CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
-  #         CLIENT_SECRET: ${{ secrets.VAAS_CLIENT_SECRET }}
-  #       run: bats --no-parallelize-across-files --jobs 3 ./tests
+      - name: run tests
+        env:
+          CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.VAAS_CLIENT_SECRET }}
+        run: bats --no-parallelize-across-files --jobs 2 ./tests
 
-  #     - uses: actions/upload-artifact@master
-  #       with:
-  #         name: build-dir
-  #         path: build/
+      - uses: actions/upload-artifact@master
+        with:
+          name: build-dir
+          path: build/
 
   release:
-    # needs:
-    #   - test
+    needs:
+      - test
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - uses: actions/checkout@v4
 
-      # - uses: actions/download-artifact@master
-      #   with:
-      #     name: build-dir
-      #     path: build/
-
-      - name: Build for appstore
-        run: make appstore
+      - uses: actions/download-artifact@master
+        with:
+          name: build-dir
+          path: build/
 
       - name: replace version
         id: replace-version

diff --git a/.gitignore b/.gitignore
@@ -62,3 +62,5 @@ dev-environment*/
 js/
 *.cache
 .uuid
+eicar.com.txt
+tmp/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,5 +2,8 @@
     "php-cs-fixer.executablePath": "/workspaces/nextcloud-gdata-antivirus/vendor/bin/php-cs-fixer",
     "php-cs-fixer.onsave": true,
     "php-cs-fixer.autoFixByBracket": true,
-    "php-cs-fixer.autoFixBySemicolon": true
+    "php-cs-fixer.autoFixBySemicolon": true,
+    "[php]": {
+        "editor.defaultFormatter": "junstyle.php-cs-fixer"
+    },
 }
diff --git a/Makefile b/Makefile
@@ -82,10 +82,18 @@ endif
 .PHONY: npm
 npm:
 ifeq (,$(wildcard $(CURDIR)/package.json))
-	npm install
+ifeq (,$(wildcard $(CURDIR)/package-lock.json))
+	npm install --no-audit --progress=false
+else
+	npm ci
+endif
 	cd js && $(npm) run build
 else
-	npm install
+ifeq (,$(wildcard $(CURDIR)/package-lock.json))
+	npm install --no-audit --progress=false
+else
+	npm ci
+endif
 	npm run build
 endif
 

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -35,6 +35,10 @@ If you have any questions about scanning, usage or similar, please feel free to
         <admin-section>OCA\GDataVaas\Settings\VaasAdminSection</admin-section>
         <admin>OCA\GDataVaas\Settings\VaasAdmin</admin>
     </settings>
+    <commands>
+        <command>OCA\GDataVaas\Command\ScanCommand</command>
+        <command>OCA\GDataVaas\Command\TagUnscannedCommand</command>
+	</commands>
     <dependencies>
         <nextcloud min-version="27" max-version="28"/>
     </dependencies>

diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
 	"require-dev": {
 		"nextcloud/ocp": "dev-stable28",
 		"psalm/phar": "^5.17.0",
-		"nextcloud/coding-standard": "^v1.1.1"
+		"nextcloud/coding-standard": "^v1.1.1",
+		"symfony/console": "^6.4"
 	},
 	"scripts": {
 		"lint": "find lib -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,3 +62,5 @@ dev-environment*/ @@
     js/
     *.cache
     .uuid
+    eicar.com.txt
+    tmp/