Skip to content

Commit

Permalink
Merge branch '1.0'
Browse files Browse the repository at this point in the history
* 1.0:
  [Maintenace] Bump versions of used GH actions
  [CI] Fix test API urls in contract test workflow
  [Maintenance] Conflict with behat/mink-selenium2-driver due to signature change
  • Loading branch information
GSadee committed Mar 4, 2024
2 parents 6641bcb + 0b67b99 commit d3add1c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
SAFERPAY_TEST_API_URL: "http://localhost:4000/"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
run: vendor/bin/behat --format=progress --colors --strict -vvv --no-interaction --tags="~@todo"

- name: Upload Behat logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: failure()
with:
name: Behat logs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/contract_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
env:
APP_ENV: test
DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}"
SAFERPAY_TEST_API_URL: "https://test.saferpay.com/api"
SAFERPAY_TEST_API_URL: "https://test.saferpay.com/api/"
SAFERPAY_TEST_API_USER: ${{ secrets.SAFERPAY_TEST_API_USER }}
SAFERPAY_TEST_API_PASSWORD: ${{ secrets.SAFERPAY_TEST_API_PASSWORD }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
9 changes: 9 additions & 0 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# CONFLICTS

This document explains why certain conflicts were added to `composer.json` and
references related issues.

- `behat/mink-selenium2-driver:>=1.7.0`:

This version adds strict type to the `Behat\Mink\Driver\Selenium2Driver::visit(string $url)` method
which causes a fatal error because the method signature is no longer compatible with the parent class.
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
"theofidry/alice-data-fixtures": "^1.5",
"vimeo/psalm": "5.20.0"
},
"conflict": {
"behat/mink-selenium2-driver": ">=1.7.0"
},
"config": {
"sort-packages": true,
"allow-plugins": {
Expand Down
8 changes: 4 additions & 4 deletions tests/Contract/SaferpayApiTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ abstract class SaferpayApiTestCase extends JsonApiTestCase
use PantherTestCaseTrait;
use SaferpayHelperTrait;

protected const ASSERT_ENDPOINT = '/Payment/v1/PaymentPage/Assert';
protected const ASSERT_ENDPOINT = 'Payment/v1/PaymentPage/Assert';

protected const CAPTURE_ENDPOINT = '/Payment/v1/Transaction/Capture';
protected const CAPTURE_ENDPOINT = 'Payment/v1/Transaction/Capture';

protected const INITIALIZATION_ENDPOINT = '/Payment/v1/PaymentPage/Initialize';
protected const INITIALIZATION_ENDPOINT = 'Payment/v1/PaymentPage/Initialize';

protected const REFUND_ENDPOINT = '/Payment/v1/Transaction/Refund';
protected const REFUND_ENDPOINT = 'Payment/v1/Transaction/Refund';

protected const CONTENT_TYPE_HEADER = ['CONTENT_TYPE' => 'application/json', 'HTTP_ACCEPT' => 'application/json'];

Expand Down

0 comments on commit d3add1c

Please sign in to comment.