Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

magento/magento2#27500 - Replace deprecated constructs from OfflinePa… #27627

Merged
merged 4 commits into from
Apr 10, 2020
Merged

magento/magento2#27500 - Replace deprecated constructs from OfflinePa… #27627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f6b272
magento/magento2#27500 - Replace deprecated constructs from OfflinePa…
cristiano-pacheco Apr 5, 2020
16b58bc
magento/magento2#27500 - Added strict types and fix identation.
cristiano-pacheco Apr 5, 2020
84bd04a
magento/magento2#27500 - Added return type void to setUp method.
cristiano-pacheco Apr 7, 2020
28e8ad3
Merge branch '2.4-develop' of https://github.com/magento/magento2 int…
cristiano-pacheco Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions app/code/Magento/OfflinePayments/Test/Unit/Block/Info/CheckmoTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

cristiano-pacheco marked this conversation as resolved.
Show resolved Hide resolved
namespace Magento\OfflinePayments\Test\Unit\Block\Info;

use Magento\Framework\View\Element\Template\Context;
use Magento\OfflinePayments\Block\Info\Checkmo;
use Magento\Payment\Model\Info;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;

/**
* CheckmoTest contains list of test for block methods testing
*/
class CheckmoTest extends \PHPUnit\Framework\TestCase
class CheckmoTest extends TestCase
{
/**
* @var Info|MockObject
*/
private $info;
private $infoMock;

/**
* @var Checkmo
Expand All @@ -35,7 +37,7 @@ protected function setUp()
->setMethods([])
->getMock();

$this->info = $this->getMockBuilder(Info::class)
$this->infoMock = $this->getMockBuilder(Info::class)
->disableOriginalConstructor()
->setMethods(['getAdditionalInformation'])
->getMock();
Expand All @@ -44,18 +46,18 @@ protected function setUp()
}

/**
* @covers \Magento\OfflinePayments\Block\Info\Checkmo::getPayableTo
* @covers \Magento\OfflinePayments\Block\Info\Checkmo::getPayableTo
cristiano-pacheco marked this conversation as resolved.
Show resolved Hide resolved
* @param array $details
* @param string|null $expected
* @dataProvider getPayableToDataProvider
*/
public function testGetPayableTo($details, $expected)
{
$this->info->expects(static::at(0))
$this->infoMock->expects(static::at(0))
->method('getAdditionalInformation')
->with('payable_to')
->willReturn($details);
$this->block->setData('info', $this->info);
$this->block->setData('info', $this->infoMock);

static::assertEquals($expected, $this->block->getPayableTo());
}
Expand All @@ -73,18 +75,18 @@ public function getPayableToDataProvider()
}

/**
* @covers \Magento\OfflinePayments\Block\Info\Checkmo::getMailingAddress
* @covers \Magento\OfflinePayments\Block\Info\Checkmo::getMailingAddress
cristiano-pacheco marked this conversation as resolved.
Show resolved Hide resolved
* @param array $details
* @param string|null $expected
* @dataProvider getMailingAddressDataProvider
*/
public function testGetMailingAddress($details, $expected)
{
$this->info->expects(static::at(1))
$this->infoMock->expects(static::at(1))
->method('getAdditionalInformation')
->with('mailing_address')
->willReturn($details);
$this->block->setData('info', $this->info);
$this->block->setData('info', $this->infoMock);

static::assertEquals($expected, $this->block->getMailingAddress());
}
Expand All @@ -107,11 +109,11 @@ public function getMailingAddressDataProvider()
public function testConvertAdditionalDataIsNeverCalled()
{
$mailingAddress = 'blah@blah.com';
$this->info->expects(static::at(1))
$this->infoMock->expects(static::at(1))
->method('getAdditionalInformation')
->with('mailing_address')
->willReturn($mailingAddress);
$this->block->setData('info', $this->info);
$this->block->setData('info', $this->infoMock);

// First we set the property $this->_mailingAddress
$this->block->getMailingAddress();
Expand Down
36 changes: 23 additions & 13 deletions app/code/Magento/OfflinePayments/Test/Unit/Model/BanktransferTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,48 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\OfflinePayments\Test\Unit\Model;

class BanktransferTest extends \PHPUnit\Framework\TestCase
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\OfflinePayments\Model\Banktransfer;
use Magento\Payment\Block\Info\Instructions;
use Magento\Payment\Helper\Data;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;

class BanktransferTest extends TestCase
{
/**
* @var \Magento\OfflinePayments\Model\Banktransfer
* @var Banktransfer
*/
protected $_object;
private $object;

/**
* @var \PHPUnit_Framework_MockObject_MockObject
* @var ScopeConfigInterface|MockObject
*/
protected $_scopeConfig;
private $scopeConfigMock;

protected function setUp()
{
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
$paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
$this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
$this->_object = $objectManagerHelper->getObject(
\Magento\OfflinePayments\Model\Banktransfer::class,
$objectManagerHelper = new ObjectManager($this);
$eventManager = $this->createMock(ManagerInterface::class);
$paymentDataMock = $this->createMock(Data::class);
$this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
$this->object = $objectManagerHelper->getObject(
Banktransfer::class,
[
'eventManager' => $eventManager,
'paymentData' => $paymentDataMock,
'scopeConfig' => $this->_scopeConfig,
'scopeConfig' => $this->scopeConfigMock,
]
);
}

public function testGetInfoBlockType()
{
$this->assertEquals(\Magento\Payment\Block\Info\Instructions::class, $this->_object->getInfoBlockType());
$this->assertEquals(Instructions::class, $this->object->getInfoBlockType());
}
}
36 changes: 23 additions & 13 deletions app/code/Magento/OfflinePayments/Test/Unit/Model/CashondeliveryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,50 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\OfflinePayments\Test\Unit\Model;

class CashondeliveryTest extends \PHPUnit\Framework\TestCase
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\OfflinePayments\Model\Cashondelivery;
use Magento\Payment\Block\Info\Instructions;
use Magento\Payment\Helper\Data;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;

class CashondeliveryTest extends TestCase
{
/**
* @var \Magento\OfflinePayments\Model\Cashondelivery
* @var Cashondelivery
*/
protected $_object;
private $object;

/**
* @var \PHPUnit_Framework_MockObject_MockObject
* @var ScopeConfigInterface|MockObject
*/
protected $_scopeConfig;
private $scopeConfigMock;

protected function setUp()
{
$helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$helper = new ObjectManager($this);

$eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
$paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
$eventManager = $this->createMock(ManagerInterface::class);
$paymentDataMock = $this->createMock(Data::class);

$this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
$this->_object = $helper->getObject(
\Magento\OfflinePayments\Model\Cashondelivery::class,
$this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
$this->object = $helper->getObject(
Cashondelivery::class,
[
'eventManager' => $eventManager,
'paymentData' => $paymentDataMock,
'scopeConfig' => $this->_scopeConfig,
'scopeConfig' => $this->scopeConfigMock,
]
);
}

public function testGetInfoBlockType()
{
$this->assertEquals(\Magento\Payment\Block\Info\Instructions::class, $this->_object->getInfoBlockType());
$this->assertEquals(Instructions::class, $this->object->getInfoBlockType());
}
}
35 changes: 23 additions & 12 deletions app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,45 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

cristiano-pacheco marked this conversation as resolved.
Show resolved Hide resolved
namespace Magento\OfflinePayments\Test\Unit\Model;

use Magento\OfflinePayments\Model\CheckmoConfigProvider;
use Magento\OfflinePayments\Model\Checkmo;
use Magento\Framework\Escaper;
use Magento\OfflinePayments\Model\Checkmo;
use Magento\OfflinePayments\Model\CheckmoConfigProvider;
use Magento\Payment\Helper\Data as PaymentHelper;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;

class CheckmoConfigProviderTest extends \PHPUnit\Framework\TestCase
class CheckmoConfigProviderTest extends TestCase
{
/** @var CheckmoConfigProvider */
protected $model;
/**
* @var CheckmoConfigProvider
*/
private $model;

/** @var Checkmo|\PHPUnit_Framework_MockObject_MockObject */
protected $methodMock;
/**
* @var Checkmo|MockObject
*/
private $methodMock;

/** @var Escaper|\PHPUnit_Framework_MockObject_MockObject */
protected $escaperMock;
/**
* @var Escaper|MockObject
*/
private $escaperMock;

protected function setUp()
{
$this->methodMock = $this->createMock(\Magento\OfflinePayments\Model\Checkmo::class);
$this->methodMock = $this->createMock(Checkmo::class);

$paymentHelperMock = $this->createMock(\Magento\Payment\Helper\Data::class);
/** @var PaymentHelper|MockObject $paymentHelperMock */
$paymentHelperMock = $this->createMock(PaymentHelper::class);
$paymentHelperMock->expects($this->once())
->method('getMethodInstance')
->with(Checkmo::PAYMENT_METHOD_CHECKMO_CODE)
->willReturn($this->methodMock);

$this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
$this->escaperMock = $this->createMock(Escaper::class);
$this->escaperMock->expects($this->any())
->method('escapeHtml')
->willReturnArgument(0);
Expand Down
48 changes: 27 additions & 21 deletions app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,62 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\OfflinePayments\Test\Unit\Model;

class CheckmoTest extends \PHPUnit\Framework\TestCase
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\OfflinePayments\Model\Checkmo;
use Magento\Payment\Helper\Data;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;

class CheckmoTest extends TestCase
{
/**
* @var \Magento\OfflinePayments\Model\Checkmo
* @var Checkmo
*/
protected $_object;
private $object;

/**
* @var \PHPUnit_Framework_MockObject_MockObject
* @var ScopeConfigInterface|MockObject
*/
protected $_scopeConfig;
private $scopeConfigMock;

protected function setUp()
{
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
$paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
$this->_scopeConfig = $this->createPartialMock(
\Magento\Framework\App\Config\ScopeConfigInterface::class,
['getValue', 'isSetFlag']
);
$this->_object = $objectManagerHelper->getObject(
\Magento\OfflinePayments\Model\Checkmo::class,
$objectManagerHelper = new ObjectManager($this);
$eventManager = $this->createMock(ManagerInterface::class);
$paymentDataMock = $this->createMock(Data::class);
$this->scopeConfigMock = $this->createPartialMock(ScopeConfigInterface::class, ['getValue', 'isSetFlag']);
$this->object = $objectManagerHelper->getObject(
Checkmo::class,
[
'eventManager' => $eventManager,
'paymentData' => $paymentDataMock,
'scopeConfig' => $this->_scopeConfig,
'scopeConfig' => $this->scopeConfigMock,
]
);
}

public function testGetPayableTo()
{
$this->_object->setStore(1);
$this->_scopeConfig->expects($this->once())
$this->object->setStore(1);
$this->scopeConfigMock->expects($this->once())
->method('getValue')
->with('payment/checkmo/payable_to', 'store', 1)
->willReturn('payable');
$this->assertEquals('payable', $this->_object->getPayableTo());
$this->assertEquals('payable', $this->object->getPayableTo());
}

public function testGetMailingAddress()
{
$this->_object->setStore(1);
$this->_scopeConfig->expects($this->once())
$this->object->setStore(1);
$this->scopeConfigMock->expects($this->once())
->method('getValue')
->with('payment/checkmo/mailing_address', 'store', 1)
->willReturn('blah@blah.com');
$this->assertEquals('blah@blah.com', $this->_object->getMailingAddress());
$this->assertEquals('blah@blah.com', $this->object->getMailingAddress());
}
}
Loading