- fix some broken tests

- reverted the removal of the calendar widget in default dashboard
marellocommerce · Dec 21, 2017 · a5d5146 · a5d5146
1 parent 6933cc1
commit a5d5146
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/Marello/Bundle/DemoDataBundle/Migrations/Data/ORM/LoadDashboardData.php b/src/Marello/Bundle/DemoDataBundle/Migrations/Data/ORM/LoadDashboardData.php
@@ -13,7 +13,7 @@ class LoadDashboardData extends AbstractDashboardFixture implements DependentFix
     protected $manager;
 
     protected $widgets = [
-//        'my_calendar'     => 'remove',
+        'my_calendar'     => 'remove',
         'top_revenue_channels_widget' => [0,0],
         'latest_orders_widget' => [1,0],
         'recent_emails'   => [1, 2],
@@ -26,7 +26,7 @@ class LoadDashboardData extends AbstractDashboardFixture implements DependentFix
     public function getDependencies()
     {
         return [
-//            'Oro\Bundle\CalendarBundle\Migrations\Data\ORM\LoadDashboardData',
+            'Oro\Bundle\CalendarBundle\Migrations\Data\ORM\LoadDashboardData',
             'Oro\Bundle\EmailBundle\Migrations\Data\ORM\LoadDashboardData',
             'Oro\Bundle\DashboardBundle\Migrations\Data\ORM\LoadDashboardData'
         ];

diff --git a/src/Marello/Bundle/InventoryBundle/Tests/Functional/Controller/InventoryControllerTest.php b/src/Marello/Bundle/InventoryBundle/Tests/Functional/Controller/InventoryControllerTest.php
@@ -113,8 +113,7 @@ public function testUpdateInventoryItemAddLevelAndIncrease()
         $result = $this->client->getResponse();
         $this->assertHtmlResponseStatusCodeEquals($result, 200);
 
-        // TODO:: uncomment when MAR10001-312 will be merged
-        $this->assertContains('Warehouse 1', $crawler->html());
+        $this->assertContains('Warehouse DE 1', $crawler->html());
         $this->assertContains('never_out_of_stock', $crawler->html());
     }
 

diff --git a/src/Marello/Bundle/RuleBundle/Tests/Unit/Form/Type/RuleTypeTest.php b/src/Marello/Bundle/RuleBundle/Tests/Unit/Form/Type/RuleTypeTest.php
@@ -31,7 +31,7 @@ public function testGetBlockPrefix()
      */
     public function testSubmitValid(RuleInterface $rule)
     {
-        $form = $this->factory->create($this->formType, $rule);
+        $form = $this->factory->create(RuleType::class, $rule);
 
         $this->assertSame($rule, $form->getData());
 

diff --git a/src/Marello/Bundle/ShippingBundle/Tests/Unit/Workflow/ShipmentCreateActionTest.php b/src/Marello/Bundle/ShippingBundle/Tests/Unit/Workflow/ShipmentCreateActionTest.php
@@ -117,7 +117,7 @@ public function testExecute($registryHasService, $inputService, $expectedService
             ->willReturn($metaData);
 
         $this->doctrine->expects(static::once())
-            ->method('getEntityManager')
+            ->method('getManager')
             ->willReturn($em);
 
         $context = new ActionData(

diff --git a/src/Marello/Bundle/ShippingBundle/Workflow/ShipmentCreateAction.php b/src/Marello/Bundle/ShippingBundle/Workflow/ShipmentCreateAction.php
@@ -50,7 +50,7 @@ protected function executeAction($context)
         $service = strtolower($this->contextAccessor->getValue($context, $this->service));
         /** @var ShippingAwareInterface $entity */
         $entity = $this->contextAccessor->getValue($context, $this->entity);
-        $entityClass = $this->doctrine->getEntityManager()->getClassMetadata(get_class($entity))->getName();
+        $entityClass = $this->doctrine->getManager()->getClassMetadata(get_class($entity))->getName();
 
         if (!$service || !$this->registry->hasIntegration($service) || !$this->registry->hasDataFactory($service)) {
             $service = self::DEFAULT_SHIPPING_SERVICE;