Skip to content

Commit 281d0a8

Browse files
committed
MAGETWO-53238: Vault Provider field contains Payflow Pro option in countries which don't have such solution
- Added integration test to cover case with removed payment details - Fixed failed PayflowPro integration test
1 parent 501d46d commit 281d0a8

File tree

2 files changed

+26
-1
lines changed
  • dev/tests/integration/testsuite/Magento

2 files changed

+26
-1
lines changed

dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
106106
<config_path>payment/payflowpro_cc_vault/active</config_path>
107107
<requires>
108-
<group id="paypal_payflow_required"/>
108+
<group id="paypal_payflow_api_settings"/>
109109
</requires>
110110
</field>
111111
</group>

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
namespace Magento\Sales\Model\AdminOrder;
77

88
use Magento\TestFramework\Helper\Bootstrap;
9+
use Magento\Sales\Model\Order;
10+
use Magento\Framework\Registry;
911

1012
/**
1113
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -120,6 +122,29 @@ public function testInitFromOrderCcInformationDeleted()
120122
$this->assertNull($payment->getCcLast4());
121123
}
122124

125+
/**
126+
* @magentoDataFixture Magento/Sales/_files/order_paid_with_payflowpro.php
127+
*/
128+
public function testInitFromOrderWithEmptyPaymentDetails()
129+
{
130+
/** @var $objectManager \Magento\TestFramework\ObjectManager */
131+
$objectManager = Bootstrap::getObjectManager();
132+
/** @var $order \Magento\Sales\Model\Order */
133+
$order = $objectManager->create(Order::class);
134+
$order->loadByIncrementId('100000001');
135+
136+
$objectManager->get(Registry::class)
137+
->unregister('rule_data');
138+
139+
$payment = $this->_model->initFromOrder($order)
140+
->getQuote()
141+
->getPayment();
142+
143+
static::assertEmpty($payment->getMethod());
144+
static::assertEmpty($payment->getAdditionalInformation());
145+
static::assertEmpty($payment->getAdditionalData());
146+
}
147+
123148
/**
124149
* @magentoAppIsolation enabled
125150
*/

0 commit comments

Comments
 (0)