-
Notifications
You must be signed in to change notification settings - Fork 2
SL-350 Settings UX/logic fixes (SL-366/367/370) #334
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.
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
Merged
justelis22
merged 3 commits into
feature/react-admin-settings
from
SL-350/settings-ux-fixes
Jul 10, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| <?php | ||
| /** | ||
| *NOTICE OF LICENSE | ||
| * | ||
| *This source file is subject to the Open Software License (OSL 3.0) | ||
| *that is bundled with this package in the file LICENSE.txt. | ||
| *It is also available through the world-wide-web at this URL: | ||
| *http://opensource.org/licenses/osl-3.0.php | ||
| *If you did not receive a copy of the license and are unable to | ||
| *obtain it through the world-wide-web, please send an email | ||
| *to license@prestashop.com so we can send you a copy immediately. | ||
| * | ||
| *DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade PrestaShop to newer | ||
| *versions in the future. If you wish to customize PrestaShop for your | ||
| *needs please refer to http://www.prestashop.com for more information. | ||
| * | ||
| *@author INVERTUS UAB www.invertus.eu <support@invertus.eu> | ||
| *@copyright SIX Payment Services | ||
| *@license SIX Payment Services | ||
| */ | ||
|
|
||
| namespace Invertus\SaferPay\Tests\Unit\Service; | ||
|
|
||
| use Invertus\SaferPay\Api\Request\GetTerminalsService; | ||
| use Invertus\SaferPay\Service\SaferPayGetTerminals; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| class SaferPayGetTerminalsTest extends TestCase | ||
| { | ||
| /** | ||
| * @dataProvider terminalTypePropertyProvider | ||
| */ | ||
| public function testExcludesMpoAndSpgKeepsOthersAndUntyped($typeProperty) | ||
| { | ||
| $service = new SaferPayGetTerminals($this->mockGetTerminalsService([ | ||
| $this->terminal('MPO_TERMINAL_ID', $typeProperty, 'MPO'), | ||
| $this->terminal('SPG_TERMINAL_ID', $typeProperty, 'SPG'), | ||
| $this->terminal('OTHER_TERMINAL_ID', $typeProperty, 'EMONEY'), | ||
| $this->terminal('NO_TYPE_TERMINAL_ID', $typeProperty, null), | ||
| ])); | ||
|
|
||
| $ids = array_column( | ||
| $service->fetchTerminalsWithCredentials('u', 'p', 'cust', true), | ||
| 'id' | ||
| ); | ||
|
|
||
| $this->assertNotContains('MPO_TERMINAL_ID', $ids); | ||
| $this->assertNotContains('SPG_TERMINAL_ID', $ids); | ||
| $this->assertContains('OTHER_TERMINAL_ID', $ids); | ||
| $this->assertContains('NO_TYPE_TERMINAL_ID', $ids); | ||
| } | ||
|
|
||
| public function testExclusionIsCaseInsensitive() | ||
| { | ||
| $service = new SaferPayGetTerminals($this->mockGetTerminalsService([ | ||
| $this->terminal('LOWER_MPO', 'Type', 'mpo'), | ||
| $this->terminal('MIXED_SPG', 'Type', 'Spg'), | ||
| $this->terminal('KEEP', 'Type', 'card'), | ||
| ])); | ||
|
|
||
| $ids = array_column( | ||
| $service->fetchTerminalsWithCredentials('u', 'p', 'cust', false), | ||
| 'id' | ||
| ); | ||
|
|
||
| $this->assertSame(['KEEP'], $ids); | ||
| } | ||
|
|
||
| public function testPreservesIdAndNameShape() | ||
| { | ||
| $service = new SaferPayGetTerminals($this->mockGetTerminalsService([ | ||
| $this->terminal('T1', 'Type', 'card', 'Main terminal'), | ||
| ])); | ||
|
|
||
| $result = $service->fetchTerminalsWithCredentials('u', 'p', 'cust', true); | ||
|
|
||
| $this->assertSame([['id' => 'T1', 'name' => 'Main terminal (T1)']], $result); | ||
| } | ||
|
|
||
| public function terminalTypePropertyProvider() | ||
| { | ||
| // The Management API terminal-type property name is confirmed defensively: | ||
| // both "Type" and "TerminalType" are honoured. | ||
| return [ | ||
| 'Type property' => ['Type'], | ||
| 'TerminalType property' => ['TerminalType'], | ||
| ]; | ||
| } | ||
|
|
||
| private function terminal($id, $typeProperty, $typeValue, $description = null) | ||
| { | ||
| $terminal = new \stdClass(); | ||
| $terminal->TerminalId = $id; | ||
| if ($description !== null) { | ||
| $terminal->Description = $description; | ||
| } | ||
| if ($typeValue !== null) { | ||
| $terminal->{$typeProperty} = $typeValue; | ||
| } | ||
|
|
||
| return $terminal; | ||
| } | ||
|
|
||
| private function mockGetTerminalsService(array $terminals) | ||
| { | ||
| $response = new \stdClass(); | ||
| $response->Terminals = $terminals; | ||
|
|
||
| $mock = $this->getMockBuilder(GetTerminalsService::class) | ||
| ->disableOriginalConstructor() | ||
| ->setMethods(['getTerminals']) | ||
| ->getMock(); | ||
| $mock->method('getTerminals')->willReturn($response); | ||
|
|
||
| return $mock; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
setMethods()method is deprecated in PHPUnit 8/9 and has been completely removed in PHPUnit 10. SincegetTerminalsis an existing method onGetTerminalsService, you should useonlyMethods()instead to ensure compatibility with newer PHPUnit versions.