Merge pull request #47 from alexmanase/convert-all-tests-to-pest

Convert all tests to Pest

Author: freekmurze

.github/workflows/run-tests.yml

@@ -41,4 +41,4 @@ jobs:
                     composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
             -   name: Execute tests
-                run: vendor/bin/phpunit
+                run: vendor/bin/pest

.gitignore

@@ -4,3 +4,4 @@ docs
 vendor
 coverage
 .php-cs-fixer.cache
+.phpunit.result.cache

.phpunit.result.cache

@@ -0,0 +1 @@
+{"version":1,"defects":{"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::to":4,"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::it":4},"times":{"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelMakeCommandTest.php::it":0.003,"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::public":0.002,"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::values":0.002,"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::callables":0.002,"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::ignored":0.002,"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::to":0.003,"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::magic":0.002,"\/Users\/alexandrumanase\/Documents\/repos\/laravel-view-models\/tests\/ViewModelTest.php::it":0.003}}

composer.json

@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "orchestra/testbench": "^6.23|^7.0",
-        "phpunit/phpunit": "^9.4"
+        "pestphp/pest": "^1.22"
     },
     "autoload": {
         "psr-4": {
@@ -41,13 +41,16 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage",
+        "test": "vendor/bin/pest",
+        "test-coverage": "vendor/bin/pest --coverage-html coverage",
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

tests/Pest.php

@@ -0,0 +1,24 @@
+<?php
+
+use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Http\Request;
+
+uses(Spatie\ViewModels\Tests\TestCase::class)->in('.');
+
+// Functions
+
+function createRequest(array $headers = []): Request
+{
+    $request = Request::create('/', 'GET', [], [], [], [], []);
+
+    foreach ($headers as $header => $value) {
+        $request->headers->set($header, $value);
+    }
+
+    return $request;
+}
+
+function getResponseBody(Response $response): array
+{
+    return json_decode($response->getContent(), true);
+}

tests/TestCase.php

@@ -2,35 +2,17 @@
 
 namespace Spatie\ViewModels\Tests;
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\View;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
 use Spatie\ViewModels\Providers\ViewModelsServiceProvider;
-use Symfony\Component\HttpFoundation\Response;
 
 class TestCase extends OrchestraTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
 
-        View::addLocation(__DIR__.'/resources/views');
-    }
-
-    protected function createRequest(array $headers = []): Request
-    {
-        $request = Request::create('/', 'GET', [], [], [], [], []);
-
-        foreach ($headers as $header => $value) {
-            $request->headers->set($header, $value);
-        }
-
-        return $request;
-    }
-
-    protected function getResponseBody(Response $response): array
-    {
-        return json_decode($response->getContent(), true);
+        View::addLocation(__DIR__ . '/resources/views');
     }
 
     protected function getPackageProviders($app)

tests/ViewModelMakeCommandTest.php

@@ -1,55 +1,42 @@
 <?php
 
-namespace Spatie\ViewModels\Tests;
-
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
 
-class ViewModelMakeCommandTest extends TestCase
-{
-    /** @test */
-    public function it_can_create_a_view_model()
-    {
-        $exitCode = Artisan::call('make:view-model', [
-            'name' => 'HomeViewModel',
-            '--force' => true,
-        ]);
-
-        $this->assertEquals(0, $exitCode);
-
-        $this->assertMatchesRegularExpression('~ViewModel( \[.+\])? created successfully~', Artisan::output());
-
-        $shouldOutputFilePath = $this->app['path'].'/ViewModels/HomeViewModel.php';
-
-        $this->assertTrue(File::exists($shouldOutputFilePath), 'File exists in default app/ViewModels folder');
-
-        $contents = File::get($shouldOutputFilePath);
+use function PHPUnit\Framework\assertTrue;
 
-        $this->assertStringContainsString('namespace App\ViewModels;', $contents);
+it('can create a view model', function () {
+    $exitCode = Artisan::call('make:view-model', [
+        'name' => 'HomeViewModel',
+        '--force' => true,
+    ]);
 
-        $this->assertStringContainsString('class HomeViewModel extends ViewModel', $contents);
-    }
+    expect($exitCode)->toEqual(0)
+        ->and(Artisan::output())->toMatch('~ViewModel( \[.+\])? created successfully~');
 
-    /** @test */
-    public function it_can_create_a_view_model_with_a_custom_namespace()
-    {
-        $exitCode = Artisan::call('make:view-model', [
-            'name' => 'Blog/PostsViewModel',
-            '--force' => true,
-        ]);
+    $shouldOutputFilePath = $this->app['path'] . '/ViewModels/HomeViewModel.php';
 
-        $this->assertEquals(0, $exitCode);
+    assertTrue(File::exists($shouldOutputFilePath), 'File exists in default app/ViewModels folder');
 
-        $this->assertMatchesRegularExpression('~ViewModel( \[.+\])? created successfully~', Artisan::output());
+    expect(File::get($shouldOutputFilePath))
+        ->toContain('namespace App\ViewModels;')
+        ->toContain('class HomeViewModel extends ViewModel');
+});
 
-        $shouldOutputFilePath = $this->app['path'].'/ViewModels/Blog/PostsViewModel.php';
+it('can create a view model with a custom namespace', function () {
+    $exitCode = Artisan::call('make:view-model', [
+        'name' => 'Blog/PostsViewModel',
+        '--force' => true,
+    ]);
 
-        $this->assertTrue(File::exists($shouldOutputFilePath), 'File exists in custom app/Blog folder');
+    expect($exitCode)->toEqual(0)
+        ->and(Artisan::output())->toMatch('~ViewModel( \[.+\])? created successfully~');
 
-        $contents = File::get($shouldOutputFilePath);
+    $shouldOutputFilePath = $this->app['path'] . '/ViewModels/Blog/PostsViewModel.php';
 
-        $this->assertStringContainsString('namespace App\ViewModels\Blog;', $contents);
+    assertTrue(File::exists($shouldOutputFilePath), 'File exists in custom app/Blog folder');
 
-        $this->assertStringContainsString('class PostsViewModel extends ViewModel', $contents);
-    }
-}
+    expect(File::get($shouldOutputFilePath))
+        ->toContain('namespace App\ViewModels\Blog;')
+        ->toContain('class PostsViewModel extends ViewModel');
+});