Merge pull request #1723 from magento-borg/PR2.3_20171115

Fixed issues:
- MAGETWO-80353 PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade
- MAGETWO-83880 СheckCustomerTypeTest failure on FAT-EXT-B2B-UR on develop

Author: slavvka

app/code/Magento/User/Model/ResourceModel/User/Collection.php

@@ -31,11 +31,11 @@ protected function _construct()
     protected function _initSelect()
     {
         parent::_initSelect();
-        $this->getSelect()->join(
+        $this->getSelect()->joinLeft(
             ['user_role' => $this->getTable('authorization_role')],
-            'main_table.user_id = user_role.user_id',
+            'main_table.user_id = user_role.user_id AND user_role.parent_id != 0',
             []
-        )->join(
+        )->joinLeft(
             ['detail_role' => $this->getTable('authorization_role')],
             'user_role.parent_id = detail_role.role_id',
             ['role_name']

dev/tests/functional/composer.json

@@ -5,7 +5,7 @@
     "require": {
         "php": "7.0.2|~7.0.6|~7.1.0",
         "allure-framework/allure-phpunit": "~1.2.0",
-        "magento/mtf": "1.0.0-rc56",
+        "magento/mtf": "1.0.0-rc57",
         "phpunit/phpunit": "~4.8.0|~5.5.0",
         "phpunit/phpunit-selenium": ">=1.2"
     },

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

@@ -46,8 +46,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
         </variation>
         <variation name="CreateSimpleProductEntityTestVariation3" summary="Create product with special price and custom options(fixed price)">
-            <data name="tag" xsi:type="string">stable:no</data>
-            <data name="issue" xsi:type="string">MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade</data>
             <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml

@@ -178,8 +178,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPriceOnDifferentStoreViews" />
         </variation>
         <variation name="UpdateSimpleProductEntityTestVariation14" summary="An error appears on open tier price with locale formatting" ticketId="MAGETWO-62076">
-            <data name="tag" xsi:type="string">stable:no</data>
-            <data name="issue" xsi:type="string">MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade</data>
             <data name="initialProduct/dataset" xsi:type="string">simple_with_hight_tier_price</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductFormattingTierPrice" />
         </variation>

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.xml

@@ -8,8 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Customer\Test\TestCase\MassAssignCustomerGroupTest" summary="Mass Assign Customer's Group to Customers" ticketId="MAGETWO-27892">
         <variation name="MassAssignCustomerGroupTestVariation1" summary="Customer is created and mass action for changing customer group to created group is applied">
-            <data name="tag" xsi:type="string">stable:no</data>
-            <data name="issue" xsi:type="string">MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade</data>
             <data name="customers" xsi:type="array">
                 <item name="0" xsi:type="string">default</item>
             </data>

dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.xml

@@ -8,8 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\User\Test\TestCase\RevokeAllAccessTokensForAdminWithoutTokensTest" summary="Revoke All Access Tokens for Admin without Tokens" ticketId="MAGETWO-29675">
         <variation name="RevokeAllAccessTokensForAdminWithoutTokensTestVariation1">
-            <data name="tag" xsi:type="string">stable:no</data>
-            <data name="issue" xsi:type="string">MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade</data>
             <data name="user/dataset" xsi:type="string">custom_admin</data>
             <constraint name="Magento\User\Test\Constraint\AssertAccessTokensErrorRevokeMessage" />
         </variation>

dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php

@@ -12,6 +12,7 @@
 use Magento\Store\Test\Fixture\Store;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\TestStep\TestStepFactory;
 
 /**
  * Preconditions:
@@ -59,19 +60,36 @@ class UpdateCustomVariableEntityTest extends Injectable
      */
     protected $store = null;
 
+    /**
+     * Configuration setting.
+     *
+     * @var string
+     */
+    private $configData;
+
+    /**
+     * Factory for Test Steps.
+     *
+     * @var TestStepFactory
+     */
+    private $testStepFactory;
+
     /**
      * Injection data.
      *
      * @param SystemVariableIndex $systemVariableIndex
      * @param SystemVariableNew $systemVariableNew
+     * @param TestStepFactory $testStepFactory
      * @return void
      */
     public function __inject(
         SystemVariableIndex $systemVariableIndex,
-        SystemVariableNew $systemVariableNew
+        SystemVariableNew $systemVariableNew,
+        TestStepFactory $testStepFactory
     ) {
         $this->systemVariableIndexPage = $systemVariableIndex;
         $this->systemVariableNewPage = $systemVariableNew;
+        $this->testStepFactory = $testStepFactory;
     }
 
     /**
@@ -81,14 +99,22 @@ public function __inject(
      * @param SystemVariable $customVariable
      * @param SystemVariable $customVariableOrigin
      * @param string $saveAction
+     * @param string|null $configData [optional]
      * @return array
      */
     public function test(
         FixtureFactory $fixtureFactory,
         SystemVariable $customVariable,
         SystemVariable $customVariableOrigin,
-        $saveAction
+        $saveAction,
+        $configData = null
     ) {
+        // Preconditions
+        $this->configData = $configData;
+        $this->testStepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData]
+        )->run();
         $this->store = $fixtureFactory->createByCode('store', ['dataset' => 'custom']);
         $this->store->persist();
         $customVariableOrigin->persist();

dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.xml

@@ -19,8 +19,7 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation2">
-            <data name="tag" xsi:type="string">stable:no</data>
-            <data name="issue" xsi:type="string">MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade</data>
+            <data name="configData" xsi:type="string">add_store_code_to_urls</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>
@@ -32,7 +31,7 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation3">
-            <data name="tag" xsi:type="string">stable:no</data>
+            <data name="configData" xsi:type="string">add_store_code_to_urls</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>
@@ -45,8 +44,7 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation4">
-            <data name="tag" xsi:type="string">stable:no</data>
-            <data name="issue" xsi:type="string">MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade</data>
+            <data name="configData" xsi:type="string">add_store_code_to_urls</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>