Merge pull request #299 from magento-south/BUGS

[SOUTH] Bugs

Author: slavvka

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js

@@ -15,6 +15,7 @@ define([
 ], function($, ko, Component, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
     'use strict';
     var countryData = customerData.get('directory-data');
+
     return Component.extend({
         defaults: {
             template: 'Magento_Checkout/shipping-address/address-renderer/default'

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js

@@ -9,6 +9,7 @@ define([
 ], function(Component, customerData) {
     'use strict';
     var countryData = customerData.get('directory-data');
+
     return Component.extend({
         defaults: {
             template: 'Magento_Checkout/shipping-information/address-renderer/default'

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -177,9 +177,13 @@ define([
          * Customer data initialization
          */
         init: function() {
-            var privateContent = $.cookieStorage.get('private_content_version');
-            if (_.isEmpty(storage.keys()) && _.isObject(privateContent)) {
-                this.reload([], false);
+            var countryData,
+                privateContent = $.cookieStorage.get('private_content_version');
+
+            if (_.isEmpty(storage.keys())) {
+                if (!_.isEmpty(privateContent)) {
+                    this.reload([], false);
+                }
             } else if (this.needReload()) {
                 _.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
                     buffer.notify(sectionName, sectionData);
@@ -194,6 +198,13 @@ define([
                     this.reload(storageInvalidation.keys(), false);
                 }
             }
+
+            if (!_.isEmpty(privateContent)) {
+                countryData = this.get('directory-data');
+                if (_.isEmpty(countryData())) {
+                    countryData(customerData.reload(['directory-data'], false));
+                }
+            }
         },
 
         /**

app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php

@@ -248,6 +248,7 @@ private function validate($themePaths)
             $text = 'Theme path should be specified as full path which is area/vendor/name.';
             $messages[] = '<error>Incorrect theme(s) format: ' . implode(', ', $incorrectThemes)
                 . '. ' . $text . '</error>';
+            return $messages;
         }
 
         $unknownPackages = $this->getUnknownPackages($themePaths);

app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php

@@ -318,23 +318,6 @@ public function testExecuteCleanStaticFiles()
      */
     public function testExecuteWrongThemeFormat($themePath)
     {
-        $this->themePackageInfo->expects($this->once())
-            ->method('getPackageName')
-            ->willReturn('dummy');
-
-        $themeMock = $this->getMockBuilder('Magento\Framework\View\Design\ThemeInterface')
-            ->getMockForAbstractClass();
-
-        $this->collection->expects($this->once())
-            ->method('getThemeByFullPath')
-            ->with($themePath)
-            ->willReturn($themeMock);
-
-        $this->collection->expects($this->once())
-            ->method('hasTheme')
-            ->with($themeMock)
-            ->willReturn(false);
-
         $this->tester->execute(['theme' => [$themePath]]);
         $this->assertContains(
             'Theme path should be specified as full path which is area/vendor/name.',