MAGETWO-47868: Unable to checkout with specific country settings #2933

magento · Jan 19, 2016 · 7b1ac83 · 7b1ac83
1 parent 48b29ea
commit 7b1ac83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Cart/LayoutProcessor.php
@@ -85,7 +85,7 @@ public function process($jsLayout)
                 'visible' => true,
                 'formElement' => 'select',
                 'label' => __('Country'),
-                'options' => $this->countryCollection->load()->toOptionArray(),
+                'options' => $this->countryCollection->loadByStore()->toOptionArray(),
                 'value' => null
             ],
             'region_id' => [

diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php
@@ -66,7 +66,7 @@ public function testProcess()
         $layoutPointer = &$layout['components']['block-summary']['children']['block-shipping']
         ['children']['address-fieldsets']['children'];
 
-        $this->countryCollection->expects($this->once())->method('load')->willReturnSelf();
+        $this->countryCollection->expects($this->once())->method('loadByStore')->willReturnSelf();
         $this->countryCollection->expects($this->once())->method('toOptionArray')->willReturn($countries);
 
         $this->regionCollection->expects($this->once())->method('load')->willReturnSelf();