Merge remote-tracking branch 'origin/MAGETWO-86690' into 2.3-develop-pr9

Author: svitja

app/code/Magento/Vault/Model/CustomerTokenManagement.php

@@ -40,11 +40,9 @@ public function __construct(
      */
     public function getCustomerSessionTokens()
     {
-        $vaultPayments = [];
-
         $customerId = $this->session->getCustomerId();
-        if (!$customerId) {
-            return $vaultPayments;
+        if (!$customerId || $this->session->isLoggedIn() === false) {
+            return [];
         }
 
         return $this->tokenManagement->getVisibleAvailableTokens($customerId);

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

@@ -43,28 +43,30 @@ protected function setUp()
         );
     }
 
-    public function testGetCustomerSessionTokensNonRegisteredCustomer()
+    /**
+     * @param int|null $customerId
+     * @param bool $isLoggedCustomer
+     * @return void
+     * @dataProvider getCustomerSessionTokensNegativeDataProvider
+     */
+    public function testGetCustomerSessionTokensNegative($customerId, bool $isLoggedCustomer)
     {
-        $this->customerSession->expects(self::once())
-            ->method('getCustomerId')
-            ->willReturn(null);
+        $this->customerSession->method('getCustomerId')->willReturn($customerId);
+        $this->customerSession->method('isLoggedIn')->willReturn($isLoggedCustomer);
+        $this->paymentTokenManagement->expects(static::never())->method('getVisibleAvailableTokens');
 
-        $this->paymentTokenManagement->expects(static::never())
-            ->method('getVisibleAvailableTokens');
-
-        $this->tokenManagement->getCustomerSessionTokens();
+        static::assertEquals([], $this->tokenManagement->getCustomerSessionTokens());
     }
 
-    public function testGetCustomerSessionTokensForNotExistsCustomer()
+    /**
+     * @return array
+     */
+    public function getCustomerSessionTokensNegativeDataProvider()
     {
-        $this->customerSession->expects(static::once())
-            ->method('getCustomerId')
-            ->willReturn(null);
-
-        $this->paymentTokenManagement->expects(static::never())
-            ->method('getVisibleAvailableTokens');
-
-        $this->tokenManagement->getCustomerSessionTokens();
+        return [
+            'not registered customer' => [null, false],
+            'not logged in customer' => [1, false],
+        ];
     }
 
     public function testGetCustomerSessionTokens()
@@ -77,6 +79,10 @@ public function testGetCustomerSessionTokens()
             ->method('getCustomerId')
             ->willReturn($customerId);
 
+        $this->customerSession->expects(static::once())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+
         $this->paymentTokenManagement->expects(static::once())
             ->method('getVisibleAvailableTokens')
             ->with($customerId)