Merge pull request #1472 from magento-engcom/develop-prs

[EngCom] Public Pull Requests
 - MAGETWO-72392: Refactor giftmessage setup #10802
 - MAGETWO-72085: Allow browser back/forward button to shipping step #10698

Author: ishakhsuvarov

app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js

@@ -47,7 +47,7 @@ define([
 
             steps.sort(this.sortItems).forEach(function (element) {
                 if (element.code == hashString || element.alias == hashString) { //eslint-disable-line eqeqeq
-                    element.navigate();
+                    element.navigate(element);
                 } else {
                     element.isVisible(false);
                 }

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -127,10 +127,12 @@ define([
         },
 
         /**
-         * Load data from server for shipping step
+         * Navigator change hash handler.
+         *
+         * @param {Object} step - navigation step
          */
-        navigate: function () {
-            //load data from server for shipping step
+        navigate: function (step) {
+            step && step.isVisible(true);
         },
 
         /**

app/code/Magento/GiftMessage/Setup/InstallData.php

@@ -67,9 +67,9 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
          */
         $options = ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, 'visible' => false, 'required' => false];
         $entities = ['quote', 'quote_address', 'quote_item', 'quote_address_item'];
+        /** @var \Magento\Quote\Setup\QuoteSetup $quoteSetup */
+        $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
         foreach ($entities as $entity) {
-            /** @var \Magento\Quote\Setup\QuoteSetup $quoteSetup */
-            $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
             $quoteSetup->addAttribute($entity, 'gift_message_id', $options);
         }
 

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js

@@ -80,7 +80,12 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
     describe('Magento_Checkout/js/view/shipping', function () {
         describe('"navigate" method', function () {
             it('Check for return value.', function () {
-                expect(obj.navigate()).toBeUndefined();
+                var step = {
+                    isVisible: ko.observable(false)
+                };
+
+                expect(obj.navigate(step)).toBeUndefined();
+                expect(step.isVisible()).toBe(true);
             });
         });