Merge pull request #629 from ManukMinasyan/fix/rule-no-blank-characters

Fix tests by changing the error message in NoBlankCharacters validation rule.
pinkary-project · Sep 19, 2024 · 01fa892 · 01fa892
2 parents b29cf26 + 4bc65a5
commit 01fa892
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/app/Rules/NoBlankCharacters.php b/app/Rules/NoBlankCharacters.php
@@ -9,16 +9,22 @@
 
 final readonly class NoBlankCharacters implements ValidationRule
 {
+    private const string BLANK_CHARACTERS_PATTERN = '/^[\s\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200A}\x{2028}\x{205F}\x{3000}]*$/u';
+
+    private const string FORMAT_CHARACTERS_PATTERN = '/\p{Cf}/u';
+
     /**
-     * Run the validation rule.
+     * Validate the value of the given attribute.
      *
+     * @param  string  $attribute  The name of the attribute being validated
+     * @param  mixed  $value  The value of the attribute
      * @param  Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
         $value = type($value)->asString();
 
-        if (preg_match("/\p{Cf}/u", $value)) {
+        if (preg_match(self::BLANK_CHARACTERS_PATTERN, $value) || preg_match(self::FORMAT_CHARACTERS_PATTERN, $value)) {
             $fail('The :attribute field cannot contain blank characters.');
         }
     }

diff --git a/tests/Unit/Rules/NoBlankCharactersTest.php b/tests/Unit/Rules/NoBlankCharactersTest.php
@@ -4,14 +4,18 @@
 
 use App\Rules\NoBlankCharacters;
 
-test('with blank characters', function (string $name) {
+test('validation fails for strings containing blank characters', function (string $name) {
     $rule = new NoBlankCharacters;
 
-    $fail = fn (string $errorMessage) => $this->fail($errorMessage);
+    $fail = function (string $errorMessage) {
+        // Capture the error message
+        $this->errorMessage = $errorMessage;
+    };
 
+    // Validate the input
     $rule->validate('name', $name, $fail);
 
-    expect(true)->toBeFalse();
+    expect(isset($this->errorMessage))->toBeTrue();
 })->with([
     "\u{200E}",
     "\u{200E}\u{200E}",
@@ -22,7 +26,18 @@
     "测试\u{200E}",
     "ⓣⓔⓢⓣ\u{200E}",
     '  ',
-])->fails();
+    "\u{2005}",
+    "\u{2006}",
+    "\u{2007}",
+    "\u{2008}",
+    "\u{2009}",
+    "\u{200A}",
+    "\u{2028}",
+    "\u{205F}",
+    "\u{3000}",
+    " \u{2005} ",
+    "\u{2007}\u{2008}\u{2009}",
+]);
 
 test('without blank characters', function (string $name) {
     $rule = new NoBlankCharacters;
@@ -35,4 +50,5 @@
 })->with([
     'Nuno Maduro',
     'Taylor Otwell',
+    'ManukMinasyan'
 ]);