Merge remote-tracking branch 'origin/MAGETWO-33455-Cover-Config-Based-Integration-Creation' into develop

arkadiych · arkadiych · commit ff76fe894e93 · 2015-02-24T12:41:39.000+02:00
Conflicts:
	dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
diff --git a/app/code/Magento/Integration/Model/Integration.php b/app/code/Magento/Integration/Model/Integration.php
@@ -13,8 +13,8 @@
  * @method \string getEmail()
  * @method Integration setEmail(\string $email)
  * @method Integration setStatus(\int $value)
- * @method \int getType()
- * @method Integration setType(\int $value)
+ * @method \int getSetupType()
+ * @method Integration setSetupType(\int $value)
  * @method Integration setConsumerId(\string $consumerId)
  * @method \string getConsumerId()
  * @method \string getEndpoint()
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
@@ -0,0 +1,20 @@
+{
+  "name": "magento/module-test-module-integration-from-config",
+  "description": "test integration create from config",
+  "require": {
+    "php": "~5.5.0|~5.6.0",
+    "magento/framework": "0.42.0-beta8",
+    "magento/module-integration": "0.42.0-beta8",
+    "magento/magento-composer-installer": "*"
+  },
+  "type": "magento2-module",
+  "version": "1.0",
+  "extra": {
+    "map": [
+      [
+        "*",
+        "Magento/TestModuleIntegrationFromConfig"
+      ]
+    ]
+  }
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/data/testmoduleintegrationfromconfig_setup/data-install-0.0.1.php b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/data/testmoduleintegrationfromconfig_setup/data-install-0.0.1.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/** @var \Magento\Integration\Model\Resource\Setup $this */
+$this->initIntegrationProcessing(['Test Integration1']);
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/di.xml b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\Module\Updater\SetupFactory">
+        <arguments>
+            <argument name="resourceTypes" xsi:type="array">
+                <item name="testmoduleintegrationfromconfig_setup" xsi:type="string">Magento\Integration\Model\Resource\Setup</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/integration/config.xml b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/integration/config.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<integrations>
+    <integration name="Test Integration1">
+        <email>test-integration@magento.com</email>
+        <endpoint_url>http://example.com/endpoint1</endpoint_url>
+    </integration>
+</integrations>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/etc/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
+    <module name="Magento_TestModuleIntegrationFromConfig" schema_version="0.0.1" active="true">
+    </module>
+</config>
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/OauthHelper.php b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/OauthHelper.php
@@ -11,6 +11,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use OAuth\Common\Consumer\Credentials;
 use Zend\Stdlib\Exception\LogicException;
+use Magento\Integration\Model\Integration;
 
 class OauthHelper
 {
@@ -93,6 +94,7 @@ public static function getAccessToken()
      * Create an access token, tied to integration which has permissions to all API resources in the system.
      *
      * @param array $resources list of resources to grant to the integration
+     * @param \Magento\Integration\Model\Integration|null $integrationModel
      * @return array
      * <pre>
      * array (
@@ -104,10 +106,10 @@ public static function getAccessToken()
      * </pre>
      * @throws LogicException
      */
-    public static function getApiAccessCredentials($resources = null)
+    public static function getApiAccessCredentials($resources = null, Integration $integrationModel = null)
     {
         if (!self::$_apiCredentials) {
-            $integration = self::_createIntegration($resources);
+            $integration = is_null($integrationModel) ? self::_createIntegration($resources) : $integrationModel;
             $objectManager = Bootstrap::getObjectManager();
             /** @var \Magento\Integration\Service\V1\Oauth $oauthService */
             $oauthService = $objectManager->get('Magento\Integration\Service\V1\Oauth');
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
@@ -10,6 +10,7 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Webapi\Rest\Request;
+use Magento\TestFramework\Authentication\OauthHelper;
 
 class Rest implements \Magento\TestFramework\TestCase\Webapi\AdapterInterface
 {
@@ -64,13 +65,13 @@ public function __construct()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function call($serviceInfo, $arguments = [], $storeCode = null)
+    public function call($serviceInfo, $arguments = [], $storeCode = null, $integration = null)
     {
         $storeCode = !is_null($storeCode) ? (string)$storeCode : $this->defaultStoreCode;
         $resourcePath = '/' . $storeCode . $this->_getRestResourcePath($serviceInfo);
         $httpMethod = $this->_getRestHttpMethod($serviceInfo);
         //Get a valid token
-        $accessCredentials = \Magento\TestFramework\Authentication\OauthHelper::getApiAccessCredentials();
+        $accessCredentials = OauthHelper::getApiAccessCredentials(null, $integration);
         /** @var $oAuthClient \Magento\TestFramework\Authentication\Rest\OauthClient */
         $oAuthClient = $accessCredentials['oauth_client'];
         $urlFormEncoded = false;
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -47,7 +47,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function call($serviceInfo, $arguments = [], $storeCode = null)
+    public function call($serviceInfo, $arguments = [], $storeCode = null, $integration = null)
     {
         $soapOperation = $this->_getSoapOperation($serviceInfo);
         $arguments = $this->_converter->convertKeysToCamelCase($arguments);
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/AdapterInterface.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/AdapterInterface.php
@@ -33,7 +33,8 @@ interface AdapterInterface
      * </pre>
      * @param array $arguments
      * @param string|null $storeCode if store code not provided, default store code will be used
+     * @param \Magento\Integration\Model\Integration|null $integration
      * @return array|string|int|float|bool
      */
-    public function call($serviceInfo, $arguments = [], $storeCode = null);
+    public function call($serviceInfo, $arguments = [], $storeCode = null, $integration = null);
 }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
@@ -159,15 +159,18 @@ protected function tearDown()
      * @param array $arguments
      * @param string|null $webApiAdapterCode
      * @param string|null $storeCode
+     * @param \Magento\Integration\Model\Integration|null $integration
      * @return array|int|string|float|bool Web API call results
      */
-    protected function _webApiCall($serviceInfo, $arguments = [], $webApiAdapterCode = null, $storeCode = null)
+    protected function _webApiCall(
+        $serviceInfo, $arguments = [], $webApiAdapterCode = null, $storeCode = null, $integration = null
+    )
     {
         if (is_null($webApiAdapterCode)) {
             /** Default adapter code is defined in PHPUnit configuration */
             $webApiAdapterCode = strtolower(TESTS_WEB_API_ADAPTER);
         }
-        return $this->_getWebApiAdapter($webApiAdapterCode)->call($serviceInfo, $arguments, $storeCode);
+        return $this->_getWebApiAdapter($webApiAdapterCode)->call($serviceInfo, $arguments, $storeCode, $integration);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Integration/Model/IntegrationTest.php b/dev/tests/api-functional/testsuite/Magento/Integration/Model/IntegrationTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Integration\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Authentication\OauthHelper;
+
+class IntegrationTest extends \Magento\TestFramework\TestCase\WebapiAbstract
+{
+    /** @var  \Magento\Integration\Model\Integration */
+    protected $integration;
+
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var $integrationService \Magento\Integration\Service\V1\IntegrationInterface */
+        $integrationService = $objectManager->get('Magento\Integration\Service\V1\IntegrationInterface');
+
+        $params = [
+            'all_resources' => true,
+            'integration_id' => 1,
+            'status' => Integration::STATUS_ACTIVE,
+            'name' => 'Test Integration1'
+        ];
+        $this->integration = $integrationService->update($params);
+        parent::setUp();
+    }
+
+    protected function tearDown()
+    {
+        unset($this->integration);
+        OauthHelper::clearApiAccessCredentials();
+        parent::tearDown();
+    }
+
+    public function testConfigBasedIntegrationCreation()
+    {
+        $this->assertEquals('test-integration@magento.com', $this->integration->getEmail());
+        $this->assertEquals('http://example.com/endpoint1', $this->integration->getEndpoint());
+        $this->assertEquals('Test Integration1', $this->integration->getName());
+        $this->assertEquals(Integration::TYPE_CONFIG, $this->integration->getSetupType());
+    }
+
+    /**
+     * Test simple request data
+     *
+     * @depends testConfigBasedIntegrationCreation
+     */
+    public function testGetServiceCall()
+    {
+        $this->_markTestAsRestOnly();
+        $itemId = 1;
+        $name = 'Test';
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/testmodule4/' . $itemId,
+                'httpMethod' => \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_GET,
+            ],
+        ];
+        $item = $this->_webApiCall($serviceInfo, [], null, null, $this->integration);
+        $this->assertEquals($itemId, $item['entity_id'], 'id field returned incorrectly');
+        $this->assertEquals($name, $item['name'], 'name field returned incorrectly');
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/AdminAccountTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/AdminAccountTest.php
@@ -90,8 +90,8 @@ public function testSaveUserExistsAdminRoleExists()
                 $existingUserData,
             ],
             [
-                'SELECT * FROM authorization_role WHERE user_id = :user_id',
-                ['user_id' => 1],
+                'SELECT * FROM authorization_role WHERE user_id = :user_id AND user_type = :user_type',
+                ['user_id' => 1, 'user_type' => 2],
                 null,
                 $existingAdminRoleData,
             ],
@@ -137,8 +137,8 @@ public function testSaveUserExistsNewAdminRole()
                 $existingUserData,
             ],
             [
-                'SELECT * FROM authorization_role WHERE user_id = :user_id',
-                ['user_id' => 1],
+                'SELECT * FROM authorization_role WHERE user_id = :user_id AND user_type = :user_type',
+                ['user_id' => 1, 'user_type' => 2],
                 null,
                 [],
             ],
@@ -193,8 +193,8 @@ public function testSaveNewUserAdminRoleExists()
                 [],
             ],
             [
-                'SELECT * FROM authorization_role WHERE user_id = :user_id',
-                ['user_id' => 1],
+                'SELECT * FROM authorization_role WHERE user_id = :user_id AND user_type = :user_type',
+                ['user_id' => 1, 'user_type' => 2],
                 null,
                 $existingAdminRoleData,
             ],
@@ -233,8 +233,8 @@ public function testSaveNewUserNewAdminRole()
                 [],
             ],
             [
-                'SELECT * FROM authorization_role WHERE user_id = :user_id',
-                ['user_id' => 1],
+                'SELECT * FROM authorization_role WHERE user_id = :user_id AND user_type = :user_type',
+                ['user_id' => 1, 'user_type' => 2],
                 null,
                 [],
             ],
diff --git a/setup/src/Magento/Setup/Model/AdminAccount.php b/setup/src/Magento/Setup/Model/AdminAccount.php
@@ -169,8 +169,8 @@ private function saveAdminUserRole($adminId)
     {
         $result = $this->setup->getConnection()->fetchRow(
             'SELECT * FROM ' . $this->setup->getTable('authorization_role') . ' ' .
-            'WHERE user_id = :user_id',
-            ['user_id' => $adminId]
+            'WHERE user_id = :user_id AND user_type = :user_type',
+            ['user_id' => $adminId, 'user_type' => UserContextInterface::USER_TYPE_ADMIN]
         );
         if (empty($result)) {
             // No user role exists for this user id, create it

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct()`
`47`	`47`	`/**`
`48`	`48`	`* {@inheritdoc}`
`49`	`49`	`*/`
`50`		`- public function call($serviceInfo, $arguments = [], $storeCode = null)`
	`50`	`+ public function call($serviceInfo, $arguments = [], $storeCode = null, $integration = null)`
`51`	`51`	`{`
`52`	`52`	`$soapOperation = $this->_getSoapOperation($serviceInfo);`
`53`	`53`	`$arguments = $this->_converter->convertKeysToCamelCase($arguments);`