Fix tests

Author: driesvints

tests/Feature/ForumTest.php

@@ -65,14 +65,12 @@ public function the_thread_subject_cannot_be_an_url()
 
         $this->login();
 
-        $this->visit('/forum/create-thread')
-            ->submitForm('Create Thread', [
+        $this->post('/forum/create-thread', [
                 'subject' => 'http://example.com Foo title',
                 'body' => 'This text explains how to work with Eloquent.',
                 'tags' => [$tag->id()],
             ])
-            ->seePageIs('/forum/create-thread')
-            ->see('The subject field cannot contain an url.');
+            ->assertSessionHasErrors(['subject' => 'The subject field cannot contain an url.']);
     }
 
     /** @test */
@@ -82,16 +80,13 @@ public function users_can_create_a_thread()
 
         $this->login();
 
-        $this->visit('/forum/create-thread')
-            ->submitForm('Create Thread', [
+        $this->post('/forum/create-thread', [
                 'subject' => 'How to work with Eloquent?',
                 'body' => 'This text explains how to work with Eloquent.',
                 'tags' => [$tag->id()],
             ])
-            ->seePageIs('/forum/how-to-work-with-eloquent')
-            ->see('How to work with Eloquent?')
-            ->see('Test Tag')
-            ->see('Thread successfully created!');
+            ->assertRedirectedTo('/forum/how-to-work-with-eloquent')
+            ->assertSessionHas('success', 'Thread successfully created!');
     }
 
     /** @test */
@@ -106,16 +101,13 @@ public function users_can_edit_a_thread()
 
         $this->loginAs($user);
 
-        $this->visit('/forum/my-first-thread/edit')
-            ->submitForm('Update Thread', [
+        $this->put('/forum/my-first-thread', [
                 'subject' => 'How to work with Eloquent?',
                 'body' => 'This text explains how to work with Eloquent.',
                 'tags' => [$tag->id()],
             ])
-            ->seePageIs('/forum/how-to-work-with-eloquent')
-            ->see('How to work with Eloquent?')
-            ->see('Test Tag')
-            ->see('Thread successfully updated!');
+            ->assertRedirectedTo('/forum/how-to-work-with-eloquent')
+            ->assertSessionHas('success', 'Thread successfully updated!');
     }
 
     /** @test */
@@ -147,15 +139,14 @@ public function users_cannot_create_a_thread_with_a_subject_that_is_too_long()
 
         $this->login();
 
-        $this->visit('/forum/create-thread')
-            ->submitForm('Create Thread', [
-                'subject' => 'How to make Eloquent, Doctrine, Entities and Annotations work together in Laravel?',
-                'body' => 'This is a thread with 82 characters in the subject',
-                'tags' => [$tag->id()],
-            ])
-            ->seePageIs('/forum/create-thread')
-            ->see('Something went wrong. Please review the fields below.')
-            ->see('The subject may not be greater than 60 characters.');
+        $response = $this->post('/forum/create-thread', [
+            'subject' => 'How to make Eloquent, Doctrine, Entities and Annotations work together in Laravel?',
+            'body' => 'This is a thread with 82 characters in the subject',
+            'tags' => [$tag->id()],
+        ]);
+
+        $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+        $response->assertSessionHasErrors(['subject' => 'The subject may not be greater than 60 characters.']);
     }
 
     /** @test */
@@ -170,14 +161,13 @@ public function users_cannot_edit_a_thread_with_a_subject_that_is_too_long()
 
         $this->loginAs($user);
 
-        $this->visit('/forum/my-first-thread/edit')
-            ->submitForm('Update Thread', [
-                'subject' => 'How to make Eloquent, Doctrine, Entities and Annotations work together in Laravel?',
-                'body' => 'This is a thread with 82 characters in the subject',
-                'tags' => [$tag->id()],
-            ])
-            ->seePageIs('/forum/my-first-thread/edit')
-            ->see('Something went wrong. Please review the fields below.')
-            ->see('The subject may not be greater than 60 characters.');
+        $response = $this->put('/forum/my-first-thread', [
+            'subject' => 'How to make Eloquent, Doctrine, Entities and Annotations work together in Laravel?',
+            'body' => 'This is a thread with 82 characters in the subject',
+            'tags' => [$tag->id()],
+        ]);
+
+        $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+        $response->assertSessionHasErrors(['subject' => 'The subject may not be greater than 60 characters.']);
     }
 }

tests/Feature/ReplyTest.php

@@ -15,16 +15,16 @@ class ReplyTest extends BrowserKitTestCase
     /** @test */
     public function users_can_add_a_reply_to_a_thread()
     {
-        factory(Thread::class)->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
+        $thread = factory(Thread::class)->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
 
         $this->login();
 
-        $this->visit('/forum/the-first-thread')
-            ->type('The first reply', 'body')
-            ->press('Reply')
-            ->see('The first thread')
-            ->see('The first reply')
-            ->see('Reply successfully added!');
+        $this->post('/replies', [
+                'body' => 'The first reply',
+                'replyable_id' => $thread->id,
+                'replyable_type' => Thread::TABLE,
+            ])
+            ->assertSessionHas('success', 'Reply successfully added!');
     }
 
     /** @test */
@@ -36,12 +36,11 @@ public function users_can_edit_a_reply()
 
         $this->loginAs($user);
 
-        $this->visit('/replies/1/edit')
-            ->type('The edited reply', 'body')
-            ->press('Update')
-            ->seePageIs('/forum/the-first-thread')
-            ->see('The edited reply')
-            ->see('Reply successfully updated!');
+        $this->put('/replies/1', [
+                'body' => 'The edited reply',
+            ])
+            ->assertRedirectedTo('/forum/the-first-thread')
+            ->assertSessionHas('success', 'Reply successfully updated!');
     }
 
     /** @test */