Skip to content

Commit

Permalink
Upgraded to Laravel 5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@shivampaw
shivampaw committed Apr 3, 2018
1 parent 9a946e2 commit 7151b5a
Show file tree
Hide file tree
Showing 9 changed files with 86 additions and 86 deletions.
18 changes: 9 additions & 9 deletions tests/Feature/AdminTest.php
View file
Expand Up @@ -6,13 +6,13 @@
use App\Models\Client;
use App\Models\User;
use Faker\Factory;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Mail;
use Tests\TestCase;

class AdminTest extends TestCase
{
use DatabaseMigrations;
use RefreshDatabase;

protected $admin;

Expand All @@ -36,17 +36,17 @@ public function setUp()
public function admins_can_create_client()
{
$client = [
'name' => $this->faker->name,
'email' => $this->faker->email,
'number' => $this->faker->phoneNumber,
'name' => $this->faker->name,
'email' => $this->faker->email,
'number' => $this->faker->phoneNumber,
'address' => $this->faker->address,
];

Mail::fake();

$this->signIn($this->admin)
->post('/clients', $client)
->assertRedirect('/clients');
->post('/clients', $client)
->assertRedirect('/clients');

Mail::assertSent(NewUser::class, function ($mail) use ($client) {
return $mail->hasTo($client['email']);
Expand All @@ -61,8 +61,8 @@ public function admins_can_delete_client()
$client = create(Client::class);

$this->signIn($this->admin)
->delete('/clients/' . $client->id)
->assertRedirect('/clients');
->delete('/clients/' . $client->id)
->assertRedirect('/clients');

$this->assertDatabaseMissing('clients', $client->toArray());
}
Expand Down
44 changes: 22 additions & 22 deletions tests/Feature/InvoiceTest.php
View file
Expand Up @@ -7,13 +7,13 @@
use App\Models\Invoice;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Mail;
use Tests\TestCase;

class InvoiceTest extends TestCase
{
use DatabaseMigrations;
use RefreshDatabase;

protected $client;

Expand All @@ -34,18 +34,18 @@ public function admins_can_create_and_delete_invoices()
$invoiceItems = [
[
'description' => 'Test invoice item',
'quantity' => 4,
'price' => 302.20,
'quantity' => 4,
'price' => 302.20,
],
];

Mail::fake();

$this->signIn($this->admin)
->post('/clients/' . $client->id . '/invoices', [
'due_date' => Carbon::tomorrow(),
'invoiceItems' => $invoiceItems,
]);
->post('/clients/' . $client->id . '/invoices', [
'due_date' => Carbon::tomorrow(),
'invoiceItems' => $invoiceItems,
]);

Mail::assertSent(NewInvoice::class, function ($mail) use ($client) {
return $mail->hasTo($client->email);
Expand All @@ -64,9 +64,9 @@ public function clients_can_view_their_invoices()
$invoice = create(Invoice::class);

$this->signIn($invoice->client->user)
->get('/invoices/')
->assertSee("Invoice #" . $invoice->id)
->assertStatus(200);
->get('/invoices/')
->assertSee("Invoice #" . $invoice->id)
->assertStatus(200);
}

/** @test */
Expand All @@ -75,10 +75,10 @@ public function clients_can_view_a_single_invoice()
$invoice = create(Invoice::class);

$this->signIn($invoice->client->user)
->get('/invoices/' . $invoice->id)
->assertSee("Invoice #" . $invoice->id)
->assertSee($invoice->client->name)
->assertStatus(200);
->get('/invoices/' . $invoice->id)
->assertSee("Invoice #" . $invoice->id)
->assertSee($invoice->client->name)
->assertStatus(200);
}

/** @test */
Expand All @@ -88,9 +88,9 @@ public function admins_can_view_all_client_invoices()
$client = $invoice->client;

$this->signIn($this->admin)
->get('/clients/' . $client->id . '/invoices/')
->assertSee("Invoice #" . $invoice->id)
->assertStatus(200);
->get('/clients/' . $client->id . '/invoices/')
->assertSee("Invoice #" . $invoice->id)
->assertStatus(200);
}

/** @test */
Expand All @@ -100,9 +100,9 @@ public function admins_can_view_a_single_client_invoice()
$client = $invoice->client;

$this->signIn($this->admin)
->get('/clients/' . $client->id . '/invoices/' . $invoice->id)
->assertSee("Invoice #" . $invoice->id)
->assertSee($client->name)
->assertStatus(200);
->get('/clients/' . $client->id . '/invoices/' . $invoice->id)
->assertSee("Invoice #" . $invoice->id)
->assertSee($client->name)
->assertStatus(200);
}
}
77 changes: 38 additions & 39 deletions tests/Feature/MiddlewareTest.php
View file
Expand Up @@ -4,20 +4,19 @@

use App\Models\Client;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

class MiddlewareTest extends TestCase
{
use DatabaseMigrations;
use RefreshDatabase;

protected $superAdmin;

protected $admin;

protected $client;

/** @test */

public function setUp()
{
parent::setUp();
Expand All @@ -30,94 +29,94 @@ public function setUp()
public function only_super_admin_can_manage_admins()
{
$this->get('/admins')
->assertRedirect('/login');
->assertRedirect('/login');

$this->signIn($this->client->user)
->get('/admins')
->assertStatus(403);
->get('/admins')
->assertStatus(403);

$this->signIn($this->admin)
->get('/admins')
->assertStatus(403);
->get('/admins')
->assertStatus(403);

$this->signIn($this->superAdmin)
->get('/admins')
->assertStatus(200);
->get('/admins')
->assertStatus(200);
}

/** @test */
public function only_admins_can_manage_clients()
{
$this->get('/clients')
->assertRedirect('/login');
->assertRedirect('/login');

$this->signIn($this->client->user)
->get('/clients')
->assertStatus(403);
->get('/clients')
->assertStatus(403);

$this->signIn($this->admin)
->get('/clients')
->assertStatus(200);
->get('/clients')
->assertStatus(200);

$this->signIn($this->superAdmin)
->get('/clients')
->assertStatus(200);
->get('/clients')
->assertStatus(200);
}

/** @test */
public function only_admins_can_manage_client_projects()
{
$this->get('/clients/' . $this->client->id . '/projects')
->assertRedirect('/login');
->assertRedirect('/login');

$this->signIn($this->client->user)
->get('/clients/' . $this->client->id . '/projects')
->assertStatus(403);
->get('/clients/' . $this->client->id . '/projects')
->assertStatus(403);

$this->signIn($this->admin)
->get('/clients/' . $this->client->id . '/projects')
->assertStatus(200);
->get('/clients/' . $this->client->id . '/projects')
->assertStatus(200);

$this->signIn($this->superAdmin)
->get('/clients/' . $this->client->id . '/projects')
->assertStatus(200);
->get('/clients/' . $this->client->id . '/projects')
->assertStatus(200);
}

/** @test */
public function only_admins_can_manage_client_invoices()
{
$this->get('/clients/' . $this->client->id . '/invoices')
->assertRedirect('/login');
->assertRedirect('/login');

$this->signIn($this->client->user)
->get('/clients/' . $this->client->id . '/invoices')
->assertStatus(403);
->get('/clients/' . $this->client->id . '/invoices')
->assertStatus(403);

$this->signIn($this->admin)
->get('/clients/' . $this->client->id . '/invoices')
->assertStatus(200);
->get('/clients/' . $this->client->id . '/invoices')
->assertStatus(200);

$this->signIn($this->superAdmin)
->get('/clients/' . $this->client->id . '/invoices')
->assertStatus(200);
->get('/clients/' . $this->client->id . '/invoices')
->assertStatus(200);
}

/** @test */
public function only_client_can_access_client_pages()
{
$this->get('/invoices')
->assertRedirect('/login');
->assertRedirect('/login');

$this->signIn($this->client->user)
->get('/invoices')
->assertStatus(200);
->get('/invoices')
->assertStatus(200);

$this->signIn($this->admin)
->get('/invoices')
->assertStatus(403);
->get('/invoices')
->assertStatus(403);

$this->signIn($this->superAdmin)
->get('/invoices')
->assertStatus(403);
->get('/invoices')
->assertStatus(403);
}
}
3 changes: 2 additions & 1 deletion tests/Feature/ProjectTest.php
View file
Expand Up @@ -8,14 +8,15 @@
use App\Models\Project;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Storage;
use Tests\TestCase;

class ProjectTest extends TestCase
{
use DatabaseMigrations;
use RefreshDatabase;

protected $admin;

Expand Down
14 changes: 7 additions & 7 deletions tests/Feature/SuperAdminTest.php
View file
Expand Up @@ -5,13 +5,13 @@
use App\Mail\NewUser;
use App\Models\User;
use Faker\Factory;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Mail;
use Tests\TestCase;

class SuperAdminTest extends TestCase
{
use DatabaseMigrations;
use RefreshDatabase;

protected $admin;

Expand All @@ -32,15 +32,15 @@ public function setUp()
public function only_super_admin_can_create_admin()
{
$admin = [
'name' => $this->faker->name,
'name' => $this->faker->name,
'email' => $this->faker->safeEmail,
];

Mail::fake();

$this->signIn($this->admin)
->post('/admins', $admin)
->assertRedirect('/admins');
->post('/admins', $admin)
->assertRedirect('/admins');

Mail::assertSent(NewUser::class, function ($mail) use ($admin) {
return $mail->hasTo($admin['email']);
Expand All @@ -58,8 +58,8 @@ public function only_super_admin_can_delete_admin()
]);

$this->signIn($this->admin)
->delete('/admins/' . $admin->id)
->assertRedirect('/admins');
->delete('/admins/' . $admin->id)
->assertRedirect('/admins');

$this->assertDatabaseMissing('users', $admin->toArray());
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/UserTest.php
View file
Expand Up @@ -3,12 +3,12 @@
namespace Tests\Feature;

use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

class UserTest extends TestCase
{
use DatabaseMigrations;
use RefreshDatabase;

/** @test */
public function user_can_login()
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/ClientTest.php
View file
Expand Up @@ -6,12 +6,12 @@
use App\Models\Invoice;
use App\Models\Project;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

class ClientTest extends TestCase
{
use DatabaseMigrations;
use RefreshDatabase;

/** @test */
public function client_has_a_user()
Expand Down

0 comments on commit 7151b5a

Please sign in to comment.