From 4f82a0f026a9cd96d5ec3ecbaddf52439eb77465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 2 Jul 2023 14:03:29 +0200 Subject: [PATCH] Fixed qr code scan URL paths --- config/routes.yaml | 2 +- src/Controller/ScanController.php | 2 +- tests/ApplicationAvailabilityFunctionalTest.php | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/routes.yaml b/config/routes.yaml index 777ade11..2da939a1 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -2,7 +2,7 @@ scan_qr: path: /scan/{type}/{id} - controller: App\Controller\ScanController:scanQRCode + controller: App\Controller\ScanController::scanQRCode csp_report: path: /csp/report diff --git a/src/Controller/ScanController.php b/src/Controller/ScanController.php index 41959d0a..947df5b2 100644 --- a/src/Controller/ScanController.php +++ b/src/Controller/ScanController.php @@ -58,7 +58,7 @@ class ScanController extends AbstractController { } - #[Route(path: '', name: 'scan_dialog')] + #[Route(path: '/', name: 'scan_dialog')] public function dialog(Request $request): Response { $this->denyAccessUnlessGranted('@tools.label_scanner'); diff --git a/tests/ApplicationAvailabilityFunctionalTest.php b/tests/ApplicationAvailabilityFunctionalTest.php index bbebe9d2..b050df72 100644 --- a/tests/ApplicationAvailabilityFunctionalTest.php +++ b/tests/ApplicationAvailabilityFunctionalTest.php @@ -117,12 +117,15 @@ class ApplicationAvailabilityFunctionalTest extends WebTestCase yield ['/select_api/measurement_unit']; //Label test - yield ['/scan']; yield ['/label/dialog']; yield ['/label/dialog?target_id=1&target_type=part']; yield ['/label/1/dialog']; yield ['/label/1/dialog?target_id=1&target_type=part&generate=1']; + //Scan test + yield ['/scan']; //Interactive scan dialog + yield ['/scan/part/1']; //Scan a part + //Tools yield ['/tools/reel_calc']; yield ['/tools/server_infos'];