ci(ci): add typo3scan to matrix make build

nigthknight · nigthknight · commit 50a8919db016 · 2021-10-11T15:03:18.000+02:00
Signed-off-by: Yannik Fuhrmeister &lt;yannik.fuhrmeister@iteratec.com&gt;
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -289,6 +289,7 @@ jobs:
           - ssh-scan
           - sslyze
           - trivy
+          - typo3scan
           - wpscan
           - zap
     steps:
@@ -470,7 +471,6 @@ jobs:
           - screenshooter
           - test-scan
           - whatweb
-          - typo3scan
 
     steps:
       - name: Checkout
@@ -550,7 +550,6 @@ jobs:
     strategy:
       matrix:
         scanner:
-          - typo3scan
           - whatweb
 
     steps:
@@ -923,19 +922,6 @@ jobs:
           npx jest --ci --color ./hooks/notification.test.js
           helm -n integration-tests uninstall test-scan http-webhook notification-hook
 
-      # ---- Typo3scan Integration Tests ----
-
-      - name: "typo3scan Integration Tests"
-        run: |
-          kubectl -n integration-tests delete scans --all
-          helm -n integration-tests install typo3scan ./scanners/typo3scan/  \
-            --set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
-            --set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-typo3scan" \
-            --set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
-            --set-string="parser.env[0].value=true"
-          cd tests/integration/
-          npx jest --ci --color scanner/typo3scan.test.js    
-
       # ---- Whatweb Integration Tests ----
 
       - name: "Whatweb Integration Tests"
diff --git a/scanners/typo3scan/Makefile b/scanners/typo3scan/Makefile
@@ -12,3 +12,10 @@ custom_scanner = set
 include ../../scanners.mk
 
 deploy-test-deps: deploy-test-dep-old-typo3
+
+integration-tests:
+	@echo ".: 🩺 Starting integration test in kind namespace 'integration-tests'."
+	kubectl -n integration-tests delete scans --all
+	cd ../../tests/integration/ && npm ci
+	cd ../../scanners/${scanner}
+	npx --yes --package jest@$(JEST_VERSION) jest --verbose --ci --colors --coverage --passWithNoTests ${scanner}/integration-tests
diff --git a/scanners/typo3scan/integration-tests/jest.config.json b/scanners/typo3scan/integration-tests/jest.config.json
@@ -0,0 +1 @@
+{}
diff --git a/scanners/typo3scan/integration-tests/typo3scan.test.js b/scanners/typo3scan/integration-tests/typo3scan.test.js
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-const { scan } = require("../helpers");
+const { scan } = require("../../../tests/integration/helpers");
 
 jest.retryTimes(3);
 
@@ -39,4 +39,4 @@ test(
     ).rejects.toThrow("HTTP request failed");
   },
   3 * 60 * 1000
-);
+);
