AC-2901:AC-2901:Vault/Stored Payment Methods are not saved per store

Author: faizan-shk

app/code/Magento/Vault/Api/Data/PaymentTokenInterface.php

@@ -59,7 +59,7 @@ interface PaymentTokenInterface
     /*
      * Is vault payment token visible.
      */
-    const IS_VISIBLE = 'is_visible';
+    public const IS_VISIBLE = 'is_visible';
 
     /*
      * Vault website id

app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php

@@ -22,6 +22,7 @@
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface;
@@ -77,6 +78,11 @@ class TokensConfigProviderTest extends TestCase
      */
     private $storeManager;
 
+    /**
+     * @var WebsiteInterface|MockObject
+     */
+    private $websiteMock;
+
     /**
      * @var StoreInterface|MockObject
      */
@@ -134,7 +140,7 @@ protected function setUp(): void
             ->getMock();
         $this->session = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getCustomerId', 'getReordered', 'getStoreId'])
+            ->setMethods(['getCustomerId', 'getReordered', 'getStoreId','getQuote'])
             ->getMock();
         $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
             ->disableOriginalConstructor()
@@ -217,6 +223,19 @@ public function testGetTokensComponentsRegisteredCustomer()
             ->method('getProviderCode')
             ->willReturn(self::VAULT_PROVIDER_CODE);
 
+        $this->websiteMock = $this->getMockForAbstractClass(WebsiteInterface::class);
+        $this->storeManager->expects(static::once())
+            ->method('getWebsite')
+            ->willReturn($this->websiteMock);
+
+        $this->websiteMock->expects(static::once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $this->session->expects(static::once())
+            ->method('getQuote')
+            ->willReturn(null);
+
         /** @var PaymentTokenInterface|MockObject $token */
         $token = $this->getMockBuilder(PaymentTokenInterface::class)
             ->getMockForAbstractClass();
@@ -281,6 +300,14 @@ public function testGetTokensComponentsGuestCustomer()
         $this->vaultPayment->expects(static::once())
             ->method('getProviderCode')
             ->willReturn(self::VAULT_PROVIDER_CODE);
+        $this->websiteMock = $this->getMockForAbstractClass(WebsiteInterface::class);
+        $this->storeManager->expects(static::once())
+            ->method('getWebsite')
+            ->willReturn($this->websiteMock);
+
+        $this->websiteMock->expects(static::once())
+            ->method('getId')
+            ->willReturn(1);
 
         /** @var PaymentTokenInterface|MockObject $token */
         $token = $this->getMockBuilder(PaymentTokenInterface::class)
@@ -595,13 +622,14 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
         );
 
         $isVisibleFilter = $this->createExpectedFilter(PaymentTokenInterface::IS_VISIBLE, 1, 4);
+        $websiteFilter = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, 1, 5);
 
         $this->filterBuilder->expects(static::once())
             ->method('setConditionType')
             ->with('gt')
             ->willReturnSelf();
 
-        $this->searchCriteriaBuilder->expects(self::exactly(5))
+        $this->searchCriteriaBuilder->expects(self::exactly(6))
             ->method('addFilters')
             ->willReturnMap(
                 [
@@ -610,6 +638,7 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
                     [$expiresAtFilter, $this->searchCriteriaBuilder],
                     [$isActiveFilter, $this->searchCriteriaBuilder],
                     [$isVisibleFilter, $this->searchCriteriaBuilder],
+                    [$websiteFilter, $this->searchCriteriaBuilder],
                 ]
             );