MAGETWO-53238: Vault Provider field contains Payflow Pro option in countries which don't have such solution

 - Fixed failed unit tests

Author: YevSent

app/code/Magento/Braintree/Test/Unit/Block/FormTest.php

@@ -11,14 +11,13 @@
 use Magento\Braintree\Model\Adminhtml\Source\CcType;
 use Magento\Braintree\Model\Ui\ConfigProvider;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Payment\Helper\Data;
 use Magento\Payment\Model\Config;
-use Magento\Vault\Model\Ui\VaultConfigProvider;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Model\VaultPaymentInterface;
 use OAuthTest\Mocks\Common\Service\Mock;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Payment\Helper\Data;
 
 /**
  * Class FormTest

app/code/Magento/Vault/Model/Ui/TokensConfigProvider.php

@@ -23,11 +23,6 @@ final class TokensConfigProvider implements ConfigProviderInterface
      */
     private static $vaultCode = 'vault';
 
-    /**
-     * @var VaultPaymentInterface
-     */
-    private $vaultPayment;
-
     /**
      * @var StoreManagerInterface
      */
@@ -52,17 +47,14 @@ final class TokensConfigProvider implements ConfigProviderInterface
      * Constructor
      *
      * @param StoreManagerInterface $storeManager
-     * @param VaultPaymentInterface $vaultPayment
      * @param CustomerTokenManagement $customerTokenManagement
      * @param TokenUiComponentProviderInterface[] $tokenUiComponentProviders
      */
     public function __construct(
         StoreManagerInterface $storeManager,
-        VaultPaymentInterface $vaultPayment,
         CustomerTokenManagement $customerTokenManagement,
         array $tokenUiComponentProviders = []
     ) {
-        $this->vaultPayment = $vaultPayment;
         $this->storeManager = $storeManager;
         $this->tokenUiComponentProviders = $tokenUiComponentProviders;
         $this->customerTokenManagement = $customerTokenManagement;

app/code/Magento/Vault/Test/Unit/Model/CustomerTokenManagementTest.php

@@ -6,39 +6,22 @@
 namespace Magento\Vault\Test\Unit\Model;
 
 use Magento\Customer\Model\Session;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Model\CustomerTokenManagement;
 use Magento\Vault\Model\PaymentTokenManagement;
-use Magento\Vault\Model\VaultPaymentInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class CustomerTokenManagementTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var PaymentTokenManagement|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentTokenManagement|MockObject
      */
-    private $paymentTokenManagementMock;
+    private $paymentTokenManagement;
 
     /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    private $customerSessionMock;
-
-    /**
-     * @var VaultPaymentInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $vaultPayment;
-
-    /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $storeManager;
-
-    /**
-     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $store;
+    private $customerSession;
 
     /**
      * @var CustomerTokenManagement
@@ -47,57 +30,38 @@ class CustomerTokenManagementTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->paymentTokenManagementMock = $this->getMockBuilder(PaymentTokenManagement::class)
+        $this->paymentTokenManagement = $this->getMockBuilder(PaymentTokenManagement::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->customerSessionMock = $this->getMockBuilder(Session::class)
+        $this->customerSession = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->vaultPayment = $this->getMock(VaultPaymentInterface::class);
-        $this->storeManager = $this->getMock(StoreManagerInterface::class);
-        $this->store = $this->getMock(StoreInterface::class);
 
         $this->tokenManagement = new CustomerTokenManagement(
-            $this->vaultPayment,
-            $this->paymentTokenManagementMock,
-            $this->customerSessionMock,
-            $this->storeManager
+            $this->paymentTokenManagement,
+            $this->customerSession
         );
     }
 
     public function testGetCustomerSessionTokensNonRegisteredCustomer()
     {
-        $this->customerSessionMock->expects(self::once())
+        $this->customerSession->expects(self::once())
             ->method('getCustomerId')
             ->willReturn(null);
 
-        $this->paymentTokenManagementMock->expects(static::never())
+        $this->paymentTokenManagement->expects(static::never())
             ->method('getVisibleAvailableTokens');
 
         $this->tokenManagement->getCustomerSessionTokens();
     }
 
-    public function testGetCustomerSessionTokensNoActiveVaultProvider()
+    public function testGetCustomerSessionTokensForNotExistsCustomer()
     {
-        $customerId = 1;
-        $storeId = 1;
-        $this->customerSessionMock->expects(self::once())
+        $this->customerSession->expects(static::once())
             ->method('getCustomerId')
-            ->willReturn($customerId);
+            ->willReturn(null);
 
-        $this->storeManager->expects(static::once())
-            ->method('getStore')
-            ->with(null)
-            ->willReturn($this->store);
-        $this->store->expects(static::once())
-            ->method('getId')
-            ->willReturn($storeId);
-        $this->vaultPayment->expects(static::once())
-            ->method('isActive')
-            ->with($storeId)
-            ->willReturn(false);
-
-        $this->paymentTokenManagementMock->expects(static::never())
+        $this->paymentTokenManagement->expects(static::never())
             ->method('getVisibleAvailableTokens');
 
         $this->tokenManagement->getCustomerSessionTokens();
@@ -106,34 +70,16 @@ public function testGetCustomerSessionTokensNoActiveVaultProvider()
     public function testGetCustomerSessionTokens()
     {
         $customerId = 1;
-        $providerCode = 'vault_provider';
-        $storeId = 1;
         $token = $this->getMock(PaymentTokenInterface::class);
         $expectation = [$token];
 
-        $this->customerSessionMock->expects(self::once())
+        $this->customerSession->expects(static::once())
             ->method('getCustomerId')
             ->willReturn($customerId);
 
-        $this->storeManager->expects(static::once())
-            ->method('getStore')
-            ->with(null)
-            ->willReturn($this->store);
-        $this->store->expects(static::once())
-            ->method('getId')
-            ->willReturn($storeId);
-        $this->vaultPayment->expects(static::once())
-            ->method('isActive')
-            ->with($storeId)
-            ->willReturn(true);
-        $this->vaultPayment->expects(static::once())
-            ->method('getProviderCode')
-            ->with($storeId)
-            ->willReturn($providerCode);
-
-        $this->paymentTokenManagementMock->expects(static::once())
+        $this->paymentTokenManagement->expects(static::once())
             ->method('getVisibleAvailableTokens')
-            ->with($customerId, $providerCode)
+            ->with($customerId)
             ->willReturn($expectation);
 
         static::assertEquals(