Laravel 5.4 updates and test updates

GrafiteInc · Jan 27, 2017 · 5dca45d · 5dca45d
1 parent 24fc74b
commit 5dca45d
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 44 deletions.
diff --git a/composer.json b/composer.json
@@ -15,18 +15,17 @@
     "require": {
         "php": ">=5.6.4",
         "doctrine/dbal": "^2.5",
-        "illuminate/support": "5.3.*",
-        "yab/formmaker": "1.0.*",
-        "yab/crudmaker": "1.1.*",
+        "illuminate/support": "5.4.*",
+        "yab/crudmaker": "1.2.*",
+        "yab/formmaker": "1.1.*",
         "yab/crypto": "~1.0",
         "yab/cerebrum": "~1.0",
         "yab/laratest": "~0.1"
     },
     "require-dev": {
-        "illuminate/container": "5.3.*",
         "mockery/mockery": "^0.9.4",
         "mikey179/vfsStream": "^1.6",
-        "orchestra/testbench": "^3.3"
+        "orchestra/testbench": "3.4.*|3.4-dev"
     },
     "autoload": {
         "psr-4": {
@@ -38,5 +37,6 @@
             "tests/TestCase.php"
         ]
     },
-    "minimum-stability": "stable"
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/.../Billing/tests/BillingIntegrationTest.php → .../tests/Feature/BillingIntegrationTest.php b/.../Billing/tests/BillingIntegrationTest.php → .../tests/Feature/BillingIntegrationTest.php
@@ -23,20 +23,20 @@ public function testIndex()
     {
         $response = $this->actor->call('GET', '/user/billing/details');
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertViewHas('user');
+        $response->assertViewHas('user');
     }
 
     public function testChangeCard()
     {
         $response = $this->actor->call('GET', '/user/billing/change-card');
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertViewHas('user');
+        $response->assertViewHas('user');
     }
 
     public function testCoupon()
     {
         $response = $this->actor->call('GET', '/user/billing/coupon');
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertViewHas('user');
+        $response->assertViewHas('user');
     }
 }
diff --git a/...ons/tests/NotificationIntegrationTest.php → ...s/Feature/NotificationIntegrationTest.php b/...ons/tests/NotificationIntegrationTest.php → ...s/Feature/NotificationIntegrationTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Tests\TestCase;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
@@ -30,15 +31,19 @@ public function setUp()
             'details' => 'Your car has been impounded!',
             'is_read' => 1,
         ]);
-        $user = factory({{App\}}Models\User::class)->make();
+
+        $role = factory({{App\}}Models\Role::class)->create();
+        $user = factory({{App\}}Models\User::class)->create();
+        $user->roles()->attach($role);
+
         $this->actor = $this->actingAs($user);
     }
 
     public function testIndex()
     {
         $response = $this->actor->call('GET', 'admin/notifications');
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertViewHas('notifications');
+        $response->assertViewHas('notifications');
     }
 
     public function testCreate()
@@ -52,7 +57,7 @@ public function testStore()
         $response = $this->actor->call('POST', 'admin/notifications', $this->notification->toArray());
 
         $this->assertEquals(302, $response->getStatusCode());
-        $this->assertRedirectedTo('admin/notifications/'.$this->notification->id.'/edit');
+        $response->assertRedirect('admin/notifications/'.$this->notification->id.'/edit');
     }
 
     public function testEdit()
@@ -61,7 +66,7 @@ public function testEdit()
 
         $response = $this->actor->call('GET', 'admin/notifications/'.$this->notification->id.'/edit');
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertViewHas('notification');
+        $response->assertViewHas('notification');
     }
 
     public function testUpdate()
@@ -70,8 +75,8 @@ public function testUpdate()
         $response = $this->actor->call('PATCH', 'admin/notifications/1', $this->notificationEdited->toArray());
 
         $this->assertEquals(302, $response->getStatusCode());
-        $this->seeInDatabase('notifications', $this->notificationEdited->toArray());
-        $this->assertRedirectedTo('/');
+        $this->assertDatabaseHas('notifications', $this->notificationEdited->toArray());
+        $response->assertRedirect('/');
     }
 
     public function testDelete()
@@ -80,6 +85,6 @@ public function testDelete()
 
         $response = $this->call('DELETE', 'admin/notifications/'.$this->notification->id);
         $this->assertEquals(302, $response->getStatusCode());
-        $this->assertRedirectedTo('admin/notifications');
+        $response->assertRedirect('admin/notifications');
     }
 }
diff --git a/...cations/tests/NotificationServiceTest.php → ...ns/tests/Unit/NotificationServiceTest.php b/...cations/tests/NotificationServiceTest.php → ...ns/tests/Unit/NotificationServiceTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Tests\TestCase;
 use {{App\}}Services\NotificationService;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
@@ -10,6 +11,10 @@ class NotificationServiceTest extends TestCase
     public function setUp()
     {
         parent::setUp();
+        $role = factory({{App\}}Models\Role::class)->create();
+        $user = factory({{App\}}Models\User::class)->create();
+        $this->app->make({{App\}}Services\UserService::class)->create($user, 'password');
+
         $this->service = $this->app->make(NotificationService::class);
         $this->originalArray = [
             'user_id' => 1,
@@ -55,7 +60,7 @@ public function testSearch()
     public function testCreate()
     {
         $response = $this->service->create($this->originalArray);
-        $this->assertEquals(get_class($response), 'App\Models\Notification');
+        $this->assertEquals(get_class($response), '{{App\}}Models\Notification');
         $this->assertEquals(1, $response->id);
     }
 
@@ -76,7 +81,7 @@ public function testUpdate()
         $response = $this->service->update($item->id, $this->editedArray);
 
         $this->assertEquals(1, $response->id);
-        $this->seeInDatabase('notifications', $this->editedArray);
+        $this->assertDatabaseHas('notifications', $this->editedArray);
     }
 
     public function testDestroy()
@@ -87,6 +92,4 @@ public function testDestroy()
         $response = $this->service->destroy($item->id);
         $this->assertTrue($response);
     }
-
 }
-
diff --git a/...ges/Starter/tests/TeamIntegrationTest.php → ...ter/tests/Feature/TeamIntegrationTest.php b/...ges/Starter/tests/TeamIntegrationTest.php → ...ter/tests/Feature/TeamIntegrationTest.php
@@ -44,7 +44,7 @@ public function testIndex()
     {
         $response = $this->actor->call('GET', '/teams');
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertViewHas('teams');
+        $response->assertViewHas('teams');
     }
 
     public function testCreate()
@@ -59,7 +59,7 @@ public function testStore()
         $response = $this->actingAs($admin)->call('POST', 'teams', $this->team->toArray());
 
         $this->assertEquals(302, $response->getStatusCode());
-        $this->assertRedirectedTo('teams/'.$this->team->id.'/edit');
+        $response->assertRedirect('teams/'.$this->team->id.'/edit');
     }
 
     public function testEdit()
@@ -70,7 +70,7 @@ public function testEdit()
 
         $response = $this->actingAs($admin)->call('GET', '/teams/'.$this->team->id.'/edit');
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertViewHas('team');
+        $response->assertViewHas('team');
     }
 
     public function testUpdate()
@@ -82,8 +82,8 @@ public function testUpdate()
         $response = $this->actingAs($admin)->call('PATCH', '/teams/1', $this->teamEdited->toArray());
 
         $this->assertEquals(302, $response->getStatusCode());
-        $this->seeInDatabase('teams', $this->teamEdited->toArray());
-        $this->assertRedirectedTo('/');
+        $this->assertDatabaseHas('teams', $this->teamEdited->toArray());
+        $response->assertRedirect('/');
     }
 
     public function testDelete()
@@ -98,6 +98,6 @@ public function testDelete()
 
         $response = $this->actingAs($admin)->call('DELETE', '/teams/'.$team->id);
         $this->assertEquals(302, $response->getStatusCode());
-        $this->assertRedirectedTo('/teams');
+        $response->assertRedirect('/teams');
     }
 }
diff --git a/...ackages/Starter/tests/RoleServiceTest.php → ...es/Starter/tests/Unit/RoleServiceTest.php b/...ackages/Starter/tests/RoleServiceTest.php → ...es/Starter/tests/Unit/RoleServiceTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Tests\TestCase;
 use {{App\}}Services\RoleService;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
@@ -20,19 +21,19 @@ public function setUp()
             'id' => 1,
             'name' => 'coders',
             'label' => 'Coders',
-            'permissions' => ['super' => 'on']
+            'permissions' => ['super' => 'on'],
         ];
         $this->modifiedArray = [
             'id' => 1,
             'name' => 'hackers',
             'label' => 'Hackers',
-            'permissions' => []
+            'permissions' => [],
         ];
         $this->editedArray = [
             'id' => 1,
             'name' => 'hackers',
             'label' => 'Hackers',
-            'permissions' => ''
+            'permissions' => '',
         ];
         $this->searchTerm = 'who';
     }
@@ -62,7 +63,7 @@ public function testSearch()
     public function testCreate()
     {
         $response = $this->service->create($this->originalArray);
-        $this->assertEquals(get_class($response), 'App\Models\Role');
+        $this->assertEquals(get_class($response), '{{App\}}Models\Role');
         $this->assertEquals(1, $response->id);
     }
 
@@ -72,7 +73,7 @@ public function testUpdate()
         $response = $this->service->update($role->id, $this->modifiedArray);
 
         $this->assertEquals($role->id, $response->id);
-        $this->seeInDatabase('roles', $this->editedArray);
+        $this->assertDatabaseHas('roles', $this->editedArray);
     }
 
     public function testDestroy()

diff --git a/...ackages/Starter/tests/TeamServiceTest.php → ...es/Starter/tests/Unit/TeamServiceTest.php b/...ackages/Starter/tests/TeamServiceTest.php → ...es/Starter/tests/Unit/TeamServiceTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Tests\TestCase;
 use {{App\}}Services\TeamService;
 use {{App\}}Services\UserService;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
@@ -21,11 +22,11 @@ public function setUp()
 
         $this->originalArray = [
             'user_id' => 1,
-            'name' => 'Awesomeness'
+            'name' => 'Awesomeness',
         ];
         $this->editedArray = [
             'user_id' => 1,
-            'name' => 'Hackers'
+            'name' => 'Hackers',
         ];
         $this->searchTerm = 'who';
     }
@@ -62,7 +63,7 @@ public function testCreate()
     {
         $user = factory({{App\}}Models\User::class)->create();
         $response = $this->service->create($user->id, $this->originalArray);
-        $this->assertEquals(get_class($response), 'App\Models\Team');
+        $this->assertEquals(get_class($response), '{{App\}}Models\Team');
         $this->assertEquals(1, $response->id);
     }
 
@@ -101,7 +102,7 @@ public function testUpdate()
         $response = $this->service->update($team->id, $this->editedArray);
 
         $this->assertEquals($team->id, $response->id);
-        $this->seeInDatabase('teams', $this->editedArray);
+        $this->assertDatabaseHas('teams', $this->editedArray);
     }
 
     public function testDestroy()

diff --git a/...ackages/Starter/tests/UserServiceTest.php → ...es/Starter/tests/Unit/UserServiceTest.php b/...ackages/Starter/tests/UserServiceTest.php → ...es/Starter/tests/Unit/UserServiceTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Tests\TestCase;
 use {{App\}}Services\UserService;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
@@ -24,7 +25,7 @@ public function testGetUsers()
     public function testGetUser()
     {
         $user = factory({{App\}}Models\User::class)->create();
-        factory({{App\}}Models\UserMeta::class)->create([ 'user_id' => $user->id ]);
+        factory({{App\}}Models\UserMeta::class)->create(['user_id' => $user->id]);
         $response = $this->service->find($user->id);
 
         $this->assertTrue(is_object($response));
@@ -44,7 +45,7 @@ public function testCreateUser()
     public function testUpdateUser()
     {
         $user = factory({{App\}}Models\User::class)->create();
-        factory({{App\}}Models\UserMeta::class)->create([ 'user_id' => $user->id ]);
+        factory({{App\}}Models\UserMeta::class)->create(['user_id' => $user->id]);
 
         $response = $this->service->update($user->id, [
             'email' => $user->email,
@@ -53,20 +54,20 @@ public function testUpdateUser()
             'meta' => [
                 'phone' => '666',
                 'marketing' => 1,
-                'terms_and_cond' => 1
-            ]
+                'terms_and_cond' => 1,
+            ],
         ]);
 
-        $this->seeInDatabase('user_meta', ['phone' => '666']);
-        $this->seeInDatabase('users', ['name' => 'jim']);
+        $this->assertDatabaseHas('user_meta', ['phone' => '666']);
+        $this->assertDatabaseHas('users', ['name' => 'jim']);
     }
 
     public function testAssignRole()
     {
         $role = factory({{App\}}Models\Role::class)->create();
         $user = factory({{App\}}Models\User::class)->create();
         $this->service->assignRole('member', $user->id);
-        $this->seeInDatabase('role_user', ['role_id' => $role->id, 'user_id' => $user->id]);
+        $this->assertDatabaseHas('role_user', ['role_id' => $role->id, 'user_id' => $user->id]);
         $this->assertEquals($user->roles->first()->label, 'Member');
     }
 
@@ -75,7 +76,7 @@ public function testHasRole()
         $role = factory({{App\}}Models\Role::class)->create();
         $user = factory({{App\}}Models\User::class)->create();
         $this->service->assignRole('member', $user->id);
-        $this->seeInDatabase('role_user', ['role_id' => $role->id, 'user_id' => $user->id]);
+        $this->assertDatabaseHas('role_user', ['role_id' => $role->id, 'user_id' => $user->id]);
         $this->assertTrue($user->hasRole('member'));
     }
 
@@ -102,7 +103,7 @@ public function testJoinTeam()
         $team = factory({{App\}}Models\Team::class)->create();
         $user = factory({{App\}}Models\User::class)->create();
         $this->service->joinTeam($team->id, $user->id);
-        $this->seeInDatabase('team_user', ['team_id' => $team->id, 'user_id' => $user->id]);
+        $this->assertDatabaseHas('team_user', ['team_id' => $team->id, 'user_id' => $user->id]);
         $this->assertEquals($user->teams->first()->name, $team->name);
     }