Compare commits

..

No commits in common. "ee5d515ac11d034559bd639bb70356a1eb33dad4" and "441568bdb79801a465a7fe75fb08f6f1baefdb76" have entirely different histories.

5 changed files with 3 additions and 20 deletions

View file

@ -9,7 +9,7 @@ jobs:
env: env:
REPO: '${{ github.repository }}' REPO: '${{ github.repository }}'
TOKEN: '${{ secrets.GITHUB_TOKEN }}' TOKEN: '${{ secrets.GITHUB_TOKEN }}'
GIT_SERVER: 'git.hannover.ccc.de' GIT_SERVER: 'hannover.ccc.de/gitlab'
run: | run: |
git clone --branch $GITHUB_HEAD_REF https://${TOKEN}@${GIT_SERVER}/${REPO}.git . git clone --branch $GITHUB_HEAD_REF https://${TOKEN}@${GIT_SERVER}/${REPO}.git .
git fetch git fetch

View file

@ -13,7 +13,7 @@ jobs:
REPO: '${{ github.repository }}' REPO: '${{ github.repository }}'
TOKEN: '${{ secrets.GITHUB_TOKEN }}' TOKEN: '${{ secrets.GITHUB_TOKEN }}'
BRANCH: '${{ env.GITHUB_REF_NAME }}' BRANCH: '${{ env.GITHUB_REF_NAME }}'
GIT_SERVER: 'git.hannover.ccc.de' GIT_SERVER: 'hannover.ccc.de/gitlab'
run: | run: |
git clone --branch $GITHUB_REF_NAME https://${TOKEN}@${GIT_SERVER}/${REPO}.git . git clone --branch $GITHUB_REF_NAME https://${TOKEN}@${GIT_SERVER}/${REPO}.git .
git fetch git fetch

View file

@ -13,8 +13,7 @@
"mutators": { "mutators": {
"@default": true, "@default": true,
"global-ignore": [ "global-ignore": [
"App\\Service\\Favicon::__toString", "App\\Service\\Favicon::__toString"
"ORM\\Column.*"
] ]
} }
} }

View file

@ -56,7 +56,6 @@ final class OrderItemController extends AbstractController
} }
$menuItems = $menuItemRepository->findBy([ $menuItems = $menuItemRepository->findBy([
'foodVendor' => $foodOrder->getFoodVendor(), 'foodVendor' => $foodOrder->getFoodVendor(),
'deletedAt' => null,
]); ]);
return $this->render('order_item/new.html.twig', [ return $this->render('order_item/new.html.twig', [

View file

@ -2,7 +2,6 @@
namespace App\Tests\Controller; namespace App\Tests\Controller;
use App\Entity\FoodOrder;
use App\Entity\FoodVendor; use App\Entity\FoodVendor;
use App\Entity\MenuItem; use App\Entity\MenuItem;
use App\Tests\DbWebTest; use App\Tests\DbWebTest;
@ -86,11 +85,6 @@ final class MenuItemControllerTest extends DbWebTest
$this->vendor->addMenuItem($menuItem); $this->vendor->addMenuItem($menuItem);
$this->manager->persist($this->vendor); $this->manager->persist($this->vendor);
$this->manager->persist($menuItem); $this->manager->persist($menuItem);
$order = new FoodOrder;
$order->setFoodVendor($this->vendor);
$this->manager->persist($order);
$this->manager->flush(); $this->manager->flush();
$this->assertFalse($menuItem->isDeleted()); $this->assertFalse($menuItem->isDeleted());
@ -100,14 +94,5 @@ final class MenuItemControllerTest extends DbWebTest
$menuItem = $this->repository->find($menuItem->getId()); $menuItem = $this->repository->find($menuItem->getId());
$this->assertTrue($menuItem->isDeleted()); $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();
} }
} }