Merge pull request #4406 from laboro/fix/BAP-8157-1.6

BAP-8157: Package manager. Install with demo fixtures does not work
oroinc · May 15, 2015 · 98ba608 · 98ba608
2 parents 9998453 + 0645d72
commit 98ba608
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/Oro/Bundle/SearchBundle/EventListener/DemoDataMigrationListener.php b/src/Oro/Bundle/SearchBundle/EventListener/DemoDataMigrationListener.php
@@ -59,6 +59,7 @@ public function onConsoleTerminate(ConsoleTerminateEvent $event)
     protected function isProcessingRequired(ConsoleEvent $event)
     {
         return $event->getCommand() instanceof LoadDataFixturesCommand
+            && $event->getInput()->hasOption('fixtures-type')
             && $event->getInput()->getOption('fixtures-type') == LoadDataFixturesCommand::DEMO_FIXTURES_TYPE;
     }
 }
diff --git a/src/Oro/Bundle/SearchBundle/Tests/Unit/EventListener/DemoDataMigrationListenerTest.php b/src/Oro/Bundle/SearchBundle/Tests/Unit/EventListener/DemoDataMigrationListenerTest.php
@@ -114,6 +114,10 @@ protected function prepareEventData($commandClass, $fixturesType = null)
 
         $input = $this->getMock('Symfony\Component\Console\Input\InputInterface');
         if ($fixturesType) {
+            $input->expects($this->any())
+                ->method('hasOption')
+                ->with('fixtures-type')
+                ->willReturn(true);
             $input->expects($this->any())
                 ->method('getOption')
                 ->with('fixtures-type')