Merge branch 'MC-17337' of https://github.com/magento-mpi/magento2ce into MPI_PR_2019_06_21

Author: ArtemVasyliev

app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php

@@ -38,6 +38,14 @@ public function getErrorCodes($response): array
             $result[] = $error->code;
         }
 
+        if (isset($response->transaction) && $response->transaction->status === 'gateway_rejected') {
+            $result[] = $response->transaction->gatewayRejectionReason;
+        }
+
+        if (isset($response->transaction) && $response->transaction->status === 'processor_declined') {
+            $result[] = $response->transaction->processorResponseCode;
+        }
+
         return $result;
     }
 }

app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ErrorCodeProviderTest.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Test\Unit\Gateway\Validator;
+
+use Braintree\Result\Error;
+use Magento\Braintree\Gateway\Validator\ErrorCodeProvider;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class ErrorCodeProviderTest
+ */
+class ErrorCodeProviderTest extends TestCase
+{
+    /**
+     * @var ErrorCodeProvider
+     */
+    private $model;
+
+    /**
+     * Checks a extracting error codes from response.
+     *
+     * @param array $errors
+     * @param array $transaction
+     * @param array $expectedResult
+     * @return void
+     * @dataProvider getErrorCodeDataProvider
+     */
+    public function testGetErrorCodes(array $errors, array $transaction, array $expectedResult): void
+    {
+        $response = new Error(
+            [
+                'errors' => ['errors' => $errors],
+                'transaction' => $transaction,
+            ]
+        );
+        $this->model = new ErrorCodeProvider();
+        $actual = $this->model->getErrorCodes($response);
+
+        $this->assertSame($expectedResult, $actual);
+    }
+
+    /**
+     * Gets list of errors variations.
+     *
+     * @return array
+     */
+    public function getErrorCodeDataProvider(): array
+    {
+        return [
+            [
+                'errors' => [
+                    ['code' => 91734],
+                    ['code' => 91504]
+                ],
+                'transaction' => [
+                    'status' => 'success',
+                ],
+                'expectedResult' => ['91734', '91504']
+            ],
+            [
+                'errors' => [],
+                'transaction' => [
+                    'status' => 'processor_declined',
+                    'processorResponseCode' => '1000'
+                ],
+                'expectedResult' => ['1000']
+            ],
+            [
+                'errors' => [],
+                'transaction' => [
+                    'status' => 'processor_declined',
+                    'processorResponseCode' => '1000'
+                ],
+                'expectedResult' => ['1000']
+            ],
+            [
+                'errors' => [
+                    ['code' => 91734],
+                    ['code' => 91504]
+                ],
+                'transaction' => [
+                    'status' => 'processor_declined',
+                    'processorResponseCode' => '1000'
+                ],
+                'expectedResult' => ['91734', '91504', '1000']
+            ],
+        ];
+    }
+}

app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php

@@ -14,6 +14,9 @@
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
+/**
+ * Class GeneralResponseValidatorTest
+ */
 class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -61,11 +64,13 @@ public function testValidate(array $validationSubject, bool $isValid, $messages,
         $result = new Result($isValid, $messages);
 
         $this->resultInterfaceFactory->method('create')
-            ->with([
-                'isValid' => $isValid,
-                'failsDescription' => $messages,
-                'errorCodes' => $errorCodes
-            ])
+            ->with(
+                [
+                    'isValid' => $isValid,
+                    'failsDescription' => $messages,
+                    'errorCodes' => $errorCodes
+                ]
+            )
             ->willReturn($result);
 
         $actual = $this->responseValidator->validate($validationSubject);
@@ -82,9 +87,11 @@ public function dataProviderTestValidate()
     {
         $successTransaction = new \stdClass();
         $successTransaction->success = true;
+        $successTransaction->status = 'authorized';
 
         $failureTransaction = new \stdClass();
         $failureTransaction->success = false;
+        $failureTransaction->status = 'declined';
         $failureTransaction->message = 'Transaction was failed.';
 
         $errors = [
@@ -93,10 +100,10 @@ public function dataProviderTestValidate()
                     'code' => 81804,
                     'attribute' => 'base',
                     'message' => 'Cannot process transaction.'
-                ]
+                ],
             ]
         ];
-        $errorTransaction = new Error(['errors' => $errors]);
+        $errorTransaction = new Error(['errors' => $errors, 'transaction' => ['status' => 'declined']]);
 
         return [
             [

app/code/Magento/Braintree/etc/braintree_error_mapping.xml

@@ -20,6 +20,7 @@
         <message code="81716" translate="true">Credit card number must be 12-19 digits.</message>
         <message code="81723" translate="true">Cardholder name is too long.</message>
         <message code="81736" translate="true">CVV verification failed.</message>
+        <message code="cvv" translate="true">CVV verification failed.</message>
         <message code="81737" translate="true">Postal code verification failed.</message>
         <message code="81750" translate="true">Credit card number is prohibited.</message>
         <message code="81801" translate="true">Addresses must have at least one field filled in.</message>

dev/tests/integration/testsuite/Magento/Checkout/Api/PaymentInformationManagementTest.php

@@ -96,7 +96,7 @@ public function testSavePaymentInformationAndPlaceOrderWithErrors(
             array_push($errors['errors'], ['code' => $testErrorCode]);
         }
 
-        $response = new Error(['errors' => $errors]);
+        $response = new Error(['errors' => $errors, 'transaction' => ['status' => 'declined']]);
 
         $this->client->method('placeRequest')
             ->willReturn(['object' => $response]);