Merge pull request #37 from clarkeash/fix/case-sensitivity

fix case-sensitivity
clarkeash · Oct 14, 2018 · 7cdfe6e · 7cdfe6e
2 parents e7228e8 + ce8735a
commit 7cdfe6e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 17 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Generator.php b/src/Generator.php
@@ -5,6 +5,7 @@
 use Carbon\Carbon;
 use Clarkeash\Doorman\Exceptions\DuplicateException;
 use Clarkeash\Doorman\Models\Invite;
+use Illuminate\Support\Str;
 
 class Generator
 {
@@ -94,7 +95,7 @@ public function expiresIn($days = 14)
     protected function build(): Invite
     {
         $invite = new Invite;
-        $invite->code = $this->manager->code();
+        $invite->code = Str::upper($this->manager->code());
         $invite->for = $this->email;
         $invite->max = $this->uses;
         $invite->valid_until = $this->expiry;

diff --git a/tests/Feature/CheckInvitesTest.php b/tests/Feature/CheckInvitesTest.php
@@ -100,4 +100,18 @@ public function it_can_have_unlimited_redemptions()
             Assert::assertTrue(Doorman::check('ABCDE'));
         }
     }
+
+    /**
+    * @test
+    */
+    public function it_is_not_case_sensitive()
+    {
+        Invite::forceCreate([
+            'code' => 'ABCDE',
+        ]);
+
+        Assert::assertTrue(Doorman::check('ABCDE'));
+        Assert::assertTrue(Doorman::check('abcde'));
+        Assert::assertTrue(Doorman::check('AbCdE'));
+    }
 }
diff --git a/tests/Feature/GenerateInvitesTest.php b/tests/Feature/GenerateInvitesTest.php
@@ -115,4 +115,16 @@ public function only_one_invite_per_email_can_be_generated_2()
     {
         Doorman::generate()->for('me@ashleyclarke.me')->times(3)->make();
     }
+
+    /**
+    * @test
+    */
+    public function generated_codes_should_always_be_uppercase()
+    {
+        Doorman::generate()->make();
+
+        $invite = Invite::first();
+
+        Assert::assertEquals(strtoupper($invite->code), $invite->code);
+    }
 }