Merge pull request #9 from andrey-helldar/1.x

[1.x] Correction of conducting refunds

.github/workflows/coverage.yml

@@ -7,13 +7,13 @@ on:
 
 jobs:
     scrutinizer:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
 
         name: Coverage
 
         services:
             mysql:
-                image: mysql:8.0
+                image: mysql:5.7
                 env:
                     MYSQL_ROOT_PASSWORD: root
                     MYSQL_DATABASE: default

.github/workflows/phpunit.yml

@@ -3,7 +3,7 @@ on: [ push ]
 
 jobs:
     build:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
 
         strategy:
             fail-fast: true
@@ -15,7 +15,7 @@ jobs:
 
         services:
             mysql:
-                image: mysql:8.0
+                image: mysql:5.7
                 env:
                     MYSQL_ROOT_PASSWORD: root
                     MYSQL_DATABASE: default

src/Requests/BaseRequest.php

@@ -44,12 +44,9 @@ public function getRawHeaders(): array
     public function getHttpOptions(): array
     {
         if (Main::isProduction()) {
-            return [
-                'cert' => [
-                    $this->model->getCertificatePath(),
-                    $this->model->getCertificatePassword(),
-                ],
-            ];
+            $cert = $this->getCertificateData();
+
+            return compact('cert');
         }
 
         return [];
@@ -66,4 +63,12 @@ protected function currentTime(): string
 
         return Date::toString($date);
     }
+
+    protected function getCertificateData(): array
+    {
+        return [
+            $this->model->getCertificatePath(),
+            $this->model->getCertificatePassword(),
+        ];
+    }
 }

src/Requests/Cancel.php

@@ -30,6 +30,8 @@ class Cancel extends BaseRequest
         Body::SCOPE => Scopes::CANCEL,
     ];
 
+    protected $reload_relations = true;
+
     public function getRawBody(): array
     {
         return [

tests/Concerns/Database.php

@@ -1,28 +1,46 @@
 <?php
 
+/*
+ * This file is part of the "andrey-helldar/cashier-sber-qr" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@ai-rus.com>
+ *
+ * @copyright 2021 Andrey Helldar
+ *
+ * @license MIT
+ *
+ * @see https://github.com/andrey-helldar/cashier-sber-qr
+ */
+
 declare(strict_types=1);
 
 namespace Tests\Concerns;
 
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Tests\Fixtures\Factories\Payment;
-use Tests\Fixtures\Models\RequestPayment;
+use Tests\Fixtures\Models\ReadyPayment;
+use Tests\TestCase;
 
 trait Database
 {
     use RefreshDatabase;
 
-    protected $pre_payment = true;
+    /** @var \Illuminate\Database\Eloquent\Model|string */
+    protected $model = ReadyPayment::class;
 
-    protected function prePayment(): void
+    protected function payment(): Model
     {
-        if ($this->pre_payment) {
-            $this->payment($this->pre_payment);
-        }
-    }
+        $model = $this->model;
 
-    protected function payment(bool $enabled_events = false): RequestPayment
-    {
-        return Payment::create($enabled_events)->refresh();
+        return $model::create([
+            'type_id'   => TestCase::MODEL_TYPE_ID,
+            'status_id' => TestCase::MODEL_STATUS_ID,
+
+            'sum'      => TestCase::PAYMENT_SUM,
+            'currency' => TestCase::CURRENCY,
+        ]);
     }
 }

tests/Concerns/TestServiceProvider.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the "andrey-helldar/cashier-sber-qr" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@ai-rus.com>
+ *
+ * @copyright 2021 Andrey Helldar
+ *
+ * @license MIT
+ *
+ * @see https://github.com/andrey-helldar/cashier-sber-qr
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Concerns;
+
+use Helldar\Cashier\Providers\ServiceProvider;
+
+class TestServiceProvider extends ServiceProvider
+{
+    protected function bootMigrations(): void
+    {
+        $this->loadMigrationsFrom([
+            __DIR__ . '/../database/migrations',
+            __DIR__ . '/../../vendor/andrey-helldar/cashier/database/migrations/main',
+        ]);
+    }
+}

tests/DriverTest.php

@@ -23,6 +23,7 @@
 use Helldar\Contracts\Cashier\Driver as DriverContract;
 use Helldar\Contracts\Cashier\Http\Response as ResponseContract;
 use Helldar\Support\Facades\Http\Url;
+use Illuminate\Database\Eloquent\Model;
 use Tests\Fixtures\Models\RequestPayment;
 
 class DriverTest extends TestCase
@@ -31,9 +32,9 @@ class DriverTest extends TestCase
 
     public function testStart()
     {
-        Jobs::make($this->payment())->start();
+        $payment = $this->payment();
 
-        $response = $this->driver()->start();
+        $response = $this->driver($payment)->start();
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertInstanceOf(ResponseContract::class, $response);
@@ -48,9 +49,11 @@ public function testStart()
 
     public function testCheck()
     {
-        Jobs::make($this->payment())->start();
+        $payment = $this->payment();
+
+        Jobs::make($payment)->start();
 
-        $response = $this->driver()->check();
+        $response = $this->driver($payment)->check();
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertInstanceOf(ResponseContract::class, $response);
@@ -74,7 +77,7 @@ public function testRefund()
         Jobs::make($payment)->start();
         Jobs::make($payment)->check(true);
 
-        $response = $this->driver()->refund();
+        $response = $this->driver($payment)->refund();
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertInstanceOf(ResponseContract::class, $response);
@@ -85,17 +88,10 @@ public function testRefund()
         $this->assertSame('REVERSED', $response->getStatus());
     }
 
-    protected function driver(): DriverContract
+    protected function driver(Model $payment): DriverContract
     {
-        $model = $this->paymentRequest();
-
         $config = $this->config();
 
-        return QR::make($config, $model);
-    }
-
-    protected function paymentRequest(): RequestPayment
-    {
-        return RequestPayment::firstOrFail();
+        return QR::make($config, $payment);
     }
 }

tests/Fixtures/Resources/Model.php

@@ -23,11 +23,6 @@
 /** @property \Tests\Fixtures\Models\ReadyPayment $model */
 class Model extends BaseModel
 {
-    public function getExternalId(): ?string
-    {
-        return $this->model->cashier->external_id;
-    }
-
     public function getMemberId(): string
     {
         return config('cashier.drivers.sber_qr.member_id');

tests/Helpers/StatusesTest.php

@@ -151,8 +151,7 @@ public function testInProgress()
 
         $this->assertFalse($this->status('PAID', 1)->inProgress());
 
-        $this->assertFalse($this->status('UNKNOWN', 7)->inProgress());
-
+        $this->assertTrue($this->status('UNKNOWN', 7)->inProgress());
         $this->assertTrue($this->status('UNKNOWN', 7)->inProgress('CREATED'));
 
         $this->assertFalse($this->status('UNKNOWN', 7)->inProgress('REVERSED'));
@@ -161,7 +160,7 @@ public function testInProgress()
 
         $this->assertFalse($this->status('UNKNOWN', 7)->inProgress('PAID'));
 
-        $this->assertFalse($this->status('UNKNOWN', 7)->inProgress('UNKNOWN'));
+        $this->assertTrue($this->status('UNKNOWN', 7)->inProgress('UNKNOWN'));
     }
 
     protected function status(string $name, int $status_id = 0): Statuses

tests/Observers/ObserverTest.php

@@ -19,8 +19,8 @@
 use Helldar\Cashier\Constants\Status;
 use Helldar\Cashier\Facades\Config\Payment as PaymentConfig;
 use Helldar\Cashier\Providers\ObserverServiceProvider;
-use Helldar\Cashier\Providers\ServiceProvider;
 use Illuminate\Support\Facades\DB;
+use Tests\Concerns\TestServiceProvider;
 use Tests\Fixtures\Models\RequestPayment;
 use Tests\TestCase;
 
@@ -33,9 +33,7 @@ public function testCreate()
         $this->assertSame(0, DB::table('payments')->count());
         $this->assertSame(0, DB::table('cashier_details')->count());
 
-        $payment = $this->payment();
-
-        $payment->refresh();
+        $payment = $this->payment()->refresh();
 
         $this->assertSame(1, DB::table('payments')->count());
         $this->assertSame(1, DB::table('cashier_details')->count());
@@ -58,7 +56,7 @@ public function testUpdate()
         $this->assertSame(0, DB::table('payments')->count());
         $this->assertSame(0, DB::table('cashier_details')->count());
 
-        $payment = $this->payment();
+        $payment = $this->payment()->refresh();
 
         $this->assertSame(1, DB::table('payments')->count());
         $this->assertSame(1, DB::table('cashier_details')->count());
@@ -98,7 +96,7 @@ public function testUpdate()
     protected function getPackageProviders($app): array
     {
         return [
-            ServiceProvider::class,
+            TestServiceProvider::class,
             ObserverServiceProvider::class,
         ];
     }