MAGETWO-60572: [GitHub] PayPal.js error on checkout downloadable product #7000

Author: iivashchenko

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

@@ -67,6 +67,13 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
      */
     protected $checkoutMethod;
 
+    /**
+     * Shipping carrier and method.
+     *
+     * @var array
+     */
+    protected $shipping;
+
     /**
      * @param CheckoutOnepage $checkoutOnepage
      * @param AssertGrandTotalOrderReview $assertGrandTotalOrderReview
@@ -77,6 +84,8 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
      * @param string $checkoutMethod
      * @param array $products
      * @param array $prices
+     * @param array $shipping
+     *
      */
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
@@ -88,7 +97,9 @@ public function __construct(
         $checkoutMethod,
 
         array $products,
-        array $prices = []
+        array $prices = [],
+        array $shipping = []
+
     ) {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->assertGrandTotalOrderReview = $assertGrandTotalOrderReview;
@@ -99,6 +110,7 @@ public function __construct(
         $this->checkoutMethod = $checkoutMethod;
         $this->products = $products;
         $this->prices = $prices;
+        $this->shipping = $shipping;
     }
 
     /**
@@ -112,7 +124,9 @@ public function run()
 
         $this->assertBillingAddressAbsentInPayment->processAssert($this->checkoutOnepage);
 
-        if ($this->checkoutMethod === 'guest') {
+        if ($this->checkoutMethod === 'guest' &&
+            empty($this->shipping['shipping_method']) &&
+            empty($this->shipping['shipping_service'])) {
             $this->checkoutOnepage->getLoginBlock()->fillGuestFields($this->customer);
         }
 

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

@@ -10,23 +10,23 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertBillingAddressAbsentInShoppingCart
- * Assert billing address is not present in selected payment method
+ * Assert billing address is not present in selected payment method.
  */
 class AssertBillingAddressAbsentInPayment extends AbstractConstraint
 {
     /**
-     * Assert billing address is not present in selected payment method
+     * Assert billing address is not present in selected payment method.
      *
-     * @param CheckoutOnepage $checkoutOnepage,
+     * @param CheckoutOnepage $checkoutOnepage
      * @return void
      */
     public function processAssert(CheckoutOnepage $checkoutOnepage)
     {
         \PHPUnit_Framework_Assert::assertFalse(
             $checkoutOnepage->getPaymentBlock()
                 ->getSelectedPaymentMethodBlock()
-                ->getBillingBlock()->isVisible(),
+                ->getBillingBlock()
+                ->isVisible(),
             'Billing address is present in payment method'
         );
     }

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>