Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-54942

Elena Marchenko · Elena Marchenko · commit 38f1afa0cdd7 · 2016-10-07T19:01:34.000+03:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
@@ -141,7 +141,7 @@ public function testBuild()
                 [$tableName],
                 ['catalog_product_website']
             )
-            ->willReturn(
+            ->willReturnOnConsecutiveCalls(
                 $tableName,
                 'catalog_product_website'
             );
@@ -184,12 +184,12 @@ public function testBuild()
                 ],
                 [
                     $temporaryTableName,
-                    "e.{$linkField} = ${temporaryTableName}.{$linkField}",
+                    "e.{$linkField} = {$temporaryTableName}.{$linkField}",
                     [$linkField]
                 ],
                 [
                     $temporaryValueTableName,
-                    "e.${linkField} = " . $temporaryValueTableName . ".${linkField}",
+                    "e.{$linkField} = " . $temporaryValueTableName . ".{$linkField}",
                     [$linkField]
                 ]
             )->willReturnSelf();
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/testcase.xml
@@ -13,7 +13,8 @@
     <step name="createProducts" module="Magento_Catalog" next="addProducts"/>
     <step name="addProducts" module="Magento_Sales" next="updateProductsData"/>
     <step name="updateProductsData" module="Magento_Sales" next="fillBillingAddress"/>
-    <step name="fillBillingAddress" module="Magento_Sales" next="selectPaymentMethodForOrder"/>
+    <step name="fillBillingAddress" module="Magento_Sales" next="fillShippingAddress"/>
+    <step name="fillShippingAddress" module="Magento_Sales" next="selectPaymentMethodForOrder"/>
     <step name="selectPaymentMethodForOrder" module="Magento_Sales" next="selectShippingMethodForOrder"/>
     <step name="selectShippingMethodForOrder" module="Magento_Sales" next="submitOrder"/>
     <step name="submitOrder" module="Magento_Sales"/>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/etc/testcase.xml
@@ -79,7 +79,8 @@
         <step name="selectStore" module="Magento_Sales" next="addProducts" />
         <step name="addProducts" module="Magento_Sales" next="fillAccountInformation" />
         <step name="fillAccountInformation" module="Magento_Sales" next="fillBillingAddress" />
-        <step name="fillBillingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
+        <step name="fillBillingAddress" module="Magento_Sales" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="saveCreditCardOnBackend" />
         <step name="saveCreditCardOnBackend" module="Magento_Vault" next="submitOrderNegative" />
         <step name="submitOrderNegative" module="Magento_Sales" />
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -291,29 +291,28 @@ public function fillBillingAddress(
         $saveAddress = 'No',
         $setShippingAddress = true
     ) {
-        if ($setShippingAddress) {
+        if ($setShippingAddress !== false) {
             $this->getShippingAddressBlock()->uncheckSameAsBillingShippingAddress();
         }
         $this->getBillingAddressBlock()->fill($billingAddress);
         $this->getBillingAddressBlock()->saveInAddressBookBillingAddress($saveAddress);
         $this->getTemplateBlock()->waitLoader();
+        if ($setShippingAddress) {
+            $this->getShippingAddressBlock()->setSameAsBillingShippingAddress();
+            $this->getTemplateBlock()->waitLoader();
+        }
     }
 
     /**
      * Fill Shipping Address.
      *
-     * @param FixtureInterface $shippingAddress [optional]
+     * @param FixtureInterface $shippingAddress
      * @return void
      */
-    public function fillShippingAddress(FixtureInterface $shippingAddress = null)
+    public function fillShippingAddress(FixtureInterface $shippingAddress)
     {
-        if (!$shippingAddress) {
-            $this->getShippingAddressBlock()->setSameAsBillingShippingAddress();
-            $this->getTemplateBlock()->waitLoader();
-        } else {
-            $this->getShippingAddressBlock()->fill($shippingAddress);
-            $this->getTemplateBlock()->waitLoader();
-        }
+        $this->getShippingAddressBlock()->fill($shippingAddress);
+        $this->getTemplateBlock()->waitLoader();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php
@@ -29,6 +29,13 @@ class FillBillingAddressStep implements TestStepInterface
      */
     protected $billingAddress;
 
+    /**
+     * Shipping Address fixture.
+     *
+     * @var Address
+     */
+    protected $shippingAddress;
+
     /**
      * Save Address.
      *
@@ -46,17 +53,20 @@ class FillBillingAddressStep implements TestStepInterface
     /**
      * @param OrderCreateIndex $orderCreateIndex
      * @param Address $billingAddress
-     * @param string $saveAddress
+     * @param Address $shippingAddress [optional]
+     * @param string $saveAddress [optional]
      * @param bool $setShippingAddress [optional]
      */
     public function __construct(
         OrderCreateIndex $orderCreateIndex,
         Address $billingAddress,
+        Address $shippingAddress = null,
         $saveAddress = 'No',
         $setShippingAddress = true
     ) {
         $this->orderCreateIndex = $orderCreateIndex;
         $this->billingAddress = $billingAddress;
+        $this->shippingAddress = $shippingAddress;
         $this->saveAddress = $saveAddress;
         $this->setShippingAddress = $setShippingAddress;
     }
@@ -68,6 +78,9 @@ public function __construct(
      */
     public function run()
     {
+        if ($this->shippingAddress !== null) {
+            $this->setShippingAddress = null;
+        }
         $this->orderCreateIndex->getCreateBlock()
             ->fillBillingAddress($this->billingAddress, $this->saveAddress, $this->setShippingAddress);
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillShippingAddressStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillShippingAddressStep.php
@@ -48,6 +48,8 @@ public function __construct(
      */
     public function run()
     {
-        $this->orderCreateIndex->getCreateBlock()->fillShippingAddress($this->shippingAddress);
+        if ($this->shippingAddress !== null) {
+            $this->orderCreateIndex->getCreateBlock()->fillShippingAddress($this->shippingAddress);
+        }
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml
@@ -11,7 +11,8 @@
         <step name="createOrder" module="Magento_Sales" next="openOrder" />
         <step name="openOrder" module="Magento_Sales" next="reorder" />
         <step name="reorder" module="Magento_Sales" next="fillBillingAddress" />
-        <step name="fillBillingAddress" module="Magento_Sales" next="selectPaymentMethodForOrder" />
+        <step name="fillBillingAddress" module="Magento_Sales" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Sales" next="selectPaymentMethodForOrder" />
         <step name="selectPaymentMethodForOrder" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="submitOrder" />
         <step name="submitOrder" module="Magento_Sales" />
@@ -42,7 +43,8 @@
         <step name="selectCustomerOrder" module="Magento_Sales" next="selectStore" />
         <step name="selectStore" module="Magento_Sales" next="addProducts" />
         <step name="addProducts" module="Magento_Sales" next="fillBillingAddress" />
-        <step name="fillBillingAddress" module="Magento_Sales" next="selectPaymentMethodForOrder" />
+        <step name="fillBillingAddress" module="Magento_Sales" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Sales" next="selectPaymentMethodForOrder" />
         <step name="selectPaymentMethodForOrder" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="submitOrder" />
         <step name="submitOrder" module="Magento_Sales" next="openSalesOrderOnFrontendForGuest" />
@@ -61,7 +63,8 @@
         <step name="addProducts" module="Magento_Sales" next="updateProductsData" />
         <step name="updateProductsData" module="Magento_Sales" next="fillAccountInformation" />
         <step name="fillAccountInformation" module="Magento_Sales" next="fillBillingAddress" />
-        <step name="fillBillingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
+        <step name="fillBillingAddress" module="Magento_Sales" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="selectPaymentMethodForOrder" />
         <step name="selectPaymentMethodForOrder" module="Magento_Sales" next="submitOrder" />
         <step name="submitOrder" module="Magento_Sales" next="createInvoice" />
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Vault/Test/etc/testcase.xml
@@ -37,7 +37,8 @@
         <step name="selectStore" module="Magento_Sales" next="addProducts" />
         <step name="addProducts" module="Magento_Sales" next="fillAccountInformation" />
         <step name="fillAccountInformation" module="Magento_Sales" next="fillBillingAddress" />
-        <step name="fillBillingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
+        <step name="fillBillingAddress" module="Magento_Sales" next="fillShippingAddress" />
+        <step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
         <step name="selectShippingMethodForOrder" module="Magento_Sales" next="saveCreditCardOnBackend" />
         <step name="saveCreditCardOnBackend" module="Magento_Vault" next="submitOrder" />
         <step name="submitOrder" module="Magento_Sales" next="reorder" />

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function testBuild()`
`141`	`141`	`[$tableName],`
`142`	`142`	`['catalog_product_website']`
`143`	`143`	`)`
`144`		`- ->willReturn(`
	`144`	`+ ->willReturnOnConsecutiveCalls(`
`145`	`145`	`$tableName,`
`146`	`146`	`'catalog_product_website'`
`147`	`147`	`);`
`@@ -184,12 +184,12 @@ public function testBuild()`
`184`	`184`	`],`
`185`	`185`	`[`
`186`	`186`	`$temporaryTableName,`
`187`		`- "e.{$linkField} = ${temporaryTableName}.{$linkField}",`
	`187`	`+ "e.{$linkField} = {$temporaryTableName}.{$linkField}",`
`188`	`188`	`[$linkField]`
`189`	`189`	`],`
`190`	`190`	`[`
`191`	`191`	`$temporaryValueTableName,`
`192`		`- "e.${linkField} = " . $temporaryValueTableName . ".${linkField}",`
	`192`	`+ "e.{$linkField} = " . $temporaryValueTableName . ".{$linkField}",`
`193`	`193`	`[$linkField]`
`194`	`194`	`]`
`195`	`195`	`)->willReturnSelf();`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ public function __construct(`
`48`	`48`	`*/`
`49`	`49`	`public function run()`
`50`	`50`	`{`
`51`		`- $this->orderCreateIndex->getCreateBlock()->fillShippingAddress($this->shippingAddress);`
	`51`	`+ if ($this->shippingAddress !== null) {`
	`52`	`+ $this->orderCreateIndex->getCreateBlock()->fillShippingAddress($this->shippingAddress);`
	`53`	`+ }`
`52`	`54`	`}`
`53`	`55`	`}`