Added Organiser Events Test fixed model factory

Attendize · Jun 17, 2016 · ea5d4fa · ea5d4fa
1 parent adf16e7
commit ea5d4fa
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 25 deletions.
diff --git a/app/Http/Controllers/OrganiserDashboardController.php b/app/Http/Controllers/OrganiserDashboardController.php
@@ -4,7 +4,6 @@
 
 use App\Models\Organiser;
 use Carbon\Carbon;
-use DB;
 
 class OrganiserDashboardController extends MyBaseController
 {

diff --git a/app/Http/Controllers/OrganiserEventsController.php b/app/Http/Controllers/OrganiserEventsController.php
@@ -8,7 +8,6 @@
 
 class OrganiserEventsController extends MyBaseController
 {
-
     /**
      * Show the organiser events page
      *

diff --git a/app/Http/Controllers/OrganiserViewController.php b/app/Http/Controllers/OrganiserViewController.php
@@ -9,7 +9,6 @@
 
 class OrganiserViewController extends Controller
 {
-
     /**
      * Show the public organiser page
      *

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -72,7 +72,7 @@ public function postEditUser(Request $request)
 
         return response()->json([
             'status'  => 'success',
-            'message' => 'Successfully Edited User',
+            'message' => 'Successfully Saved Details',
         ]);
     }
 }
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
@@ -139,7 +139,7 @@
 
 $factory->define(App\Models\Event::class, function (Faker\Generator $faker) {
     return [
-        'title'                      => $faker->title,
+        'title'                      => $faker->name,
         'location'                   => $faker->text,
         'bg_type'                    => 'color',
         'bg_color'                   => config('attendize.event_default_bg_color'),

diff --git a/tests/OrganiserCustomizeTest.php b/tests/OrganiserCustomizeTest.php
@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Models\Organiser;
+
+class OrganiserCustomizeTest extends TestCase
+{
+    public function test_customize_organiser_is_successful()
+    {
+        $organiser = factory(App\Models\Organiser::class)->create();
+
+        $this->actingAs($this->test_user)
+            ->visit(route('showOrganiserCustomize', ['organiser_id' => $organiser->id]))
+            ->type($this->faker->name, 'name')
+            ->type($this->faker->email, 'email')
+            ->type($this->faker->email, 'about')
+            ->type($this->faker->word, 'facebook')
+            ->type($this->faker->word, 'twitter')
+            ->press('Create Organiser')
+            ->seeJson([
+                'status' => 'success'
+            ]);
+    }
+}
diff --git a/tests/OrganiserEventsTest.php b/tests/OrganiserEventsTest.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use App\Models\Organiser;
+
+class OrganiserEventsTest extends TestCase
+{
+    public function test_show_events_displays_events()
+    {
+        $organiser = factory(App\Models\Organiser::class)->create(['account_id' => 1]);
+
+        $event1 = factory(App\Models\Event::class)->create([
+            'account_id'   => $organiser->account_id,
+            'organiser_id' => $organiser->id,
+            'user_id'      => $this->test_user->id,
+        ]);
+
+        $event2 = factory(App\Models\Event::class)->create([
+            'account_id'   => $organiser->account_id,
+            'organiser_id' => $organiser->id,
+            'user_id'      => $this->test_user->id,
+        ]);
+
+        $this->actingAs($this->test_user)
+            ->visit(route('showOrganiserEvents', ['organiser_id' => $organiser->id]))
+            ->see($event1->title)
+            ->see($event2->title)
+            ->see('2 events');
+    }
+}
diff --git a/tests/OrganiserTest.php b/tests/OrganiserTest.php
@@ -7,7 +7,7 @@
 
 class OrganiserTest extends TestCase
 {
-    public function testCreateOrganiser()
+    public function test_create_organiser_is_successful()
     {
         $this->actingAs($this->test_user)
             ->visit(route('showCreateOrganiser'))
@@ -21,21 +21,4 @@ public function testCreateOrganiser()
                 'status' => 'success'
             ]);
     }
-
-    public function testEditOrganiser()
-    {
-        $organiser = factory(App\Models\Organiser::class)->create();
-
-        $this->actingAs($this->test_user)
-            ->visit(route('showOrganiserCustomize', ['organiser_id' => $organiser->id]))
-            ->type($this->faker->name, 'name')
-            ->type($this->faker->email, 'email')
-            ->type($this->faker->email, 'about')
-            ->type($this->faker->word, 'facebook')
-            ->type($this->faker->word, 'twitter')
-            ->press('Create Organiser')
-            ->seeJson([
-                'status' => 'success'
-            ]);
-    }
 }
diff --git a/tests/UserTest.php b/tests/UserTest.php
@@ -28,7 +28,7 @@ public function test_edit_user_is_successful()
 
         $this->seeJson([
             'status' => 'success',
-            'message' => 'Successfully Edited User',
+            'message' => 'Successfully Saved Details',
         ]);
 
         $user = App\Models\User::find($this->test_user->id);
@@ -64,7 +64,7 @@ public function test_edit_user_is_successful_when_changing_password()
 
         $this->seeJson([
             'status' => 'success',
-            'message' => 'Successfully Edited User',
+            'message' => 'Successfully Saved Details',
         ]);
 
         $user = App\Models\User::find($this->test_user->id);