@@ -13,7 +13,7 @@ |
||
| 13 | 13 | use RafflesArgentina\ResourceController\Exceptions\ResourceControllerException; |
| 14 | 14 | |
| 15 | 15 | abstract class AbstractResourceController extends BaseController |
| 16 | - implements ResourceControllerInterface |
|
| 16 | + implements ResourceControllerInterface |
|
| 17 | 17 | { |
| 18 | 18 | /** |
| 19 | 19 | * The alias for named routes. |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | return redirect()->route($this->getRedirectionRoute()) |
| 99 | - ->with($this->successFlashMessageKey, $message); |
|
| 99 | + ->with($this->successFlashMessageKey, $message); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | /** |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | return redirect()->route($this->getRedirectionRoute()) |
| 203 | - ->with($this->successFlashMessageKey, $message); |
|
| 203 | + ->with($this->successFlashMessageKey, $message); |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | return redirect()->route($this->getRedirectionRoute()) |
| 249 | - ->with($this->infoFlashMessageKey, $message); |
|
| 249 | + ->with($this->infoFlashMessageKey, $message); |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /** |
@@ -13,13 +13,13 @@ discard block |
||
| 13 | 13 | factory(\RafflesArgentina\ResourceController\Models\User::class, 3)->create(); |
| 14 | 14 | |
| 15 | 15 | $this->get('/test') |
| 16 | - ->assertViewIs('test.index') |
|
| 17 | - ->assertViewHas('items') |
|
| 18 | - ->assertStatus(200); |
|
| 16 | + ->assertViewIs('test.index') |
|
| 17 | + ->assertViewHas('items') |
|
| 18 | + ->assertStatus(200); |
|
| 19 | 19 | |
| 20 | 20 | $this->json('GET', '/test') |
| 21 | - ->assertStatus(200); |
|
| 22 | - //->assertJsonCount(3, 'data'); |
|
| 21 | + ->assertStatus(200); |
|
| 22 | + //->assertJsonCount(3, 'data'); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | function testIndexRouteWithUseSoftDeletes() |
@@ -28,34 +28,34 @@ discard block |
||
| 28 | 28 | foreach ($users as $user) $user->delete(); |
| 29 | 29 | |
| 30 | 30 | $this->get('/test2') |
| 31 | - ->assertViewIs('test.index') |
|
| 32 | - ->assertViewHas('items') |
|
| 33 | - ->assertStatus(200); |
|
| 31 | + ->assertViewIs('test.index') |
|
| 32 | + ->assertViewHas('items') |
|
| 33 | + ->assertStatus(200); |
|
| 34 | 34 | |
| 35 | 35 | $this->json('GET', '/test2') |
| 36 | - ->assertStatus(200); |
|
| 37 | - //->assertJsonCount(3, 'data'); |
|
| 36 | + ->assertStatus(200); |
|
| 37 | + //->assertJsonCount(3, 'data'); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | function testCreateRoute() |
| 41 | 41 | { |
| 42 | 42 | $this->get('/test/create') |
| 43 | - ->assertViewIs('test.create') |
|
| 44 | - ->assertViewHas('model') |
|
| 45 | - ->assertStatus(200); |
|
| 43 | + ->assertViewIs('test.create') |
|
| 44 | + ->assertViewHas('model') |
|
| 45 | + ->assertStatus(200); |
|
| 46 | 46 | |
| 47 | 47 | $this->json('GET', '/test/create') |
| 48 | - ->assertStatus(404); |
|
| 48 | + ->assertStatus(404); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | function testStoreRoute() |
| 52 | 52 | { |
| 53 | 53 | $this->post('/test', ['name' => 'Mario', 'email' => '[email protected]', 'password' => bcrypt(str_random())]) |
| 54 | - ->assertRedirect('/test') |
|
| 55 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 54 | + ->assertRedirect('/test') |
|
| 55 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 56 | 56 | |
| 57 | 57 | $this->json('POST', '/test', ['name' => 'Paula', 'email' => '[email protected]', 'password' => bcrypt(str_random())]) |
| 58 | - ->assertStatus(200); |
|
| 58 | + ->assertStatus(200); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | function testShowRoute() |
@@ -63,12 +63,12 @@ discard block |
||
| 63 | 63 | $user = factory(\RafflesArgentina\ResourceController\Models\User::class)->create(); |
| 64 | 64 | |
| 65 | 65 | $this->get('/test/'.$user->id) |
| 66 | - ->assertViewIs('test.show') |
|
| 67 | - ->assertViewHas('model') |
|
| 68 | - ->assertStatus(200); |
|
| 66 | + ->assertViewIs('test.show') |
|
| 67 | + ->assertViewHas('model') |
|
| 68 | + ->assertStatus(200); |
|
| 69 | 69 | |
| 70 | 70 | $this->json('GET', '/test/'.$user->id) |
| 71 | - ->assertStatus(200); |
|
| 71 | + ->assertStatus(200); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | function testShowRouteWithUseSoftDeletes() |
@@ -77,12 +77,12 @@ discard block |
||
| 77 | 77 | $user->delete(); |
| 78 | 78 | |
| 79 | 79 | $this->get('/test2/'.$user->id) |
| 80 | - ->assertViewIs('test.show') |
|
| 81 | - ->assertViewHas('model') |
|
| 82 | - ->assertStatus(200); |
|
| 80 | + ->assertViewIs('test.show') |
|
| 81 | + ->assertViewHas('model') |
|
| 82 | + ->assertStatus(200); |
|
| 83 | 83 | |
| 84 | 84 | $this->json('GET', '/test2/'.$user->id) |
| 85 | - ->assertStatus(200); |
|
| 85 | + ->assertStatus(200); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | function testShowRouteWithInexistentModel() |
@@ -97,12 +97,12 @@ discard block |
||
| 97 | 97 | $user = factory(\RafflesArgentina\ResourceController\Models\User::class)->create(); |
| 98 | 98 | |
| 99 | 99 | $this->get('/test/'.$user->id.'/edit') |
| 100 | - ->assertViewIs('test.edit') |
|
| 101 | - ->assertViewHas('model') |
|
| 102 | - ->assertStatus(200); |
|
| 100 | + ->assertViewIs('test.edit') |
|
| 101 | + ->assertViewHas('model') |
|
| 102 | + ->assertStatus(200); |
|
| 103 | 103 | |
| 104 | 104 | $this->json('GET', '/test/'.$user->id.'/edit') |
| 105 | - ->assertStatus(404); |
|
| 105 | + ->assertStatus(404); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | function testEditRouteWithUseSoftDeletes() |
@@ -111,12 +111,12 @@ discard block |
||
| 111 | 111 | $user->delete(); |
| 112 | 112 | |
| 113 | 113 | $this->get('/test2/'.$user->id.'/edit') |
| 114 | - ->assertViewIs('test.edit') |
|
| 115 | - ->assertViewHas('model') |
|
| 116 | - ->assertStatus(200); |
|
| 114 | + ->assertViewIs('test.edit') |
|
| 115 | + ->assertViewHas('model') |
|
| 116 | + ->assertStatus(200); |
|
| 117 | 117 | |
| 118 | 118 | $this->json('GET', '/test2/'.$user->id.'/edit') |
| 119 | - ->assertStatus(404); |
|
| 119 | + ->assertStatus(404); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | function testEditRouteWithInexistentModel() |
@@ -131,12 +131,12 @@ discard block |
||
| 131 | 131 | $user = factory(\RafflesArgentina\ResourceController\Models\User::class)->create(); |
| 132 | 132 | |
| 133 | 133 | $this->put('/test/'.$user->id, ['name' => 'Mario', 'email' => '[email protected]', 'password' => bcrypt(str_random())]) |
| 134 | - ->assertRedirect('/test') |
|
| 135 | - ->assertStatus(302) |
|
| 136 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 134 | + ->assertRedirect('/test') |
|
| 135 | + ->assertStatus(302) |
|
| 136 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 137 | 137 | |
| 138 | 138 | $this->json('PUT', '/test/'.$user->id, ['name' => 'Mario', 'email' => '[email protected]', 'password' => bcrypt(str_random())]) |
| 139 | - ->assertStatus(200); |
|
| 139 | + ->assertStatus(200); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | function testUpdateRouteWithUseSoftDeletes() |
@@ -145,12 +145,12 @@ discard block |
||
| 145 | 145 | $user->delete(); |
| 146 | 146 | |
| 147 | 147 | $this->put('/test2/'.$user->id, ['name' => 'Mario', 'email' => '[email protected]', 'password' => bcrypt(str_random())]) |
| 148 | - ->assertRedirect('/test') |
|
| 149 | - ->assertStatus(302) |
|
| 150 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 148 | + ->assertRedirect('/test') |
|
| 149 | + ->assertStatus(302) |
|
| 150 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 151 | 151 | |
| 152 | 152 | $this->json('PUT', '/test2/'.$user->id, ['name' => 'Mario', 'email' => '[email protected]', 'password' => bcrypt(str_random())]) |
| 153 | - ->assertStatus(200); |
|
| 153 | + ->assertStatus(200); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | function testUpdateRouteWithInexistentModel() |
@@ -164,12 +164,12 @@ discard block |
||
| 164 | 164 | { |
| 165 | 165 | $user = factory(\RafflesArgentina\ResourceController\Models\User::class)->create(); |
| 166 | 166 | $this->delete('/test/'.$user->id) |
| 167 | - ->assertRedirect('/test') |
|
| 168 | - ->assertStatus(302); |
|
| 167 | + ->assertRedirect('/test') |
|
| 168 | + ->assertStatus(302); |
|
| 169 | 169 | |
| 170 | 170 | $user = factory(\RafflesArgentina\ResourceController\Models\User::class)->create(); |
| 171 | 171 | $this->json('DELETE', '/test/'.$user->id) |
| 172 | - ->assertStatus(200); |
|
| 172 | + ->assertStatus(200); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | function testDestroyRouteWithUseSoftDeletes() |
@@ -178,11 +178,11 @@ discard block |
||
| 178 | 178 | $user->delete(); |
| 179 | 179 | |
| 180 | 180 | $this->delete('/test2/'.$user->id) |
| 181 | - ->assertRedirect('/test') |
|
| 182 | - ->assertStatus(302); |
|
| 181 | + ->assertRedirect('/test') |
|
| 182 | + ->assertStatus(302); |
|
| 183 | 183 | |
| 184 | 184 | $this->json('DELETE', '/test2/'.$user->id) |
| 185 | - ->assertStatus(200); |
|
| 185 | + ->assertStatus(200); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | function testDestroyRouteWithInexistentModel() |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | UploadedFile::fake()->image('test.jpeg') |
| 26 | 26 | ], |
| 27 | 27 | ])->assertRedirect('/test') |
| 28 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 28 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 29 | 29 | |
| 30 | 30 | $user = \RafflesArgentina\ResourceController\Models\User::first(); |
| 31 | 31 | $this->assertTrue(!is_null($user->hasOneFileUpload)); |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | UploadedFile::fake()->image('test.jpeg') |
| 46 | 46 | ], |
| 47 | 47 | ])->assertRedirect('/test') |
| 48 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 48 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 49 | 49 | |
| 50 | 50 | $user = \RafflesArgentina\ResourceController\Models\User::first(); |
| 51 | 51 | $this->assertTrue(!is_null($user->morphOneFileUpload)); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | UploadedFile::fake()->image('test.jpeg') |
| 66 | 66 | ], |
| 67 | 67 | ])->assertRedirect('/test') |
| 68 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 68 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 69 | 69 | |
| 70 | 70 | $user = \RafflesArgentina\ResourceController\Models\User::first(); |
| 71 | 71 | $this->assertTrue(!is_null($user->belongsToFileUpload)); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | '2' => UploadedFile::fake()->create('document.pdf') |
| 87 | 87 | ], |
| 88 | 88 | ])->assertRedirect('/test') |
| 89 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 89 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 90 | 90 | |
| 91 | 91 | $user = \RafflesArgentina\ResourceController\Models\User::first(); |
| 92 | 92 | $this->assertTrue($user->hasManyFileUploads->count() === 2); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | '2' => UploadedFile::fake()->create('document.pdf') |
| 108 | 108 | ], |
| 109 | 109 | ])->assertRedirect('/test') |
| 110 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 110 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 111 | 111 | |
| 112 | 112 | $user = \RafflesArgentina\ResourceController\Models\User::first(); |
| 113 | 113 | $this->assertTrue($user->morphManyFileUploads->count() === 2); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | '2' => UploadedFile::fake()->create('document.pdf') |
| 129 | 129 | ], |
| 130 | 130 | ])->assertRedirect('/test') |
| 131 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 131 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 132 | 132 | |
| 133 | 133 | $user = \RafflesArgentina\ResourceController\Models\User::first(); |
| 134 | 134 | $this->assertTrue($user->belongsToManyFileUploads->count() === 2); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | '2' => UploadedFile::fake()->create('document.pdf') |
| 150 | 150 | ], |
| 151 | 151 | ])->assertRedirect('/test') |
| 152 | - ->assertSessionHas('rafflesargentina.status.success'); |
|
| 152 | + ->assertSessionHas('rafflesargentina.status.success'); |
|
| 153 | 153 | |
| 154 | 154 | $user = \RafflesArgentina\ResourceController\Models\User::first(); |
| 155 | 155 | $this->assertTrue($user->morphToManyFileUploads->count() === 2); |