diff --git a/.forgejo/workflows/pull_request.yml b/.forgejo/workflows/pull_request.yml index 34cc06d..19f4777 100644 --- a/.forgejo/workflows/pull_request.yml +++ b/.forgejo/workflows/pull_request.yml @@ -9,7 +9,7 @@ jobs: env: REPO: '${{ github.repository }}' TOKEN: '${{ secrets.GITHUB_TOKEN }}' - GIT_SERVER: 'hannover.ccc.de/gitlab' + GIT_SERVER: 'git.hannover.ccc.de' run: | git clone --branch $GITHUB_HEAD_REF https://${TOKEN}@${GIT_SERVER}/${REPO}.git . git fetch diff --git a/.forgejo/workflows/push.yml b/.forgejo/workflows/push.yml index 259579e..97a0662 100644 --- a/.forgejo/workflows/push.yml +++ b/.forgejo/workflows/push.yml @@ -13,7 +13,7 @@ jobs: REPO: '${{ github.repository }}' TOKEN: '${{ secrets.GITHUB_TOKEN }}' BRANCH: '${{ env.GITHUB_REF_NAME }}' - GIT_SERVER: 'hannover.ccc.de/gitlab' + GIT_SERVER: 'git.hannover.ccc.de' run: | git clone --branch $GITHUB_REF_NAME https://${TOKEN}@${GIT_SERVER}/${REPO}.git . git fetch diff --git a/infection.json5 b/infection.json5 index e6f50cc..1a80eed 100644 --- a/infection.json5 +++ b/infection.json5 @@ -13,7 +13,8 @@ "mutators": { "@default": true, "global-ignore": [ - "App\\Service\\Favicon::__toString" + "App\\Service\\Favicon::__toString", + "ORM\\Column.*" ] } } \ No newline at end of file diff --git a/src/Controller/OrderItemController.php b/src/Controller/OrderItemController.php index c973d97..ee1ef4b 100644 --- a/src/Controller/OrderItemController.php +++ b/src/Controller/OrderItemController.php @@ -56,6 +56,7 @@ final class OrderItemController extends AbstractController } $menuItems = $menuItemRepository->findBy([ 'foodVendor' => $foodOrder->getFoodVendor(), + 'deletedAt' => null, ]); return $this->render('order_item/new.html.twig', [ diff --git a/tests/Controller/MenuItemControllerTest.php b/tests/Controller/MenuItemControllerTest.php index 9dc0058..4d6dd02 100644 --- a/tests/Controller/MenuItemControllerTest.php +++ b/tests/Controller/MenuItemControllerTest.php @@ -2,6 +2,7 @@ namespace App\Tests\Controller; +use App\Entity\FoodOrder; use App\Entity\FoodVendor; use App\Entity\MenuItem; use App\Tests\DbWebTest; @@ -85,6 +86,11 @@ final class MenuItemControllerTest extends DbWebTest $this->vendor->addMenuItem($menuItem); $this->manager->persist($this->vendor); $this->manager->persist($menuItem); + + $order = new FoodOrder; + $order->setFoodVendor($this->vendor); + + $this->manager->persist($order); $this->manager->flush(); $this->assertFalse($menuItem->isDeleted()); @@ -94,5 +100,14 @@ final class MenuItemControllerTest extends DbWebTest $menuItem = $this->repository->find($menuItem->getId()); $this->assertTrue($menuItem->isDeleted()); + + $crawler = $this->client->request('GET', '/order/item/new/' . $order->getId()); + $count = $crawler->filter('body > main:nth-child(2) > div:nth-child(5)') + ->children() + ->count(); + $this->assertSame(0, $count); + + $this->assertResponseIsSuccessful(); + } }