Merge branch 'MAGETWO-34804' of github.corp.ebay.com:magento-south/ma…

…gento2ce into MAGETWO-34804
vancoz · May 15, 2015 · 7f96122 · 7f96122
2 parents 2d52233 + 7783cd2
commit 7f96122
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php
@@ -272,6 +272,7 @@ protected function getFirstFixtureAddressData()
             'default_shipping' => true,
             'customer_id' => '1',
             'region' => ['region' => 'Alabama', 'region_id' => 1, 'region_code' => 'AL'],
+            'region_id' => 1,
         ];
     }
 
@@ -295,6 +296,7 @@ protected function getSecondFixtureAddressData()
             'default_shipping' => false,
             'customer_id' => '1',
             'region' => ['region' => 'Alabama', 'region_id' => 1, 'region_code' => 'AL'],
+            'region_id' => 1,
         ];
     }
 

diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
@@ -747,6 +747,7 @@ protected function getFirstFixtureAddressData()
             'default_shipping' => true,
             'customer_id' => '1',
             'region' => ['region' => 'Alabama', 'region_id' => 1, 'region_code' => 'AL'],
+            'region_id' => 1,
         ];
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
@@ -141,6 +141,7 @@ protected function getFirstFixtureAddressData()
             'default_shipping' => true,
             'customer_id' => '1',
             'region' => ['region' => 'Alabama', 'region_id' => 1, 'region_code' => 'AL'],
+            'region_id' => 1,
         ];
     }
 
@@ -164,6 +165,7 @@ protected function getSecondFixtureAddressData()
             'default_shipping' => false,
             'customer_id' => '1',
             'region' => ['region' => 'Alabama', 'region_id' => 1, 'region_code' => 'AL'],
+            'region_id' => 1,
         ];
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/AddressDetailsManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/AddressDetailsManagementTest.php
@@ -70,7 +70,7 @@ public function testSaveAddresses()
         $this->assertEquals('flatrate', $response['shipping_methods'][0]['method_code']);
 
         $this->assertArrayHasKey('payment_methods', $response);
-        $this->assertCount(1, $response['payment_methods']);
+        $this->assertCount(2, $response['payment_methods']);
         $this->assertEquals('checkmo', $response['payment_methods'][0]['code']);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php
@@ -154,6 +154,7 @@ protected function getQuoteItemTotalsData(\Magento\Quote\Model\Quote $quote)
         $items = $quote->getAllItems();
         $item = array_shift($items);
         return [
+            ItemTotals::KEY_ITEM_ID => intval($item->getItemId()),
             ItemTotals::KEY_PRICE => intval($item->getPrice()),
             ItemTotals::KEY_BASE_PRICE => intval($item->getBasePrice()),
             ItemTotals::KEY_QTY => $item->getQty(),