Skip to content

Commit 1a968e0

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento/graphql-ce#127: Fixed return value for getGraphQlClient in API-functional tests (by @rogyar) - #17572: [Forwardport] Catalog: Add unit tests for Cron classes (by @jignesh-baldha) - #17573: [Forwardport] updating lib LESS docs (by @jignesh-baldha) - #17571: [Forwardport] Refactor: remove some code duplication (by @arnoudhgz) - #17562: Fix wrong return type in StockRegistryInterface API (by @vasilii-b) - #17502: [Forwardport] Doesn't work if use date as condition for Catalog Price Rules (by @mage2pratik) - #17551: [Forwardport] Fix possible undefined index when caching config data (by @mage2pratik) - #17554: [Forwardport] Fix #10687 - Product image roles disappearing (by @eduard13) - #16784: [Forwardport] Fix the issue with "Shipping address is not set" exception (by @dmytro-ch) - #17499: [Forwardport] Braintree: test coverage (by @ronak2ram) - #17610: [Forwardport] Link logo in web setup wizard to back-end base URL (by @arnoudhgz) - #17604: [Forwardport] Fix for #15041 Adding a new fieldset to the admin category editor changes the position of the 'General' fieldset (by @jignesh-baldha) - #17603: [Forwardport] Braintree: Add unit test for CreditCard/TokenFormatter (by @jignesh-baldha) - #17596: Typo in Magento\Cms\Model\Wysiwyg\Images\Storage function resizeFile() (by @eduard13) Fixed GitHub Issues: - #15085: StockRegistryInterface :: getLowStockItems() returns StockStatusCollection instead of StockItemCollection (reported by @jesse-dev) has been fixed in #17562 by @vasilii-b in 2.3-develop branch Related commits: 1. 897e7df - #10687: Product image roles randomly disappear (reported by @boxyman) has been fixed in #17554 by @eduard13 in 2.3-develop branch Related commits: 1. 1c74f55 - #16555: "Shipping address is not set" exception in Multishipping Checkout. (reported by @p-bystritsky) has been fixed in #16784 by @dmytro-ch in 2.3-develop branch Related commits: 1. ab1324e 2. 7187c2e 3. 9868428 4. 2c546c4 - #13948: Sidebar shortcut to admin dashboard (Magento logo on top left) has no link in web setup wizard (reported by @doctormess) has been fixed in #17610 by @arnoudhgz in 2.3-develop branch Related commits: 1. 43bbdb5 - #15041: Adding a new fieldset to the admin category editor changes the position of the 'General' fieldset. (reported by @leoquijano) has been fixed in #17604 by @jignesh-baldha in 2.3-develop branch Related commits: 1. b6df8e7 - #17587: Typo in Magento\Cms\Model\Wysiwyg\Images\Storage function resizeFile($source, $keepRation = true) (reported by @simonworkhouse) has been fixed in #17596 by @eduard13 in 2.3-develop branch Related commits: 1. 9a5bfd3
2 parents 03ab0fd + 02e4bf3 commit 1a968e0

File tree

46 files changed

+755
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+755
-130
lines changed

‎app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/AvailabilityCheckerTest.php

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Braintree\Test\Unit\Model\InstantPurchase\CreditCard;
9+
10+
use Magento\Braintree\Gateway\Config\Config;
11+
use Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker;
12+
13+
/**
14+
* @covers \Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker
15+
*/
16+
class AvailabilityCheckerTest extends \PHPUnit\Framework\TestCase
17+
{
18+
/**
19+
* Testable Object
20+
*
21+
* @var AvailabilityChecker
22+
*/
23+
private $availabilityChecker;
24+
25+
/**
26+
* @var Config|\PHPUnit_Framework_MockObject_MockObject
27+
*/
28+
private $configMock;
29+
30+
/**
31+
* Set Up
32+
*
33+
* @return void
34+
*/
35+
protected function setUp()
36+
{
37+
$this->configMock = $this->createMock(Config::class);
38+
$this->availabilityChecker = new AvailabilityChecker($this->configMock);
39+
}
40+
41+
/**
42+
* Test isAvailable method
43+
*
44+
* @dataProvider isAvailableDataProvider
45+
*
46+
* @param bool $isVerify3DSecure
47+
* @param bool $expected
48+
*
49+
* @return void
50+
*/
51+
public function testIsAvailable(bool $isVerify3DSecure, bool $expected)
52+
{
53+
$this->configMock->expects($this->once())->method('isVerify3DSecure')->willReturn($isVerify3DSecure);
54+
$actual = $this->availabilityChecker->isAvailable();
55+
self::assertEquals($expected, $actual);
56+
}
57+
58+
/**
59+
* Data provider for isAvailable method test
60+
*
61+
* @return array
62+
*/
63+
public function isAvailableDataProvider()
64+
{
65+
return [
66+
[true, false],
67+
[false, true],
68+
];
69+
}
70+
}

‎app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/CreditCard/TokenFormatterTest.php

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Braintree\Test\Unit\Model\InstantPurchase\CreditCard;
9+
10+
use Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter as CreditCardTokenFormatter;
11+
use Magento\Vault\Api\Data\PaymentTokenInterface;
12+
use PHPUnit\Framework\TestCase;
13+
use PHPUnit_Framework_MockObject_MockObject;
14+
15+
class TokenFormatterTest extends TestCase
16+
{
17+
/**
18+
* @var PaymentTokenInterface|PHPUnit_Framework_MockObject_MockObject
19+
*/
20+
private $paymentTokenMock;
21+
22+
/**
23+
* @var CreditCardTokenFormatter
24+
*/
25+
private $creditCardTokenFormatter;
26+
27+
/**
28+
* @var array
29+
*/
30+
private $tokenDetails = [
31+
'type' => 'visa',
32+
'maskedCC' => '1111************9999',
33+
'expirationDate' => '01-01-2020'
34+
];
35+
36+
/**
37+
* Set Up
38+
*
39+
* @return void
40+
*/
41+
protected function setUp()
42+
{
43+
$this->paymentTokenMock = $this->getMockBuilder(PaymentTokenInterface::class)
44+
->getMockForAbstractClass();
45+
46+
$this->creditCardTokenFormatter = new CreditCardTokenFormatter();
47+
}
48+
49+
/**
50+
* Testing the payment format with a known credit card type
51+
*
52+
* @return void
53+
*/
54+
public function testFormatPaymentTokenWithKnownCardType()
55+
{
56+
$this->tokenDetails['type'] = key(CreditCardTokenFormatter::$baseCardTypes);
57+
$this->paymentTokenMock->expects($this->once())
58+
->method('getTokenDetails')
59+
->willReturn(json_encode($this->tokenDetails));
60+
61+
$formattedString = sprintf(
62+
'%s: %s, %s: %s (%s: %s)',
63+
__('Credit Card'),
64+
reset(CreditCardTokenFormatter::$baseCardTypes),
65+
__('ending'),
66+
$this->tokenDetails['maskedCC'],
67+
__('expires'),
68+
$this->tokenDetails['expirationDate']
69+
);
70+
71+
self::assertEquals(
72+
$formattedString,
73+
$this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock)
74+
);
75+
}
76+
77+
/**
78+
* Testing the payment format with a unknown credit card type
79+
*
80+
* @return void
81+
*/
82+
public function testFormatPaymentTokenWithUnknownCardType()
83+
{
84+
$this->paymentTokenMock->expects($this->once())
85+
->method('getTokenDetails')
86+
->willReturn(json_encode($this->tokenDetails));
87+
88+
$formattedString = sprintf(
89+
'%s: %s, %s: %s (%s: %s)',
90+
__('Credit Card'),
91+
$this->tokenDetails['type'],
92+
__('ending'),
93+
$this->tokenDetails['maskedCC'],
94+
__('expires'),
95+
$this->tokenDetails['expirationDate']
96+
);
97+
98+
self::assertEquals(
99+
$formattedString,
100+
$this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock)
101+
);
102+
}
103+
104+
/**
105+
* Testing the payment format with wrong card data
106+
*
107+
* @return void
108+
*/
109+
public function testFormatPaymentTokenWithWrongData()
110+
{
111+
unset($this->tokenDetails['type']);
112+
$this->paymentTokenMock->expects($this->once())
113+
->method('getTokenDetails')
114+
->willReturn(json_encode($this->tokenDetails));
115+
self::expectException('\InvalidArgumentException');
116+
117+
$this->creditCardTokenFormatter->formatPaymentToken($this->paymentTokenMock);
118+
}
119+
}

‎app/code/Magento/Braintree/Test/Unit/Model/InstantPurchase/PaymentAdditionalInformationProviderTest.php

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Braintree\Test\Unit\Model\InstantPurchase;
9+
10+
use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
11+
use Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider;
12+
use Magento\Payment\Gateway\Command\Result\ArrayResult;
13+
use Magento\Vault\Api\Data\PaymentTokenInterface;
14+
15+
/**
16+
* @covers \Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider
17+
*/
18+
class PaymentAdditionalInformationProviderTest extends \PHPUnit\Framework\TestCase
19+
{
20+
/**
21+
* Testable Object
22+
*
23+
* @var PaymentAdditionalInformationProvider
24+
*/
25+
private $paymentAdditionalInformationProvider;
26+
27+
/**
28+
* @var GetPaymentNonceCommand|\PHPUnit_Framework_MockObject_MockObject
29+
*/
30+
private $getPaymentNonceCommandMock;
31+
32+
/**
33+
* @var PaymentTokenInterface|\PHPUnit_Framework_MockObject_MockObject
34+
*/
35+
private $paymentTokenMock;
36+
37+
/**
38+
* @var ArrayResult|\PHPUnit_Framework_MockObject_MockObject
39+
*/
40+
private $arrayResultMock;
41+
42+
/**
43+
* Set Up
44+
*
45+
* @return void
46+
*/
47+
protected function setUp()
48+
{
49+
$this->getPaymentNonceCommandMock = $this->createMock(GetPaymentNonceCommand::class);
50+
$this->paymentTokenMock = $this->createMock(PaymentTokenInterface::class);
51+
$this->arrayResultMock = $this->createMock(ArrayResult::class);
52+
$this->paymentAdditionalInformationProvider = new PaymentAdditionalInformationProvider(
53+
$this->getPaymentNonceCommandMock
54+
);
55+
}
56+
57+
/**
58+
* Test getAdditionalInformation method
59+
*
60+
* @return void
61+
*/
62+
public function testGetAdditionalInformation()
63+
{
64+
$customerId = 15;
65+
$publicHash = '3n4b7sn48g';
66+
$paymentMethodNonce = 'test';
67+
68+
$this->paymentTokenMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
69+
$this->paymentTokenMock->expects($this->once())->method('getPublicHash')->willReturn($publicHash);
70+
$this->getPaymentNonceCommandMock->expects($this->once())->method('execute')->with([
71+
PaymentTokenInterface::CUSTOMER_ID => $customerId,
72+
PaymentTokenInterface::PUBLIC_HASH => $publicHash,
73+
])->willReturn($this->arrayResultMock);
74+
$this->arrayResultMock->expects($this->once())->method('get')
75+
->willReturn(['paymentMethodNonce' => $paymentMethodNonce]);
76+
77+
$expected = [
78+
'payment_method_nonce' => $paymentMethodNonce,
79+
];
80+
$actual = $this->paymentAdditionalInformationProvider->getAdditionalInformation($this->paymentTokenMock);
81+
self::assertEquals($expected, $actual);
82+
}
83+
}

0 commit comments

Comments
 (0)