From ea5d4fa0e8070fd2e5551ac466794994b8c8415d Mon Sep 17 00:00:00 2001 From: bretto36 Date: Thu, 16 Jun 2016 20:03:47 -0400 Subject: [PATCH] Added Organiser Events Test fixed model factory --- .../OrganiserDashboardController.php | 1 - .../Controllers/OrganiserEventsController.php | 1 - .../Controllers/OrganiserViewController.php | 1 - app/Http/Controllers/UserController.php | 2 +- database/factories/ModelFactory.php | 2 +- tests/OrganiserCustomizeTest.php | 26 +++++++++++++++ tests/OrganiserEventsTest.php | 32 +++++++++++++++++++ tests/OrganiserTest.php | 19 +---------- tests/UserTest.php | 4 +-- 9 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 tests/OrganiserCustomizeTest.php create mode 100644 tests/OrganiserEventsTest.php diff --git a/app/Http/Controllers/OrganiserDashboardController.php b/app/Http/Controllers/OrganiserDashboardController.php index 7ef03109..eeeae11c 100644 --- a/app/Http/Controllers/OrganiserDashboardController.php +++ b/app/Http/Controllers/OrganiserDashboardController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers; 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 index de21996d..f27b7494 100644 --- a/app/Http/Controllers/OrganiserEventsController.php +++ b/app/Http/Controllers/OrganiserEventsController.php @@ -8,7 +8,6 @@ use Illuminate\Http\Request; class OrganiserEventsController extends MyBaseController { - /** * Show the organiser events page * diff --git a/app/Http/Controllers/OrganiserViewController.php b/app/Http/Controllers/OrganiserViewController.php index 55f7c4a8..8f1ec74d 100644 --- a/app/Http/Controllers/OrganiserViewController.php +++ b/app/Http/Controllers/OrganiserViewController.php @@ -9,7 +9,6 @@ use Illuminate\Http\Request; class OrganiserViewController extends Controller { - /** * Show the public organiser page * diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ad691d3f..6b07e76c 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -72,7 +72,7 @@ class UserController extends Controller 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 index 00232e44..ee70cce2 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -139,7 +139,7 @@ $factory->define(App\Models\Organiser::class, function (Faker\Generator $faker) $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 new file mode 100644 index 00000000..c21345c1 --- /dev/null +++ b/tests/OrganiserCustomizeTest.php @@ -0,0 +1,26 @@ +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 new file mode 100644 index 00000000..c6bf636d --- /dev/null +++ b/tests/OrganiserEventsTest.php @@ -0,0 +1,32 @@ +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 index 01b50ab4..c9be7f8e 100644 --- a/tests/OrganiserTest.php +++ b/tests/OrganiserTest.php @@ -7,7 +7,7 @@ use App\Models\Organiser; 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 @@ class OrganiserTest extends TestCase '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 index 55d3fd67..54102eae 100644 --- a/tests/UserTest.php +++ b/tests/UserTest.php @@ -28,7 +28,7 @@ class UserTest extends TestCase $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 @@ class UserTest extends TestCase $this->seeJson([ 'status' => 'success', - 'message' => 'Successfully Edited User', + 'message' => 'Successfully Saved Details', ]); $user = App\Models\User::find($this->test_user->id);