Merge pull request #1487 from magento-engcom/develop-prs

[EngCom] Public Pull Requests - MAGETWO-72486: response condition order changes. #10826 - MAGETWO-72465: Enable livereload for watch: commands #10836 - MAGETWO-72428: Close PayPal popup window in case of rejected request #10820
magento · Sep 13, 2017 · 53072e0 · 53072e0
2 parents 3797563 + b7ad7b2
commit 53072e0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/app/code/Magento/Customer/view/frontend/web/js/action/login.js b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
@@ -38,10 +38,10 @@ define([
                     });
                     customerData.invalidate(['customer']);
 
-                    if (redirectUrl) {
-                        window.location.href = redirectUrl;
-                    } else if (response.redirectUrl) {
+                    if (response.redirectUrl) {
                         window.location.href = response.redirectUrl;
+                    } else if (redirectUrl) {
+                        window.location.href = redirectUrl;
                     } else {
                         location.reload();
                     }

diff --git a/...o/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/...o/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -78,7 +78,9 @@ define(
                                     $('body').trigger('processStop');
                                     customerData.invalidate(['cart']);
                                 });
-                            }.bind(this));
+                            }.bind(this)).fail(function () {
+                                paypalExpressCheckout.checkout.closeFlow();
+                            });
                         }
                     }
                 }

diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
@@ -14,8 +14,6 @@
         >
     <testsuite name="Magento Unit Tests">
         <directory suffix="Test.php">../../../app/code/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../dev/tools/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../dev/tools/*/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../lib/internal/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../lib/internal/*/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../setup/src/*/*/Test/Unit</directory>

diff --git a/dev/tools/grunt/configs/watch.js b/dev/tools/grunt/configs/watch.js
@@ -13,6 +13,9 @@ var themeOptions = {};
 
 _.each(themes, function(theme, name) {
     themeOptions[name] = {
+        'options': {
+            livereload: true
+        },
         'files': [
             '<%= combo.autopath(\''+name+'\', path.pub) %>/**/*.less'
         ],