Adapt dusk tests to GDPR

pradoslaw · Dec 21, 2023 · 706edfc · 706edfc
1 parent 8820fd2
commit 706edfc
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 33 deletions.
diff --git a/tests/Browser/ApiTokenTest.php b/tests/Browser/ApiTokenTest.php
@@ -12,7 +12,7 @@ class ApiTokenTest extends DuskTestCase
 
     public function testCreateToken()
     {
-        $user = factory(User::class)->create();
+        $user = factory(User::class)->create(['gdpr' => '{}']);
 
         $this->browse(function (Browser $browser) use ($user) {
             $browser
@@ -22,9 +22,8 @@ public function testCreateToken()
                 ->press('Dodaj')
                 ->waitForText('Twój nowy token')
                 ->press('OK')
-                ->assertSee($token);
-
-            $browser->logout();
+                ->assertSee($token)
+                ->logout();
         });
     }
 }
diff --git a/tests/Browser/ConfirmTest.php b/tests/Browser/ConfirmTest.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Tests\Browser;
 
 use Coyote\User;
@@ -8,12 +7,25 @@
 
 class ConfirmTest extends DuskTestCase
 {
+    public function tearDown(): void
+    {
+        parent::setUp();
+        $this->browse(fn(Browser $browser) => $browser->script('window.localStorage.clear()'));
+    }
+
     public function testSendVerificationEmail()
     {
-        $user = factory(User::class)->create(['password' => bcrypt('123'), 'is_confirm' => false]);
+        /** @var User $user */
+        $user = factory(User::class)->create([
+            'password'   => bcrypt('123'),
+            'is_confirm' => false,
+        ]);
 
         $this->browse(function (Browser $browser) use ($user) {
-            $browser->visit('/Confirm')
+            $browser
+                ->visit('/Confirm')
+                ->click('#gdpr-all')
+                ->waitUntilMissing('.gdpr-modal')
                 ->type('email', $user->email)
                 ->press('Wyślij e-mail z linkiem aktywacyjnym')
                 ->assertSee('Na podany adres e-mail został wysłany link aktywacyjny.');
@@ -26,6 +38,8 @@ public function testSendVerificationFailedToDueInvalidEmail()
 
         $this->browse(function (Browser $browser) use ($faker) {
             $browser->visit('/Confirm')
+                ->click('#gdpr-all')
+                ->waitUntilMissing('.gdpr-modal')
                 ->type('email', $faker->email)
                 ->press('Wyślij e-mail z linkiem aktywacyjnym')
                 ->assertSee('Podany adres e-mail nie istnieje.');
@@ -34,10 +48,13 @@ public function testSendVerificationFailedToDueInvalidEmail()
 
     public function testSendVerificationFailedToDuePreviousVerificationProcess()
     {
+        /** @var User $user */
         $user = factory(User::class)->create(['password' => bcrypt('123')]);
 
         $this->browse(function (Browser $browser) use ($user) {
             $browser->visit('/Confirm')
+                ->click('#gdpr-all')
+                ->waitUntilMissing('.gdpr-modal')
                 ->type('email', $user->email)
                 ->press('Wyślij e-mail z linkiem aktywacyjnym')
                 ->assertSee('Ten adres e-mail jest już zweryfikowany.');
@@ -46,7 +63,8 @@ public function testSendVerificationFailedToDuePreviousVerificationProcess()
 
     public function testSendVerificationEmailWithDifferentEmail()
     {
-        $user = factory(User::class)->create(['password' => bcrypt('123'), 'is_confirm' => false]);
+        /** @var User $user */
+        $user = factory(User::class)->create(['password' => bcrypt('123'), 'is_confirm' => false, 'gdpr' => '{}']);
         $faker = Factory::create();
 
         $this->browse(function (Browser $browser) use ($user, $faker) {

diff --git a/tests/Browser/ForumTest.php b/tests/Browser/ForumTest.php
@@ -34,7 +34,7 @@ public function testShowValidateErrors()
     public function testWriteTopic()
     {
         $forum = $this->createForum();
-        $user = factory(User::class)->create(['reputation' => 5000]);
+        $user = factory(User::class)->create(['reputation' => 5000, 'gdpr' => '{}']);
 
         $this->browse(function (Browser $browser) use ($forum, $user) {
             $faker = Factory::create();

diff --git a/tests/Browser/JobApplicationTest.php b/tests/Browser/JobApplicationTest.php
@@ -13,8 +13,6 @@ class JobApplicationTest extends DuskTestCase
 
     public function testSuccessfulSubmitJobApplication()
     {
-
-
         try {
             $mpdf = new Mpdf(['tempDir' => storage_path('app')]);
             $mpdf->WriteHTML($this->faker->text);
@@ -24,16 +22,15 @@ public function testSuccessfulSubmitJobApplication()
             $this->browse(function (Browser $browser) {
                 $job = factory(Job::class)->create(['email' => $this->faker->email]);
 
-                $browser->visit('/Praca/Application/' . $job->id)
+                $browser
+                    ->visit('/Praca/Application/' . $job->id)
                     ->resize(1920, 1080)
                     ->check('label[for="enable-invoice"]')
                     ->attach('.thumbnail-mask', storage_path('demo.pdf'))
-
                     ->type('name', $name = $this->faker->name)
                     ->type('email', $email = $this->faker->email)
                     ->type('phone', $phone = $this->faker->phoneNumber)
                     ->type('github', $url = $this->faker->url)
-
                     ->press('Wyślij')
                     ->waitForText('Zgłoszenie zostało prawidłowo wysłane.');
 

diff --git a/tests/Browser/JobPostingTest.php b/tests/Browser/JobPostingTest.php
@@ -16,17 +16,17 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->user = factory(User::class)->create();
+        $this->user = factory(User::class)->create(['gdpr' => '{}']);
     }
 
     public function testSubmitWithoutFirm()
     {
         $fake = Factory::create();
 
         $this->browse(function (Browser $browser) use ($fake) {
-            $browser->loginAs($this->user);
-
-            $browser->visit('/Praca/Submit')
+            $browser
+                ->loginAs($this->user)
+                ->visit('/Praca/Submit')
                 ->resize(1920, 1080)
                 ->type('title', $title = $fake->text(50))
                 ->type('salary_from', $salaryFrom = $fake->numberBetween(0, 999))
@@ -39,9 +39,8 @@ public function testSubmitWithoutFirm()
                 ->clickLink('Powrót do ogłoszenia')
                 ->assertSeeIn('.media-heading', $title)
                 ->assertSeeIn('.salary', $salaryFrom)
-                ->assertSeeIn('.salary', '₣');
-
-            $browser->logout();
+                ->assertSeeIn('.salary', '₣')
+                ->logout();
         });
     }
 

diff --git a/tests/Browser/RegisterTest.php b/tests/Browser/RegisterTest.php
@@ -14,16 +14,18 @@ public function testRegisterUser()
         $this->browse(function (Browser $browser) {
             $faker = Factory::create();
 
-            $browser->visit('/Register')
-                    ->type('name', $faker->userName)
-                    ->type('email', $faker->email)
-                    ->type('password', $password = $faker->password)
-                    ->type('password_confirmation', $password)
-                    ->check('label[for="terms"]')
-                    ->press('Utwórz konto')
-                    ->assertPathIs('/User');
-
-            $browser->logout();
+            $browser
+                ->visit('/Register')
+                ->click('#gdpr-all')
+                ->waitUntilMissing('.gdpr-modal')
+                ->type('name', $faker->userName)
+                ->type('email', $faker->email)
+                ->type('password', $password = $faker->password)
+                ->type('password_confirmation', $password)
+                ->check('label[for="terms"]')
+                ->press('Utwórz konto')
+                ->assertPathIs('/User')
+                ->logout();
         });
     }
 

diff --git a/tests/Browser/UserAccountTest.php b/tests/Browser/UserAccountTest.php
@@ -11,7 +11,7 @@ class UserAccountTest extends DuskTestCase
 {
     public function testDeleteAccountWithPassword()
     {
-        $user = factory(User::class)->create(['password' => Hash::make('123')]);
+        $user = factory(User::class)->create(['password' => Hash::make('123'), 'gdpr' => '{}']);
 
         $this->browse(function (Browser $browser) use ($user) {
             $faker = Factory::create();
@@ -34,7 +34,7 @@ public function testDeleteAccountWithPassword()
 
     public function testDeleteAccountWithoutPassword()
     {
-        $user = factory(User::class)->create(['password' => null]);
+        $user = factory(User::class)->create(['password' => null, 'gdpr' => '{}']);
 
         $this->browse(function (Browser $browser) use ($user) {
             $browser