test(Ernie, Pest, ConfigManagerTest): Refactor response handling and …

…update test setup - Refactor the response handling in Ernie.php to simplify the assignment of the response variable. - Update the test setup in Pest.php to set the application version dynamically. - Modify the skip method in ConfigManagerTest.php for better clarity in test grouping.
guanguans · Sep 30, 2024 · fcd0aca · fcd0aca
1 parent 9f28d27
commit fcd0aca
Show file tree

Hide file tree

Showing 22 changed files with 208 additions and 48 deletions.
diff --git a/app/Support/Ernie.php b/app/Support/Ernie.php
@@ -208,9 +208,7 @@ static function (PendingRequest $pendingRequest) use (&$rowData, $writer): Pendi
             ));
 
         if ($rowData && empty($response->body())) {
-            $response = new Response(
-                $response->toPsrResponse()->withBody(Utils::streamFor(self::sanitizeData($rowData)))
-            );
+            $response = new Response($response->toPsrResponse()->withBody(Utils::streamFor(self::sanitizeData($rowData))));
         }
 
         return tap($response->throw(), static function (Response $response): void {

diff --git a/tests/Datasets/InvalidJsons.php b/tests/Datasets/InvalidJsons.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**
@@ -10,7 +18,27 @@
  * This source file is subject to the MIT license that is bundled.
  */
 
-dataset('InvalidJsons', [
+dataset('commit command parameters', [
+    [
+        'parameters' => [],
+    ],
+    [
+        'parameters' => [
+            '--dry-run' => true,
+        ],
+    ],
+    [
+        'parameters' => [
+            // '--diff' => <<<'DIFF'
+            //      tests/Pest.php                        |  1 +
+            //      tests/Unit/ConfigManagerTest.php      |  2 +-
+            //     DIFF
+            // ,
+        ],
+    ],
+]);
+
+dataset('invalid jsons', [
     [
         'json' => '',
         'expect' => '',

diff --git a/tests/Feature/CommitCommandTest.php b/tests/Feature/CommitCommandTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**
@@ -60,7 +68,7 @@
             'created' => 1677143178,
             'model' => 'text-davinci-003',
             'choices' => [
-                0 => [
+                [
                     'text' => 'invalid json', // 无效响应
                     'index' => 0,
                     'logprobs' => null,
@@ -87,7 +95,12 @@
     ->group(__DIR__, __FILE__)
     ->throws(TaskException::class, 'The generated commit message(');
 
-it('can generate and commit message', function (): void {
+it('can generate and commit message', function (array $parameters): void {
+    // 添加文件到暂存区
+    file_put_contents(repository_path('playground.random'), Str::random());
+    Process::fromShellCommandline('git rm -rf --cached repository/', fixtures_path())->run();
+    Process::fromShellCommandline('git add playground.random', repository_path())->mustRun();
+
     // 设置 git 信息
     Process::fromShellCommandline('git config user.email yaozm', repository_path())->mustRun();
     Process::fromShellCommandline('git config user.name [email protected]', repository_path())->mustRun();
@@ -99,7 +112,7 @@
     ]);
 
     $this
-        ->artisan(CommitCommand::class, [
+        ->artisan(CommitCommand::class, $parameters + [
             'path' => repository_path(),
             '--generator' => 'openai',
             '--no-edit' => true,
@@ -117,12 +130,13 @@
         ->expectsConfirmation('Do you want to commit this message?', 'yes')
         ->assertSuccessful();
 })
+    ->with('commit command parameters')
     ->depends('it will throw TaskException(The generated commit message is an invalid JSON)')
     ->group(__DIR__, __FILE__);
 
 afterAll(static function (): void {
     // 清理 playground 仓库
-    Process::fromShellCommandline('git reset HEAD^', repository_path())->run();
+    Process::fromShellCommandline('git reset $(git rev-list --max-parents=0 HEAD)', repository_path())->run();
     // Process::fromShellCommandline('git checkout -- .', repository_path())->run();
     Process::fromShellCommandline('git checkout HEAD -- .', repository_path())->run();
     Process::fromShellCommandline('git add tests/Fixtures/repository/', base_path())->mustRun();

diff --git a/tests/Feature/ConfigCommandTest.php b/tests/Feature/ConfigCommandTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**
@@ -62,7 +70,7 @@
     ])->assertSuccessful();
 })
     ->group(__DIR__, __FILE__)
-    ->with(['null', 'true', 'false', '0.0', '0', json_encode(['foo' => 'bar'])]);
+    ->with(['null', 'true', 'false', '0.0', '0', json_encode(['foo' => 'bar'], JSON_THROW_ON_ERROR)]);
 
 it('can get config', function (): void {
     $this->artisan(ConfigCommand::class, [

diff --git a/tests/Feature/ThanksCommandTest.php b/tests/Feature/ThanksCommandTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**

diff --git a/tests/Pest.php b/tests/Pest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**
@@ -22,6 +30,7 @@
     })
     ->beforeEach(function (): void {
         // setup_http_fake();
+        config()->set('app.version', 'v'.config('app.version'));
     })
     ->afterEach(function (): void {
     })
@@ -40,8 +49,8 @@
 |
 */
 
-expect()->extend('toBeOne', function () {
-    return $this->toBe(1);
+expect()->extend('toBeTwo', function () {
+    return $this->toBe(2);
 });
 
 /*
@@ -57,6 +66,8 @@
 
 /**
  * @param object|string $class
+ *
+ * @throws \ReflectionException
  */
 function class_namespace($class): string
 {
@@ -165,7 +176,7 @@ function setup_http_fake(): void
                     'created' => 1677143178,
                     'model' => 'text-davinci-003',
                     'choices' => [
-                        0 => [
+                        [
                             'text' => $text,
                             'index' => 0,
                             'logprobs' => null,

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -37,6 +37,8 @@ public static function tearDownAfterClass(): void
 
     /**
      * This method is called before each test.
+     *
+     * @throws \JsonException
      */
     protected function setUp(): void
     {

diff --git a/tests/Unit/ConfigManagerTest.php b/tests/Unit/ConfigManagerTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**
@@ -26,7 +34,7 @@
         ->expects($this->once())
         ->willReturn(false);
     expect(ConfigManager::localPath())->toBeString();
-})->skip()->group(__DIR__, __FILE__);
+})->group(__DIR__, __FILE__)->skip();
 
 it('can put local config file', function (): void {
     expect(ConfigManager::create())->putLocal()->toBeInt();

diff --git a/tests/Unit/Exceptions/HandlerTest.php b/tests/Unit/Exceptions/HandlerTest.php
@@ -1,6 +1,12 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
 /** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
 
 declare(strict_types=1);
 
@@ -12,37 +18,13 @@
  * This source file is subject to the MIT license that is bundled.
  */
 
-use App\Exceptions\Handler;
+use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Validation\Factory;
 use Illuminate\Validation\ValidationException;
-use Symfony\Component\Console\Output\OutputInterface;
 
-it('can render exception for console', function (): void {
-    $this->app['env'] = 'production';
-    $output = Mockery::spy(OutputInterface::class);
-    /** @noinspection PhpVoidFunctionResultUsedInspection */
-    expect($this->app->get(Handler::class))
-        ->renderForConsole(
-            $output,
-            new ValidationException(
-                $this->app->get(Factory::class)->make(
-                    ['foo' => 'bar'],
-                    ['foo' => 'int']
-                )
-            )
-        )->toBeNull()
-        ->renderForConsole(
-            $output,
-            Mockery::spy(\Exception::class)
+it('can map ValidationException', function (): void {
+    expect(app(ExceptionHandler::class))
+        ->report(
+            new ValidationException($this->app->get(Factory::class)->make(['foo' => 'bar'], ['foo' => 'int']))
         )->toBeNull();
 })->group(__DIR__, __FILE__);
-
-it('can report exception', function (): void {
-    $this->app['env'] = 'testing';
-    $exception = new Exception('foo');
-    $handler = $this->app->get(Handler::class);
-    expect($handler)->shouldReport($exception)->toBeTrue();
-
-    // $this->app['env'] = 'production';
-    // expect($handler)->shouldReport($exception)->toBeFalse();
-})->group(__DIR__, __FILE__)->skip();
diff --git a/tests/Unit/GeneratorManagerTest.php b/tests/Unit/GeneratorManagerTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**

diff --git a/tests/Unit/Generators/BitoGeneratorTest.php b/tests/Unit/Generators/BitoGeneratorTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**

diff --git a/tests/Unit/Generators/ErnieBotGeneratorTest.php b/tests/Unit/Generators/ErnieBotGeneratorTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**

diff --git a/tests/Unit/Generators/ErnieBotTurboGeneratorTest.php b/tests/Unit/Generators/ErnieBotTurboGeneratorTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**

diff --git a/tests/Unit/Generators/MoonshotGeneratorTest.php b/tests/Unit/Generators/MoonshotGeneratorTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**

diff --git a/tests/Unit/Generators/OpenAIChatGeneratorTest.php b/tests/Unit/Generators/OpenAIChatGeneratorTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**

diff --git a/tests/Unit/Generators/OpenAIGeneratorTest.php b/tests/Unit/Generators/OpenAIGeneratorTest.php
@@ -1,5 +1,13 @@
 <?php
 
+/** @noinspection AnonymousFunctionStaticInspection */
+/** @noinspection JsonEncodingApiUsageInspection */
+/** @noinspection NullPointerExceptionInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnusedAliasInspection */
+/** @noinspection StaticClosureCanBeUsedInspection */
+
 declare(strict_types=1);
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,8 @@ public static function tearDownAfterClass(): void @@
         /**
          * This method is called before each test.
+         *
+         * @throws \JsonException
          */
         protected function setUp(): void
         {
@@ Expand Down @@