MAGETWO-97393: Impossible to enable shared catalog through cli command

yelahin-serhiy · yelahin-serhiy · commit b58256d7c967 · 2019-01-08T13:39:32.000+02:00
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
@@ -101,12 +101,10 @@ public function testProcess($path, $value, $scope, $scopeCode)
         $this->configMockForProcessTest($path, $scope, $scopeCode);
 
         $config = $this->createMock(Config::class);
-        $this->configFactory->expects($this->once())
-            ->method('create')
+        $this->configFactory->method('create')
             ->with(['scope' => $scope, 'scope_code' => $scopeCode])
             ->willReturn($config);
-        $config->expects($this->once())
-            ->method('setDataByPath')
+        $config->method('setDataByPath')
             ->with($path, $value);
         $config->expects($this->once())
             ->method('save')
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -5,127 +5,140 @@
  */
 namespace Magento\Config\Test\Unit\Model;
 
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Config\Model\Config\Structure\Reader;
+use Magento\Framework\DB\TransactionFactory;
+use Magento\Config\Model\Config\Loader;
+use Magento\Framework\App\Config\ValueFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Config\Model\Config\Structure;
+use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
+use Magento\Framework\App\ScopeResolverPool;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Store\Model\ScopeTypeNormalizer;
+use Magento\Framework\DB\Transaction;
+use Magento\Framework\App\Config\Value;
+use Magento\Store\Model\Website;
+use Magento\Config\Model\Config\Structure\Element\Group;
+use Magento\Config\Model\Config\Structure\Element\Field;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Config\Model\Config
+     * @var Config
      */
     private $model;
 
     /**
-     * @var \Magento\Framework\Event\ManagerInterface|MockObject
+     * @var ManagerInterface|MockObject
      */
     private $eventManagerMock;
 
     /**
-     * @var \Magento\Config\Model\Config\Structure\Reader|MockObject
+     * @var Reader|MockObject
      */
     private $structureReaderMock;
 
     /**
-     * @var \Magento\Framework\DB\TransactionFactory|MockObject
+     * @var TransactionFactory|MockObject
      */
     private $transFactoryMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ReinitableConfigInterface|MockObject
+     * @var ReinitableConfigInterface|MockObject
      */
     private $appConfigMock;
 
     /**
-     * @var \Magento\Config\Model\Config\Loader|MockObject
+     * @var Loader|MockObject
      */
     private $configLoaderMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ValueFactory|MockObject
+     * @var ValueFactory|MockObject
      */
     private $dataFactoryMock;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface|MockObject
+     * @var StoreManagerInterface|MockObject
      */
     private $storeManager;
 
     /**
-     * @var \Magento\Config\Model\Config\Structure|MockObject
+     * @var Structure|MockObject
      */
     private $configStructure;
 
     /**
-     * @var \Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker|MockObject
+     * @var SettingChecker|MockObject
      */
     private $settingsChecker;
 
     /**
-     * @var \Magento\Framework\App\ScopeResolverPool|MockObject
+     * @var ScopeResolverPool|MockObject
      */
     private $scopeResolverPool;
 
     /**
-     * @var \Magento\Framework\App\ScopeResolverInterface|MockObject
+     * @var ScopeResolverInterface|MockObject
      */
     private $scopeResolver;
 
     /**
-     * @var \Magento\Framework\App\ScopeInterface|MockObject
+     * @var ScopeInterface|MockObject
      */
     private $scope;
 
     /**
-     * @var \Magento\Store\Model\ScopeTypeNormalizer|MockObject
+     * @var ScopeTypeNormalizer|MockObject
      */
     private $scopeTypeNormalizer;
 
     protected function setUp()
     {
-        $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
         $this->structureReaderMock = $this->createPartialMock(
-            \Magento\Config\Model\Config\Structure\Reader::class,
+            Reader::class,
             ['getConfiguration']
         );
-        $this->configStructure = $this->createMock(\Magento\Config\Model\Config\Structure::class);
+        $this->configStructure = $this->createMock(Structure::class);
 
-        $this->structureReaderMock->expects(
-            $this->any()
-        )->method(
-            'getConfiguration'
-        )->will(
-            $this->returnValue($this->configStructure)
-        );
+        $this->structureReaderMock->method('getConfiguration')
+            ->willReturn($this->configStructure);
 
         $this->transFactoryMock = $this->createPartialMock(
-            \Magento\Framework\DB\TransactionFactory::class,
+            TransactionFactory::class,
             ['create', 'addObject']
         );
-        $this->appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $this->appConfigMock = $this->createMock(ReinitableConfigInterface::class);
         $this->configLoaderMock = $this->createPartialMock(
-            \Magento\Config\Model\Config\Loader::class,
+            Loader::class,
             ['getConfigByPath']
         );
-        $this->dataFactoryMock = $this->createMock(\Magento\Framework\App\Config\ValueFactory::class);
+        $this->dataFactoryMock = $this->createMock(ValueFactory::class);
 
-        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
 
-        $this->settingsChecker = $this
-            ->createMock(\Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker::class);
+        $this->settingsChecker = $this->createMock(SettingChecker::class);
 
-        $this->scopeResolverPool = $this->createMock(\Magento\Framework\App\ScopeResolverPool::class);
-        $this->scopeResolver = $this->createMock(\Magento\Framework\App\ScopeResolverInterface::class);
+        $this->scopeResolverPool = $this->createMock(ScopeResolverPool::class);
+        $this->scopeResolver = $this->createMock(ScopeResolverInterface::class);
         $this->scopeResolverPool->method('get')
             ->willReturn($this->scopeResolver);
-        $this->scope = $this->createMock(\Magento\Framework\App\ScopeInterface::class);
+        $this->scope = $this->createMock(ScopeInterface::class);
         $this->scopeResolver->method('getScope')
             ->willReturn($this->scope);
 
-        $this->scopeTypeNormalizer = $this->createMock(\Magento\Store\Model\ScopeTypeNormalizer::class);
+        $this->scopeTypeNormalizer = $this->createMock(ScopeTypeNormalizer::class);
 
-        $this->model = new \Magento\Config\Model\Config(
+        $this->model = new Config(
             $this->appConfigMock,
             $this->eventManagerMock,
             $this->configStructure,
@@ -160,11 +173,13 @@ public function testSaveEmptiesNonSetArguments()
 
     public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
     {
-        $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
+        $transactionMock = $this->createMock(Transaction::class);
 
-        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $this->transFactoryMock->method('create')
+            ->willReturn($transactionMock);
 
-        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->configLoaderMock->method('getConfigByPath')
+            ->willReturn([]);
 
         $this->eventManagerMock->expects(
             $this->at(0)
@@ -190,53 +205,64 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
 
     public function testDoNotSaveReadOnlyFields()
     {
-        $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
-        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $transactionMock = $this->createMock(Transaction::class);
+        $this->transFactoryMock->method('create')
+            ->willReturn($transactionMock);
 
-        $this->settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
-        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->settingsChecker->method('isReadOnly')
+            ->willReturn(true);
+        $this->configLoaderMock->method('getConfigByPath')
+            ->willReturn([]);
 
         $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
         $this->model->setSection('section');
 
-        $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
-        $group->method('getPath')->willReturn('section/1');
+        $group = $this->createMock(Group::class);
+        $group->method('getPath')
+            ->willReturn('section/1');
 
-        $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
-        $field->method('getGroupPath')->willReturn('section/1');
-        $field->method('getId')->willReturn('key');
+        $field = $this->createMock(Field::class);
+        $field->method('getGroupPath')
+            ->willReturn('section/1');
+        $field->method('getId')
+            ->willReturn('key');
 
         $this->configStructure->expects($this->at(0))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
+            ->willReturn($group);
         $this->configStructure->expects($this->at(1))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
+            ->willReturn($group);
         $this->configStructure->expects($this->at(2))
             ->method('getElement')
             ->with('section/1/key')
-            ->will($this->returnValue($field));
+            ->willReturn($field);
 
         $backendModel = $this->createPartialMock(
-            \Magento\Framework\App\Config\Value::class,
+            Value::class,
             ['addData']
         );
-        $this->dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+        $this->dataFactoryMock->method('create')
+            ->willReturn($backendModel);
 
-        $this->transFactoryMock->expects($this->never())->method('addObject');
-        $backendModel->expects($this->never())->method('addData');
+        $this->transFactoryMock->expects($this->never())
+            ->method('addObject');
+        $backendModel->expects($this->never())
+            ->method('addData');
 
         $this->model->save();
     }
 
     public function testSaveToCheckScopeDataSet()
     {
-        $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
-        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $transactionMock = $this->createMock(Transaction::class);
+        $this->transFactoryMock->method('create')
+            ->willReturn($transactionMock);
 
-        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->configLoaderMock->method('getConfigByPath')
+            ->willReturn([]);
 
         $this->eventManagerMock->expects($this->at(0))
             ->method('dispatch')
@@ -251,36 +277,35 @@ public function testSaveToCheckScopeDataSet()
                 $this->arrayHasKey('store')
             );
 
-        $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
+        $group = $this->createMock(Group::class);
         $group->method('getPath')->willReturn('section/1');
 
-        $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
+        $field = $this->createMock(Field::class);
         $field->method('getGroupPath')->willReturn('section/1');
         $field->method('getId')->willReturn('key');
 
         $this->configStructure->expects($this->at(0))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
+            ->willReturn($group);
         $this->configStructure->expects($this->at(1))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
+            ->willReturn($group);
         $this->configStructure->expects($this->at(2))
             ->method('getElement')
             ->with('section/1/key')
-            ->will($this->returnValue($field));
+            ->willReturn($field);
         $this->configStructure->expects($this->at(3))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
+            ->willReturn($group);
         $this->configStructure->expects($this->at(4))
             ->method('getElement')
             ->with('section/1/key')
-            ->will($this->returnValue($field));
+            ->willReturn($field);
 
-        $this->scopeResolver->expects($this->atLeastOnce())
-            ->method('getScope')
+        $this->scopeResolver->method('getScope')
             ->with('1')
             ->willReturn($this->scope);
         $this->scope->expects($this->atLeastOnce())
@@ -296,20 +321,19 @@ public function testSaveToCheckScopeDataSet()
             ->method('normalize')
             ->with('website')
             ->willReturn('websites');
-        $website = $this->createMock(\Magento\Store\Model\Website::class);
-        $this->storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
-        $this->storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
+        $website = $this->createMock(Website::class);
+        $this->storeManager->method('getWebsites')->willReturn([$website]);
+        $this->storeManager->method('isSingleStoreMode')->willReturn(true);
 
         $this->model->setWebsite('1');
         $this->model->setSection('section');
         $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
 
         $backendModel = $this->createPartialMock(
-            \Magento\Framework\App\Config\Value::class,
+            Value::class,
             ['setPath', 'addData', '__sleep', '__wakeup']
         );
-        $backendModel->expects($this->once())
-            ->method('addData')
+        $backendModel->method('addData')
             ->with([
                 'field' => 'key',
                 'groups' => [1 => ['fields' => ['key' => ['data']]]],
@@ -323,9 +347,10 @@ public function testSaveToCheckScopeDataSet()
         $backendModel->expects($this->once())
             ->method('setPath')
             ->with('section/1/key')
-            ->will($this->returnValue($backendModel));
+            ->willReturn($backendModel);
 
-        $this->dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+        $this->dataFactoryMock->method('create')
+            ->willReturn($backendModel);
 
         $this->model->save();
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
@@ -47,8 +47,7 @@ public function testAroundGetConfigPathHasResult()
 
     public function testAroundGetConfigPathNonPaymentSection()
     {
-        $this->subjectMock->expects($this->once())
-            ->method('getPath')
+        $this->subjectMock->method('getPath')
             ->willReturn('non-payment/group/field');
 
         $this->assertNull($this->plugin->afterGetConfigPath($this->subjectMock, null));
@@ -62,8 +61,7 @@ public function testAroundGetConfigPathNonPaymentSection()
      */
     public function testAroundGetConfigPath($subjectPath, $expectedConfigPath)
     {
-        $this->subjectMock->expects($this->exactly(2))
-            ->method('getPath')
+        $this->subjectMock->method('getPath')
             ->willReturn($subjectPath);
 
         $this->assertEquals($expectedConfigPath, $this->plugin->afterGetConfigPath($this->subjectMock, null));
