import app Models User change

This commit is contained in:
2020-09-11 20:42:45 +02:00
34 changed files with 665 additions and 556 deletions

View File

@@ -3,7 +3,7 @@
namespace Tests\Feature;
use App\Models\Bookmark;
use App\User;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\TestCase;
@@ -17,7 +17,7 @@ class BookmarkTest extends TestCase
{
$this->withoutExceptionHandling();
$this->actingAs($user = factory(\App\User::class)->create(), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/bookmarks', $this->data());
@@ -49,7 +49,7 @@ class BookmarkTest extends TestCase
/** @test */
public function bookmark_url_are_required()
{
$this->actingAs($user = factory(\App\User::class)->create(), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/bookmarks', array_merge($this->data(), ['url' => '']));
$response->assertSessionHasErrors('url');

View File

@@ -5,7 +5,8 @@ namespace Tests\Feature;
use App\Models\Event;
use App\Models\EventCategory;
use App\Models\EventGuestsNonUsers;
use App\User;
use App\Models\Memo;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Str;
use Tests\TestCase;
@@ -49,7 +50,7 @@ class EventsTest extends TestCase
/** @test */
public function event_category_name_are_required()
{
$this->actingAs($user = factory(\App\User::class)->create(['role' => 2]), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(['role' => 2]), 'api');
$response = $this->post('/api/events/categories', ['name' => '', 'description' => 'test name required']);
$response->assertSessionHasErrors('name');
@@ -241,7 +242,7 @@ class EventsTest extends TestCase
'location' => $event->location,
'category' => [
'data' => [
'category_id' => 1
'event_category_id' => 1
],
],
]
@@ -256,7 +257,7 @@ class EventsTest extends TestCase
/** @test */
public function event_name_are_required()
{
$this->actingAs($user = factory(\App\User::class)->create(), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/events', array_merge($this->data(), ['name' => '']));
$response->assertSessionHasErrors('name');
@@ -266,7 +267,7 @@ class EventsTest extends TestCase
/** @test */
public function event_start_date_are_required()
{
$this->actingAs($user = factory(\App\User::class)->create(), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/events', array_merge($this->data(), ['start_date' => '']));
$response->assertSessionHasErrors('start_date');
@@ -296,7 +297,7 @@ class EventsTest extends TestCase
'location' => $event->location,
'category' => [
'data' => [
'category_id' => 1
'event_category_id' => 1
],
],
]
@@ -308,6 +309,7 @@ class EventsTest extends TestCase
/** @test */
public function all_event_can_be_retrieved()
{
$this->withoutExceptionHandling();
$this->actingAs($user = factory(User::class)->create(), 'api');
$events = factory(Event::class, 10)->create(['user_id' => $user->id]);
@@ -348,7 +350,7 @@ class EventsTest extends TestCase
'start_date' => '2020-07-20 09:00:00',
'category' => [
'data' => [
'category_id' => $event->category_id,
'event_category_id' => $event->category_id,
],
],
]

View File

@@ -4,7 +4,7 @@ namespace Tests\Feature;
use App\Models\Image;
use App\Models\Memo;
use App\User;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Illuminate\Http\UploadedFile;

View File

@@ -3,7 +3,7 @@
namespace Tests\Feature;
use App\Models\Memo;
use App\User;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Symfony\Component\HttpFoundation\Response;
@@ -28,7 +28,7 @@ class MemosTest extends TestCase
{
$this->withoutExceptionHandling();
$this->actingAs($user = factory(\App\User::class)->create(), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/memos', $this->data());
@@ -52,7 +52,7 @@ class MemosTest extends TestCase
/** @test */
public function memo_name_are_required()
{
$this->actingAs($user = factory(\App\User::class)->create(), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/memos', array_merge($this->data(), ['name' => '']));
$response->assertSessionHasErrors('name');
@@ -62,7 +62,7 @@ class MemosTest extends TestCase
/** @test */
public function memo_are_required()
{
$this->actingAs($user = factory(\App\User::class)->create(), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/memos', array_merge($this->data(), ['memo' => '']));
$response->assertSessionHasErrors('memo');

View File

@@ -4,7 +4,7 @@ namespace Tests\Feature;
use App\Models\ToDo;
use App\Models\ToDoList;
use App\User;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\TestCase;

View File

@@ -3,7 +3,7 @@
namespace Tests\Feature;
use App\Models\ToDoList;
use App\User;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\TestCase;
@@ -44,7 +44,7 @@ class ToDoListsTest extends TestCase
/** @test */
public function to_do_list_name_are_required()
{
$this->actingAs($user = factory(\App\User::class)->create(), 'api');
$this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/to-do-lists/', ['name' => '']);
$response->assertSessionHasErrors('name');

View File

@@ -2,7 +2,7 @@
namespace Tests\Feature;
use App\User;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Symfony\Component\HttpFoundation\Response;