Fix Tests

thettler · May 7, 2023 · 6eb1c22 · 6eb1c22
1 parent 6f49954
commit 6eb1c22
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/tests/ConsoleInputAutoAskTest.php b/tests/ConsoleInputAutoAskTest.php
@@ -2,6 +2,8 @@
 
 use Illuminate\Console\Application as Artisan;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\App;
+use Illuminate\Translation\Translator;
 use Thettler\LaravelConsoleToolkit\Attributes\Argument;
 use Thettler\LaravelConsoleToolkit\Attributes\Option;
 use Thettler\LaravelConsoleToolkit\Concerns\UsesConsoleToolkit;
@@ -143,11 +145,12 @@ public function handle()
     };
 
     Artisan::starting(fn (Artisan $artisan) => $artisan->add($command));
+    $translator = App::make(Translator::class);
 
     \Pest\Laravel\artisan('validate LongerThan5 --shortOption=alsoLonger')
-        ->expectsOutput('The short argument must not be greater than 5 characters.')
+        ->expectsOutput($translator->get('validation.max.string', ['attribute' => 'short argument', 'max' => 5]))
         ->expectsQuestion('Please enter "shortArgument"', 'short')
-        ->expectsOutput('The short option must not be greater than 5 characters.')
+        ->expectsOutput($translator->get('validation.max.string', ['attribute' => 'short option', 'max' => 5]))
         ->expectsQuestion('Please enter "shortOption"', 'small')
         ->expectsOutput('short small')
         ->assertSuccessful();

diff --git a/tests/ConsoleInputValidationTest.php b/tests/ConsoleInputValidationTest.php
@@ -2,6 +2,8 @@
 
 use Illuminate\Console\Application as Artisan;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\App;
+use Illuminate\Translation\Translator;
 use Thettler\LaravelConsoleToolkit\Attributes\Argument;
 use Thettler\LaravelConsoleToolkit\Attributes\Option;
 use Thettler\LaravelConsoleToolkit\Concerns\UsesConsoleToolkit;
@@ -30,15 +32,17 @@
 
         public function handle()
         {
-            $this->line($this->shortArgument . ' ' . $this->shortOption);
+            $this->line($this->shortArgument.' '.$this->shortOption);
         }
     };
 
-    Artisan::starting(fn (Artisan $artisan) => $artisan->add($command));
+    Artisan::starting(fn(Artisan $artisan) => $artisan->add($command));
+
+    $translator = App::make(Translator::class);
 
     \Pest\Laravel\artisan('validate LongerThan5 --shortOption=alsoLonger')
-        ->expectsOutput('The short argument must not be greater than 5 characters.')
-        ->expectsOutput('The short option must not be greater than 5 characters.')
+        ->expectsOutput($translator->get('validation.max.string', ['attribute' => 'short argument', 'max' => 5]))
+        ->expectsOutput($translator->get('validation.max.string', ['attribute' => 'short option', 'max' => 5]))
         ->doesntExpectOutput('LongerThan5 alsoLonger')
         ->assertFailed();
 });
@@ -59,23 +63,23 @@ public function handle()
 
         public function handle()
         {
-            $this->line($this->A->name . ' ' . $this->O->value);
+            $this->line($this->A->name.' '.$this->O->value);
         }
     };
 
-    Artisan::starting(fn (Artisan $artisan) => $artisan->add($command));
+    Artisan::starting(fn(Artisan $artisan) => $artisan->add($command));
 
     \Pest\Laravel\artisan('validate notValid --O=notValid')
         ->expectsOutput('The selected a is invalid.')
         ->expectsOutput('Possible values for: A.')
-        ->expectsOutput('   - ' . Enum::A->name)
-        ->expectsOutput('   - ' . Enum::B->name)
-        ->expectsOutput('   - ' . Enum::C->name)
+        ->expectsOutput('   - '.Enum::A->name)
+        ->expectsOutput('   - '.Enum::B->name)
+        ->expectsOutput('   - '.Enum::C->name)
         ->expectsOutput('The selected o is invalid.')
         ->expectsOutput('Possible values for: O.')
-        ->expectsOutput('   - ' . StringEnum::A->value)
-        ->expectsOutput('   - ' . StringEnum::B->value)
-        ->expectsOutput('   - ' . StringEnum::C->value)
+        ->expectsOutput('   - '.StringEnum::A->value)
+        ->expectsOutput('   - '.StringEnum::B->value)
+        ->expectsOutput('   - '.StringEnum::C->value)
         ->assertFailed();
 });
 
@@ -105,11 +109,11 @@ public function handle()
 
         public function handle()
         {
-            $this->line($this->shortArgument . ' ' . $this->shortOption);
+            $this->line($this->shortArgument.' '.$this->shortOption);
         }
     };
 
-    Artisan::starting(fn (Artisan $artisan) => $artisan->add($command));
+    Artisan::starting(fn(Artisan $artisan) => $artisan->add($command));
 
     \Pest\Laravel\artisan('validate LongerThan5 --shortOption=alsoLonger')
         ->expectsOutput('This argument short argument is to long for you boy.')