Merge remote-tracking branch 'origin/MAGETWO-72466' into 2.1-develop-pr33

Author: zakdma

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -296,7 +296,7 @@ define([
         getShippingAddress: function () {
             var address = quote.shippingAddress();
 
-            if (address.postcode === null) {
+            if (_.isNull(address.postcode) || _.isUndefined(address.postcode)) {
 
                 return {};
             }

dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.xml

@@ -50,5 +50,21 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
         </variation>
+        <variation name="OnePageCheckoutWithBraintreePaypalTestVariation3" summary="Guest Checkout virtual quote with Braintree PayPal from Cart" ticketId="MAGETWO-80083">
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
+            <data name="products/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="checkoutMethod" xsi:type="string">guest</data>
+            <data name="prices" xsi:type="array">
+                <item name="grandTotal" xsi:type="string">50.00</item>
+            </data>
+            <data name="payment/method" xsi:type="string">braintree_paypal</data>
+            <data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
+            <data name="status" xsi:type="string">Processing</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
+        </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php

@@ -6,6 +6,7 @@
 namespace Magento\Braintree\Test\TestStep;
 
 use Magento\Checkout\Test\Constraint\AssertGrandTotalOrderReview;
+use Magento\Checkout\Test\Constraint\AssertBillingAddressAbsentInPayment;
 use Magento\Checkout\Test\Page\CheckoutOnepage;
 use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
 use Magento\Mtf\Fixture\FixtureFactory;
@@ -26,6 +27,11 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
      */
     private $assertGrandTotalOrderReview;
 
+    /**
+     * @var AssertBillingAddressAbsentInPayment
+     */
+    private $assertBillingAddressAbsentInPayment;
+
     /**
      * @var CheckoutOnepageSuccess
      */
@@ -49,6 +55,7 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
     /**
      * @param CheckoutOnepage $checkoutOnepage
      * @param AssertGrandTotalOrderReview $assertGrandTotalOrderReview
+     * @param AssertBillingAddressAbsentInPayment $assertBillingAddressAbsentInPayment
      * @param CheckoutOnepageSuccess $checkoutOnepageSuccess
      * @param FixtureFactory $fixtureFactory
      * @param array $products
@@ -57,13 +64,15 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
         AssertGrandTotalOrderReview $assertGrandTotalOrderReview,
+        AssertBillingAddressAbsentInPayment $assertBillingAddressAbsentInPayment,
         CheckoutOnepageSuccess $checkoutOnepageSuccess,
         FixtureFactory $fixtureFactory,
         array $products,
         array $prices = []
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->assertGrandTotalOrderReview = $assertGrandTotalOrderReview;
+        $this->assertBillingAddressAbsentInPayment = $assertBillingAddressAbsentInPayment;
         $this->checkoutOnepageSuccess = $checkoutOnepageSuccess;
         $this->fixtureFactory = $fixtureFactory;
         $this->products = $products;
@@ -78,6 +87,9 @@ public function run()
         if (isset($this->prices['grandTotal'])) {
             $this->assertGrandTotalOrderReview->processAssert($this->checkoutOnepage, $this->prices['grandTotal']);
         }
+
+        $this->assertBillingAddressAbsentInPayment->processAssert($this->checkoutOnepage);
+
         $parentWindow = $this->checkoutOnepage->getPaymentBlock()
             ->getSelectedPaymentMethodBlock()
             ->clickPayWithPaypal();

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php

@@ -49,6 +49,13 @@ class Login extends Form
      */
     protected $loadingMask = '.loading-mask';
 
+    /**
+     * Selector for checkout email input.
+     *
+     * @var string
+     */
+    private $emailSelector = '[name="username"]';
+
     /**
      * Select how to perform checkout whether guest or registered customer.
      *
@@ -90,6 +97,18 @@ public function loginCustomer(FixtureInterface $customer)
         $this->waitForElementNotVisible($this->loadingMask);
     }
 
+    /**
+     * Fill required fields for guest checkout.
+     *
+     * @param FixtureInterface $customer
+     * @return void
+     */
+    public function fillGuestFields(FixtureInterface $customer)
+    {
+        $this->_rootElement->find($this->emailSelector)
+            ->setValue($customer->getEmail());
+    }
+
     /**
      * Click continue on checkout method block.
      *

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressAbsentInPayment.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert billing address is not present in selected payment method.
+ */
+class AssertBillingAddressAbsentInPayment extends AbstractConstraint
+{
+    /**
+     * Assert billing address is not present in selected payment method.
+     *
+     * @param CheckoutOnepage $checkoutOnepage
+     * @return void
+     */
+    public function processAssert(CheckoutOnepage $checkoutOnepage)
+    {
+        \PHPUnit_Framework_Assert::assertFalse(
+            $checkoutOnepage->getPaymentBlock()
+                ->getSelectedPaymentMethodBlock()
+                ->getBillingBlock()
+                ->isVisible(),
+            'Billing address is present in payment method'
+        );
+    }
+
+    /**
+     * Returns string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Billing address is absent in payment method';
+    }
+}

dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php

@@ -44,23 +44,33 @@ class SelectCheckoutMethodStep implements TestStepInterface
      */
     protected $logoutCustomerOnFrontend;
 
+    /**
+     * Shipping carrier and method.
+     *
+     * @var array
+     */
+    private $shipping;
+
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
      * @param Customer $customer
      * @param LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend
      * @param string $checkoutMethod
+     * @param array $shipping
      */
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
         Customer $customer,
         LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend,
-        $checkoutMethod
+        $checkoutMethod,
+        array $shipping = []
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->customer = $customer;
         $this->logoutCustomerOnFrontend = $logoutCustomerOnFrontend;
         $this->checkoutMethod = $checkoutMethod;
+        $this->shipping = $shipping;
     }
 
     /**
@@ -72,6 +82,8 @@ public function run()
     {
         if ($this->checkoutMethod === 'login') {
             $this->checkoutOnepage->getLoginBlock()->loginCustomer($this->customer);
+        } elseif (($this->checkoutMethod === 'guest') && empty($this->shipping)) {
+            $this->checkoutOnepage->getLoginBlock()->fillGuestFields($this->customer);
         }
     }
 

dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml

@@ -11,4 +11,9 @@
       <argument name="severity" xsi:type="string">middle</argument>
     </arguments>
   </type>
+  <type name="Magento\Checkout\Test\Constraint\AssertBillingAddressAbsentInPayment">
+    <arguments>
+      <argument name="severity" xsi:type="string">S2</argument>
+    </arguments>
+  </type>
 </config>