Merge pull request #121 from swlodarski-sumoheavy/10.1.x

SP-1172 - Add tests to Magento module pipeline

Author: bobbrodie

.github/workflows/test.yml

@@ -4,17 +4,58 @@ on: [push, pull_request]
 
 env:
   NODE_VERSION: 18
+  MODULE_NAME: Bitpay_BPCheckout
+  COMPOSER_NAME: "bitpay/module-bpcheckout"
 
 jobs:
+  unit-tests-81:
+    name: Unit Tests (PHP 8.1)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        MAGENTO_VERSION: ["2.4.4", "2.4.5", "2.4.6"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: extdn/github-actions-m2/magento-unit-tests/8.1@master
+        env:
+          MAGENTO_VERSION: ${{ matrix.MAGENTO_VERSION }}
+
+  unit-tests-82:
+    name: Unit Tests (PHP 8.2)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        MAGENTO_VERSION: ["2.4.6", "2.4.7"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: extdn/github-actions-m2/magento-unit-tests/8.2@master
+        env:
+          MAGENTO_VERSION: ${{ matrix.MAGENTO_VERSION }}
+
+  unit-tests-83:
+    name: Unit Tests (PHP 8.3)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        MAGENTO_VERSION: ["2.4.7"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: extdn/github-actions-m2/magento-unit-tests/8.3@master
+        env:
+          MAGENTO_VERSION: ${{ matrix.MAGENTO_VERSION }}
+
   lint:
     name: ESLint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      
+
       - name: Run linter
         run: |
           composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true

Model/Ipn/IpnNotificationSender.php

@@ -28,7 +28,11 @@ public function execute(string $orderId): void
         if (!$invoiceData || !isset($invoiceData['invoice_id'])) {
             throw new \RuntimeException('Wrong BitPay Invoice');
         }
+        $invoice = $client->getInvoice($invoiceData['invoice_id']);
+        if (!$invoice) {
+            throw new \RuntimeException('BitPay Invoice not found');
+        }
 
-        $client->requestInvoiceNotification($invoiceData['invoice_id']);
+        $client->requestInvoiceNotification($invoiceData['invoice_id'], $invoice->getToken());
     }
 }

Test/Unit/Model/Ipn/IpnNotificationSenderTest.php

@@ -7,13 +7,15 @@
 use Bitpay\BPCheckout\Model\BitpayInvoiceRepository;
 use Bitpay\BPCheckout\Model\Client as ClientFactory;
 use Bitpay\BPCheckout\Model\Ipn\IpnNotificationSender;
+use BitPaySDK\Model\Invoice\Buyer;
 use PHPUnit\Framework\TestCase;
 
 class IpnNotificationSenderTest extends TestCase
 {
     private const EXISTING_ORDER_ID = '11';
     private const NON_EXISTING_ORDER_ID = '121312321';
     private const INVOICE_ID = '123';
+    private const INVOICE_TOKEN = 'token';
 
     public function testSendIpnNotification(): void
     {
@@ -23,8 +25,10 @@ public function testSendIpnNotification(): void
         $bitpayInvoiceRepository->method('getByOrderId')->with(self::EXISTING_ORDER_ID)
             ->willReturn(['invoice_id' => self::INVOICE_ID]);
         $clientFactory->method('initialize')->willReturn($client);
+        $invoice = $this->prepareInvoice();
+        $client->expects($this->once())->method('getInvoice')->willReturn($invoice);
 
-        $client->expects(self::once())->method('requestInvoiceNotification')->with(self::INVOICE_ID);
+        $client->expects(self::once())->method('requestInvoiceNotification')->with(self::INVOICE_ID, self::INVOICE_TOKEN);
 
         $testedClass = $this->getTestedClass($clientFactory, $bitpayInvoiceRepository);
         $testedClass->execute(self::EXISTING_ORDER_ID);
@@ -39,13 +43,30 @@ public function testIncorrectSendIpnNotification(): void
             ->willReturn(null);
         $clientFactory->method('initialize')->willReturn($client);
 
-        $client->expects(self::never())->method('requestInvoiceNotification')->with(self::INVOICE_ID);
+        $client->expects(self::never())->method('requestInvoiceNotification')->with(self::INVOICE_ID, self::INVOICE_TOKEN);
         $this->expectException(\RuntimeException::class);
 
         $testedClass = $this->getTestedClass($clientFactory, $bitpayInvoiceRepository);
         $testedClass->execute(self::NON_EXISTING_ORDER_ID);
     }
 
+    /**
+     * @return \BitPaySDK\Model\Invoice\Invoice
+     */
+    private function prepareInvoice(): \BitPaySDK\Model\Invoice\Invoice
+    {
+        $invoice = new \BitPaySDK\Model\Invoice\Invoice(12.00, 'USD');
+        $invoice->setAmountPaid(1232132);
+        $invoice->setToken(self::INVOICE_TOKEN);
+        $buyer = new Buyer();
+        $buyer->setName('test');
+        $buyer->setEmail('[email protected]');
+        $buyer->setAddress1('12 test road');
+        $invoice->setBuyer($buyer);
+
+        return $invoice;
+    }
+
     private function getTestedClass(ClientFactory $clientFactory, BitpayInvoiceRepository $bitpayInvoiceRepository)
     {
         return new IpnNotificationSender($clientFactory, $bitpayInvoiceRepository);

composer.json

@@ -13,7 +13,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "~8.1",
-        "bitpay/sdk": "^9.1"
+        "bitpay/sdk": "^9.2"
     },
     "autoload": {
         "files": [