Merge remote-tracking branch 'origin/MAGETWO-60746' into troll_bugfix_kanban

Author: rganin

app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php

@@ -100,6 +100,8 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
             ]
         );
 
+        $isDisabledStatusField = $storeModel->isReadOnly()
+            || ($storeModel->getId() && $storeModel->isDefault() && $storeModel->isActive());
         $fieldset->addField(
             'store_is_active',
             'select',
@@ -109,10 +111,19 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'value' => $storeModel->isActive(),
                 'options' => [0 => __('Disabled'), 1 => __('Enabled')],
                 'required' => true,
-                'disabled' => $storeModel->isReadOnly()
-                    || ($storeModel->getId() && $storeModel->isDefault() && $storeModel->isActive())
+                'disabled' => $isDisabledStatusField
             ]
         );
+        if ($isDisabledStatusField) {
+            $fieldset->addField(
+                'store_is_active_hidden',
+                'hidden',
+                [
+                    'name' => 'store[is_active]',
+                    'value' => $storeModel->isActive(),
+                ]
+            );
+        }
 
         $fieldset->addField(
             'store_sort_order',

dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php

@@ -10,6 +10,7 @@
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Store\Test\Fixture\Store;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Store\Test\TestStep\RestoreDefaultStoreViewStep;
 
 /**
  * Test Creation for UpdateStoreEntity (Store Management)
@@ -50,17 +51,36 @@ class UpdateStoreEntityTest extends Injectable
      */
     protected $editStore;
 
+    /**
+     * Restore Default Store View step.
+     *
+     * @var RestoreDefaultStoreViewStep
+     */
+    private $restoreDefaultStoreViewStep;
+
+    /**
+     * Initial store fixture.
+     *
+     * @var Store
+     */
+    private $storeInitial;
+
     /**
      * Preparing pages for test
      *
      * @param StoreIndex $storeIndex
      * @param EditStore $editStore
+     * @param RestoreDefaultStoreViewStep $restoreDefaultStoreViewStep
      * @return void
      */
-    public function __inject(StoreIndex $storeIndex, EditStore $editStore)
-    {
+    public function __inject(
+        StoreIndex $storeIndex,
+        EditStore $editStore,
+        RestoreDefaultStoreViewStep $restoreDefaultStoreViewStep
+    ) {
         $this->storeIndex = $storeIndex;
         $this->editStore = $editStore;
+        $this->restoreDefaultStoreViewStep = $restoreDefaultStoreViewStep;
     }
 
     /**
@@ -73,6 +93,7 @@ public function __inject(StoreIndex $storeIndex, EditStore $editStore)
     public function test(Store $storeInitial, Store $store)
     {
         // Preconditions:
+        $this->storeInitial = $storeInitial;
         $storeInitial->persist();
 
         // Steps:
@@ -81,4 +102,14 @@ public function test(Store $storeInitial, Store $store)
         $this->editStore->getStoreForm()->fill($store);
         $this->editStore->getFormPageActions()->save();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function tearDown()
+    {
+        if ($this->storeInitial->getCode() == 'default') {
+            $this->restoreDefaultStoreViewStep->run();
+        }
+    }
 }

dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml

@@ -20,5 +20,11 @@
             <constraint name="Magento\Store\Test\Constraint\AssertStoreBackend" />
             <constraint name="Magento\Store\Test\Constraint\AssertStoreFrontend" />
         </variation>
+        <variation name="UpdateStoreEntityTestVariation2">
+            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="storeInitial/dataset" xsi:type="string">default</data>
+            <data name="store/data/name" xsi:type="string">storename_updated%isolation%</data>
+            <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessSaveMessage" />
+        </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/Store/Test/TestStep/RestoreDefaultStoreViewStep.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\TestStep;
+
+use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Store\Test\Fixture\Store;
+
+/**
+ * Restore DefaultStore view.
+ */
+class RestoreDefaultStoreViewStep implements TestStepInterface
+{
+    /**
+     * Fixture of Store View.
+     *
+     * @var Store
+     */
+    private $storeView;
+
+    /**
+     * @param Store $storeView
+     */
+    public function __construct(Store $storeView)
+    {
+        $this->storeView = $storeView;
+    }
+
+    /**
+     * Restore Default Store View.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->storeView->persist();
+    }
+}