Merge remote-tracking branch 'remotes/dev/1.6' into 1.6

oroinc · Aug 14, 2015 · 0958318 · 0958318
2 parents 1be7f4b + 1f31955
commit 0958318
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/src/OroCRM/Bundle/AccountBundle/Controller/Api/Rest/AccountController.php b/src/OroCRM/Bundle/AccountBundle/Controller/Api/Rest/AccountController.php
@@ -137,7 +137,7 @@ public function getManager()
      */
     public function getForm()
     {
-        return $this->get('orocrm_account.form.type.account.api');
+        return $this->get('orocrm_account.form.account.api');
     }
 
     /**

diff --git a/src/OroCRM/Bundle/CaseBundle/Controller/Api/Rest/CommentController.php b/src/OroCRM/Bundle/CaseBundle/Controller/Api/Rest/CommentController.php
@@ -135,7 +135,7 @@ public function getManager()
      */
     public function getForm()
     {
-        return $this->get('orocrm_case.form.type.comment.api');
+        return $this->get('orocrm_case.form.comment.api');
     }
 
     /**

diff --git a/src/OroCRM/Bundle/MagentoBundle/Dashboard/CustomerDataProvider.php b/src/OroCRM/Bundle/MagentoBundle/Dashboard/CustomerDataProvider.php
@@ -105,7 +105,7 @@ protected function getMaxDate(array $data)
 
         $result = (empty($maxYear) && empty($maxMonth)) ? 'now' : sprintf('%s-%s', $maxYear, $maxMonth + 1);
 
-        return new \DateTime($result);
+        return new \DateTime($result, new \DateTimeZone('UTC'));
     }
 
     /**

diff --git a/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Manager/MagentoDeleteManagerTest.php b/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Manager/MagentoDeleteManagerTest.php
@@ -31,8 +31,7 @@ protected function setUp()
 
     protected function postFixtureLoad()
     {
-        $channel = $this->em->getRepository('OroIntegrationBundle:Channel')->findAll();
-        $channel = reset($channel);
+        $channel = $this->getReference('default_channel');
         if (!$channel) {
             $this->markTestIncomplete('Invalid fixtures, unable to perform test case');
         }
@@ -42,17 +41,21 @@ protected function postFixtureLoad()
 
     public function testDeleteChannel()
     {
-        $channel   = $this->em->find('OroIntegrationBundle:Channel', self::$channelId);
-        $channelId = $channel->getId();
-        $this->assertGreaterThan(0, $this->getRecordsCount('OroCRMMagentoBundle:Cart', $channel));
-        $this->assertGreaterThan(0, $this->getRecordsCount('OroCRMMagentoBundle:Order', $channel));
-        $this->assertGreaterThan(0, $this->getRecordsCount('OroCRMMagentoBundle:Website', $channel));
+        $channel   = $this->em->find('OroCRMChannelBundle:Channel', self::$channelId);
+
+        $integration = $channel->getDataSource();
+
+        $integrationId = $integration->getId();
+
+        $this->assertGreaterThan(0, $this->getRecordsCount('OroCRMMagentoBundle:Cart', $integration));
+        $this->assertGreaterThan(0, $this->getRecordsCount('OroCRMMagentoBundle:Order', $integration));
+        $this->assertGreaterThan(0, $this->getRecordsCount('OroCRMMagentoBundle:Website', $integration));
         $this->client->getKernel()->getContainer()->get('oro_integration.delete_manager')->delete(
-            $channel
+            $integration
         );
-        $this->assertEquals(0, $this->getRecordsCount('OroCRMMagentoBundle:Cart', $channelId));
-        $this->assertEquals(0, $this->getRecordsCount('OroCRMMagentoBundle:Order', $channelId));
-        $this->assertEquals(0, $this->getRecordsCount('OroCRMMagentoBundle:Website', $channelId));
+        $this->assertEquals(0, $this->getRecordsCount('OroCRMMagentoBundle:Cart', $integrationId));
+        $this->assertEquals(0, $this->getRecordsCount('OroCRMMagentoBundle:Order', $integrationId));
+        $this->assertEquals(0, $this->getRecordsCount('OroCRMMagentoBundle:Website', $integrationId));
     }
 
     /**