Merge remote-tracking branch 'origin/MAGETWO-34653' into MAGETWO-34653

Author: akaplya

app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml

@@ -56,11 +56,12 @@
 <script>
 require([
     "jquery",
+    "Magento_Ui/js/lib/registry/registry",
     "mage/mage",
     "prototype"
-], function(jQuery){
+], function(jQuery, registry){
 
-    jQuery('body').one('packageInitialized', function(){
+    registry.get('packaging', function(packaging){
         packaging.setConfirmPackagingCallback(function(){
             packaging.setParamsCreateLabelRequest($('edit_form').serialize(true));
             packaging.sendCreateLabelRequest();

app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml

@@ -16,18 +16,18 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
 <script>
 require([
     "jquery",
+    "Magento_Ui/js/lib/registry/registry",
     "prototype",
     "Magento_Shipping/order/packaging"
-], function(jQuery){
+], function(jQuery, registry){
 
     packaging = new Packaging(<?php echo $block->getConfigDataJson() ?>);
     packaging.changeContainerType($$('select[name=package_container]')[0]);
     packaging.checkSizeAndGirthParameter(
             $$('select[name=package_container]')[0],
     <?php echo $girthEnabled; ?>
     );
-
-    jQuery('body').trigger('packageInitialized');
+    registry.set('packaging', packaging);
 
 });
 </script>

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertStoreCanBeLocalized.php

@@ -10,6 +10,7 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Backend\Test\Page\Adminhtml\SystemConfig;
 use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Backend\Test\Page\Adminhtml\AdminCache;
 
 /**
  * Assert that store can be localized.
@@ -22,12 +23,18 @@ class AssertStoreCanBeLocalized extends AbstractConstraint
      * @param SystemConfig $systemConfig
      * @param Store $store
      * @param CmsIndex $cmsIndex
+     * @param AdminCache $adminCache
      * @param string $locale
      * @param string $welcomeText
-     * @return void
      */
-    public function processAssert(SystemConfig $systemConfig, Store $store, CmsIndex $cmsIndex, $locale, $welcomeText)
-    {
+    public function processAssert(
+        SystemConfig $systemConfig,
+        Store $store,
+        CmsIndex $cmsIndex,
+        AdminCache $adminCache,
+        $locale,
+        $welcomeText
+    ) {
         // Set locale options
         $systemConfig->open();
         $systemConfig->getPageActions()->selectStore($store->getGroupId() . "/" . $store->getName());
@@ -37,6 +44,11 @@ public function processAssert(SystemConfig $systemConfig, Store $store, CmsIndex
         $systemConfig->getPageActions()->save();
         $systemConfig->getMessagesBlock()->waitSuccessMessage();
 
+        // Flush cache
+        $adminCache->open();
+        $adminCache->getActionsBlock()->flushMagentoCache();
+        $adminCache->getMessagesBlock()->waitSuccessMessage();
+
         // Check presents income text on index page
         $cmsIndex->open();
         $cmsIndex->getStoreSwitcherBlock()->selectStoreView($store->getName());