Add version 2.1.7

Author: imsamthomas

.travis.yml

@@ -20,6 +20,7 @@ env:
     - TEST_SUITE=integration INTEGRATION_INDEX=1
     - TEST_SUITE=integration INTEGRATION_INDEX=2
     - TEST_SUITE=integration INTEGRATION_INDEX=3
+    - TEST_SUITE=static
 cache:
   apt: true
   directories: $HOME/.composer/cache

composer.json

@@ -2,20 +2,20 @@
     "name": "magento/project-community-edition",
     "description": "eCommerce Platform for Growth (Community Edition)",
     "type": "project",
-    "version": "2.1.5",
+    "version": "2.1.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/product-community-edition": "2.1.5",
+        "magento/product-community-edition": "2.1.7",
         "composer/composer": "@alpha"
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.0",
         "squizlabs/php_codesniffer": "1.5.3",
         "phpmd/phpmd": "@stable",
-        "pdepend/pdepend": "2.2.2",
+        "pdepend/pdepend": "2.4.0",
         "fabpot/php-cs-fixer": "~1.2",
         "lusitanian/oauth": "~0.3 <=0.7.0",
         "sebastian/phpcpd": "2.0.0"

composer.lock

@@ -78,6 +78,19 @@ public function testCreateAdminAccessToken()
         $this->assertToken($adminUserNameFromFixture, $accessToken);
     }
 
+    /**
+     * Provider to test input validation
+     *
+     * @return array
+     */
+    public function validationDataProvider()
+    {
+        return [
+            'Check for empty credentials' => ['', ''],
+            'Check for null credentials' => [null, null]
+        ];
+    }
+
     /**
      * @dataProvider validationDataProvider
      */
@@ -94,8 +107,8 @@ public function testCreateAdminAccessTokenEmptyOrNullCredentials()
             $requestData = ['username' => '', 'password' => ''];
             $this->_webApiCall($serviceInfo, $requestData);
             $noExceptionOccurred = true;
-        } catch (\Exception $e) {
-            $this->assertInputExceptionMessages($e);
+        } catch (\Exception $exception) {
+            $this->assertInputExceptionMessages($exception);
         }
         if ($noExceptionOccurred) {
             $this->fail("Exception was expected to be thrown when provided credentials are invalid.");
@@ -117,25 +130,72 @@ public function testCreateAdminAccessTokenInvalidCredentials()
             $requestData = ['username' => $customerUserName, 'password' => $password];
             $this->_webApiCall($serviceInfo, $requestData);
             $noExceptionOccurred = true;
-        } catch (\Exception $e) {
-            $this->assertInvalidCredentialsException($e);
+        } catch (\Exception $exception) {
+            $this->assertInvalidCredentialsException($exception);
         }
         if ($noExceptionOccurred) {
             $this->fail("Exception was expected to be thrown when provided credentials are invalid.");
         }
     }
 
     /**
-     * Provider to test input validation
-     *
-     * @return array
+     * @magentoApiDataFixture Magento/Webapi/_files/webapi_user.php
      */
-    public function validationDataProvider()
+    public function testUseAdminAccessTokenInactiveAdmin()
     {
-        return [
-            'Check for empty credentials' => ['', ''],
-            'Check for null credentials' => [null, null]
+        $adminUserNameFromFixture = 'webapi_user';
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH_ADMIN_TOKEN,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+            ],
+        ];
+        $requestData = [
+            'username' => $adminUserNameFromFixture,
+            'password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
         ];
+        $accessToken = $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertToken($adminUserNameFromFixture, $accessToken);
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/store/storeConfigs',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'token' => $accessToken
+            ]
+        ];
+        $requestData = [
+            'storeCodes' => ['default'],
+        ];
+        $storeConfigs = $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertNotNull($storeConfigs);
+
+        $adminUser = $this->userModel->loadByUsername($adminUserNameFromFixture);
+        $adminUser->setData("is_active", 0);
+        $adminUser->save();
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/store/storeConfigs',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'token' => $accessToken
+            ]
+        ];
+        $requestData = [
+            'storeCodes' => ['default'],
+        ];
+
+        $noExceptionOccurred = false;
+        try {
+            $this->_webApiCall($serviceInfo, $requestData);
+            $noExceptionOccurred = true;
+        } catch (\Exception $exception) {
+            $this->assertUnauthorizedAccessException($exception);
+        }
+        if ($noExceptionOccurred) {
+            $this->fail("Exception was expected to be thrown when provided token is expired.");
+        }
     }
 
     /**
@@ -166,7 +226,7 @@ public function testThrottlingMaxAttempts()
             try {
                 $this->_webApiCall($serviceInfo, $invalidCredentials);
                 $noExceptionOccurred = true;
-            } catch (\Exception $e) {
+            } catch (\Exception $exception) {
             }
         }
         if ($noExceptionOccurred) {
@@ -208,8 +268,8 @@ public function testThrottlingAccountLockout()
             try {
                 $this->_webApiCall($serviceInfo, $invalidCredentials);
                 $noExceptionOccurred = true;
-            } catch (\Exception $e) {
-                $this->assertInvalidCredentialsException($e);
+            } catch (\Exception $exception) {
+                $this->assertInvalidCredentialsException($exception);
             }
             if ($noExceptionOccurred) {
                 $this->fail("Exception was expected to be thrown when provided credentials are invalid.");
@@ -220,8 +280,8 @@ public function testThrottlingAccountLockout()
         try {
             $this->_webApiCall($serviceInfo, $validCredentials);
             $noExceptionOccurred = true;
-        } catch (\Exception $e) {
-            $this->assertInvalidCredentialsException($e);
+        } catch (\Exception $exception) {
+            $this->assertInvalidCredentialsException($exception);
         }
         if ($noExceptionOccurred) {
             $this->fail("Exception was expected to be thrown because account should have been locked at this point.");
@@ -231,12 +291,12 @@ public function testThrottlingAccountLockout()
     /**
      * Assert for presence of Input exception messages
      *
-     * @param \Exception $e
+     * @param \Exception $exception
      */
-    private function assertInputExceptionMessages($e)
+    private function assertInputExceptionMessages($exception)
     {
-        $this->assertEquals(HTTPExceptionCodes::HTTP_BAD_REQUEST, $e->getCode());
-        $exceptionData = $this->processRestExceptionResult($e);
+        $this->assertEquals(HTTPExceptionCodes::HTTP_BAD_REQUEST, $exception->getCode());
+        $exceptionData = $this->processRestExceptionResult($exception);
         $expectedExceptionData = [
             'message' => 'One or more input exceptions have occurred.',
             'errors' => [
@@ -260,18 +320,44 @@ private function assertInputExceptionMessages($e)
     /**
      * Make sure that status code and message are correct in case of authentication failure.
      *
-     * @param \Exception $e
+     * @param \Exception $exception
      */
-    private function assertInvalidCredentialsException($e)
+    private function assertInvalidCredentialsException($exception)
     {
-        $this->assertEquals(HTTPExceptionCodes::HTTP_UNAUTHORIZED, $e->getCode(), "Response HTTP code is invalid.");
-        $exceptionData = $this->processRestExceptionResult($e);
+        $this->assertEquals(
+            HTTPExceptionCodes::HTTP_UNAUTHORIZED,
+            $exception->getCode(),
+            "Response HTTP code is invalid."
+        );
+        $exceptionData = $this->processRestExceptionResult($exception);
         $expectedExceptionData = [
             'message' => 'You did not sign in correctly or your account is temporarily disabled.'
         ];
         $this->assertEquals($expectedExceptionData, $exceptionData, "Exception message is invalid.");
     }
 
+    /**
+     * Make sure that status code and message are correct in case of authentication failure.
+     *
+     * @param \Exception $exception
+     */
+    private function assertUnauthorizedAccessException($exception)
+    {
+        $this->assertEquals(
+            HTTPExceptionCodes::HTTP_UNAUTHORIZED,
+            $exception->getCode(),
+            "Response HTTP code is invalid."
+        );
+        $exceptionData = $this->processRestExceptionResult($exception);
+        $expectedExceptionData = [
+            'message' => 'Consumer is not authorized to access %resources',
+            'parameters' => [
+                'resources' => 'Magento_Backend::store'
+            ]
+        ];
+        $this->assertEquals($expectedExceptionData, $exceptionData, "Exception message is invalid.");
+    }
+
     /**
      * Make sure provided token is valid and belongs to the specified user.
      *

dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php

@@ -0,0 +1,6 @@
+###########################################
+## Allow access to command.php
+    <Files command.php>
+         order allow,deny
+         allow from all
+    </Files>

dev/tests/functional/.htaccess.sample

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Mtf\Client\Element;
+
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Class provides ability to work with page element radio button.
+ */
+class RadiobuttonElement extends SimpleElement
+{
+    /**
+     * Label for radio button selector.
+     *
+     * @var string
+     */
+    protected $labelSelector = './..//label[contains(., "%s")]';
+
+    /**
+     * Selector for selected label.
+     *
+     * @var string
+     */
+    protected $selectedLabelSelector = 'input[type=radio]:checked + label';
+
+    /**
+     * Get value of the required element.
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        $this->eventManager->dispatchEvent(['get_value'], [$this->getAbsoluteSelector()]);
+        return $this->find($this->selectedLabelSelector)->getText();
+    }
+
+    /**
+     * Select radio button based on label value.
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setValue($value)
+    {
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $radioButtonLabel = $this->find(sprintf($this->labelSelector, $value), Locator::SELECTOR_XPATH);
+        if (!$this->isSelected()) {
+            $radioButtonLabel->click();
+        }
+    }
+}

dev/tests/functional/lib/Magento/Mtf/Client/Element/RadiobuttonElement.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Mtf\Util\Command;
+
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+
+/**
+ * Perform bin/magento commands from command line for functional tests executions.
+ */
+class Cli
+{
+    /**
+     * Url to command.php.
+     */
+    const URL = 'dev/tests/functional/utils/command.php';
+
+    /**
+     * Curl transport protocol.
+     *
+     * @var CurlTransport
+     */
+    private $transport;
+
+    /**
+     * @param CurlTransport $transport
+     */
+    public function __construct(CurlTransport $transport)
+    {
+        $this->transport = $transport;
+    }
+
+    /**
+     * Run command.
+     *
+     * @param string $command
+     * @param array $options [optional]
+     * @return void
+     */
+    public function execute($command, $options = [])
+    {
+        $curl = $this->transport;
+        $curl->write($this->prepareUrl($command, $options), [], CurlInterface::GET);
+        $curl->read();
+        $curl->close();
+    }
+
+    /**
+     * Prepare url.
+     *
+     * @param string $command
+     * @param array $options [optional]
+     * @return string
+     */
+    private function prepareUrl($command, $options = [])
+    {
+        if ($options) {
+            $command .= ' ' . implode(' ', $options);
+        }
+        return $_ENV['app_frontend_url'] . self::URL . '?command=' . urlencode($command);
+    }
+}