wip

Author: enricodelazzari

.github/workflows/run-tests.yml

@@ -2,13 +2,21 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+    paths:
+      - '**.php'
+      - '.github/workflows/run-tests.yml'
+      - 'phpunit.xml.dist'
+      - 'composer.json'
+      - 'composer.lock'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 5
     strategy:
       fail-fast: true
       matrix:
@@ -19,16 +27,14 @@ jobs:
         include:
           - laravel: 12.*
             testbench: 10.*
-            carbon: ^3.0
           - laravel: 11.*
             testbench: 9.*
-            carbon: ^3.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -44,8 +50,11 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
+      - name: List Installed Dependencies
+        run: composer show -D
+
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/pest --ci

composer.json

@@ -29,11 +29,14 @@
         "illuminate/database": "^11.0|^12.0",
         "illuminate/support": "^11.0|^12.0",
         "illuminate/validation": "^11.0|^12.0",
+        "laravel/framework": "11.*",
+        "orchestra/testbench": "9.*",
         "spatie/laravel-package-tools": "^1.14.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4",
-        "orchestra/testbench": "^9.0|^10.0",
+        "pestphp/pest": "^3.8",
+        "pestphp/pest-plugin-laravel": "^3.2",
         "phpunit/phpunit": "^10.5|^11.0",
         "vimeo/psalm": "^5.22|^6.0"
     },
@@ -50,11 +53,14 @@
     "scripts": {
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
         "psalm": "vendor/bin/psalm",
-        "test": "vendor/bin/phpunit --colors=always",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
+        "test": "vendor/bin/pest",
+        "test-coverage": "vendor/bin/pest --coverage"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     },
     "extra": {
         "laravel": {

tests/DBEncrypterTest.php

@@ -1,25 +1,17 @@
 <?php
 
-namespace Maize\Encryptable\Tests;
-
 use Illuminate\Contracts\Encryption\EncryptException;
 use Maize\Encryptable\Encryption;
 
-class DBEncrypterTest extends TestCase
-{
-    /** @test */
-    public function it_should_throw_exception_on_db_encrypt()
-    {
-        $this->expectException(EncryptException::class);
 
-        Encryption::db()->encrypt('test');
-    }
+it('should throw exception on db encrypt', function () {
+    $this->expectException(EncryptException::class);
+
+    Encryption::db()->encrypt('test');
+});
 
-    /** @test */
-    public function it_should_return_query_on_db_decrypt()
-    {
-        $query = Encryption::db()->decrypt('test');
+it('should return query on db decrypt', function () {
+    $query = Encryption::db()->decrypt('test');
 
-        $this->assertIsString($query);
-    }
-}
+    expect($query)->toBeString();
+});

tests/EncryptableTest.php

@@ -1,69 +1,50 @@
 <?php
 
-namespace Maize\Encryptable\Tests;
-
 use Illuminate\Support\Facades\DB;
 use Maize\Encryptable\Encryption;
 use Maize\Encryptable\Tests\Models\User;
 
-class EncryptableTest extends TestCase
-{
-    /** @test */
-    public function it_should_encrypt_data_when_saving_model_instance()
-    {
-        $user = $this->createUser();
 
-        $this->assertDatabaseCount($user->getTable(), 1);
+it('should encrypt data when saving model instance', function () {
+    $user = $this->createUser();
+
+    $this->assertDatabaseCount($user->getTable(), 1);
 
-        $userRaw = DB::table($user->getTable())
-            ->select('*')
-            ->where('id', $user->getKey())
-            ->first();
+    $userRaw = DB::table($user->getTable())
+        ->select('*')
+        ->where('id', $user->getKey())
+        ->first();
 
-        $this->assertTrue(
-            Encryption::isEncrypted($userRaw->first_name)
-        );
+    expect(Encryption::isEncrypted($userRaw->first_name))->toBeTrue();
 
-        $this->assertTrue(
-            Encryption::isEncrypted($userRaw->last_name)
-        );
-    }
+    expect(Encryption::isEncrypted($userRaw->last_name))->toBeTrue();
+});
 
-    /** @test */
-    public function it_should_encrypt_data_when_updating_model_instance()
-    {
-        $user = $this->createUser();
+it('should encrypt data when updating model instance', function () {
+    $user = $this->createUser();
 
-        $user->update([
-            'first_name' => 'Test',
-        ]);
+    $user->update([
+        'first_name' => 'Test',
+    ]);
 
-        $userRaw = DB::table($user->getTable())
-            ->select('*')
-            ->where('id', $user->getKey())
-            ->first();
+    $userRaw = DB::table($user->getTable())
+        ->select('*')
+        ->where('id', $user->getKey())
+        ->first();
 
-        $this->assertTrue(
-            Encryption::isEncrypted($userRaw->first_name)
-        );
+    expect(Encryption::isEncrypted($userRaw->first_name))->toBeTrue();
 
-        $this->assertEquals(
-            'Test',
-            Encryption::php()->decrypt($userRaw->first_name)
-        );
-    }
+    expect(Encryption::php()->decrypt($userRaw->first_name))->toEqual('Test');
+});
 
-    /** @test */
-    public function it_should_decrypt_data_when_retrieving_models()
-    {
-        $user = $this->createUser();
+it('should decrypt data when retrieving models', function () {
+    $user = $this->createUser();
 
-        $this->assertDatabaseCount($user->getTable(), 1);
+    $this->assertDatabaseCount($user->getTable(), 1);
 
-        $user = User::findOrFail($user->getKey());
+    $user = User::findOrFail($user->getKey());
 
-        $this->assertEquals('Name', $user->first_name);
+    expect($user->first_name)->toEqual('Name');
 
-        $this->assertEquals('Surname', $user->last_name);
-    }
-}
+    expect($user->last_name)->toEqual('Surname');
+});

tests/EncrypterTest.php

@@ -1,30 +1,22 @@
 <?php
 
-namespace Maize\Encryptable\Tests;
-
 use Maize\Encryptable\Encryption;
 use Maize\Encryptable\Exceptions\MissingEncryptionCipherException;
 use Maize\Encryptable\Exceptions\MissingEncryptionKeyException;
 
-class EncrypterTest extends TestCase
-{
-    /** @test */
-    public function it_should_throw_exception_when_encryption_key_is_missing()
-    {
-        config()->set('encryptable.key', null);
 
-        $this->expectException(MissingEncryptionKeyException::class);
+it('should throw exception when encryption key is missing', function () {
+    config()->set('encryptable.key', null);
+
+    $this->expectException(MissingEncryptionKeyException::class);
 
-        Encryption::php()->encrypt('test');
-    }
+    Encryption::php()->encrypt('test');
+});
 
-    /** @test */
-    public function it_should_throw_exception_when_encryption_cipher_is_missing()
-    {
-        config()->set('encryptable.cipher', null);
+it('should throw exception when encryption cipher is missing', function () {
+    config()->set('encryptable.cipher', null);
 
-        $this->expectException(MissingEncryptionCipherException::class);
+    $this->expectException(MissingEncryptionCipherException::class);
 
-        Encryption::db()->decrypt('test');
-    }
-}
+    Encryption::db()->decrypt('test');
+});

tests/ExistsEncryptedTest.php

@@ -1,40 +1,32 @@
 <?php
 
-namespace Maize\Encryptable\Tests;
-
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Maize\Encryptable\Rules\ExistsEncrypted;
 
-class ExistsEncryptedTest extends TestCase
-{
-    /** @test */
-    public function it_should_validate_encrypted_data_with_custom_exists_rule()
-    {
-        $user = $this->createUser();
 
-        $validationFails = Validator::make($user->toArray(), [
-            'first_name' => 'exists:users',
-        ])->fails();
+it('should validate encrypted data with custom exists rule', function () {
+    $user = $this->createUser();
+
+    $validationFails = Validator::make($user->toArray(), [
+        'first_name' => 'exists:users',
+    ])->fails();
 
-        $this->assertTrue($validationFails);
+    expect($validationFails)->toBeTrue();
 
-        $validationFails = Validator::make($user->toArray(), [
-            'first_name' => new ExistsEncrypted('users'),
-        ])->fails();
+    $validationFails = Validator::make($user->toArray(), [
+        'first_name' => new ExistsEncrypted('users'),
+    ])->fails();
 
-        $this->assertFalse($validationFails);
-    }
+    expect($validationFails)->toBeFalse();
+});
 
-    /** @test */
-    public function it_should_have_rule_macro()
-    {
-        $user = $this->createUser();
+it('should have rule macro', function () {
+    $user = $this->createUser();
 
-        $validationFails = Validator::make($user->toArray(), [
-            'first_name' => Rule::existsEncrypted('users'),
-        ])->fails();
+    $validationFails = Validator::make($user->toArray(), [
+        'first_name' => Rule::existsEncrypted('users'),
+    ])->fails();
 
-        $this->assertFalse($validationFails);
-    }
-}
+    expect($validationFails)->toBeFalse();
+});