Skip to content

Commit 4d9f97f

Browse files
thetutlagethetutlage
committed
refactor: remove route.destroy in favor of route.delete
1 parent f5c464c commit 4d9f97f

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
lines changed

‎adonis-typings/route.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ declare module '@ioc:Adonis/Core/Route' {
225225
post (pattern: string, handler: RouteHandlerNode): RouteContract
226226
put (pattern: string, handler: RouteHandlerNode): RouteContract
227227
patch (pattern: string, handler: RouteHandlerNode): RouteContract
228-
destroy (pattern: string, handler: RouteHandlerNode): RouteContract
228+
delete (pattern: string, handler: RouteHandlerNode): RouteContract
229229
group (callback: () => void): RouteGroupContract
230230
resource (resource: string, controller: string): RouteResourceContract
231231
shallowResource (resource: string, controller: string): RouteResourceContract

‎src/Router/Resource.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class RouteResource extends Macroable implements RouteResourceContract {
9292
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id`, ['GET'], 'show')
9393
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id/edit`, ['GET'], 'edit')
9494
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id`, ['PUT', 'PATCH'], 'update')
95-
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id`, ['DELETE'], 'destroy')
95+
this.makeRoute(`${this.shallow ? mainResource : fullUrl}/:id`, ['DELETE'], 'delete')
9696
}
9797

9898
/**

‎src/Router/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ export class Router implements RouterContract {
162162
/**
163163
* Define `DELETE` route
164164
*/
165-
public destroy (pattern: string, handler: RouteHandlerNode): Route {
165+
public delete (pattern: string, handler: RouteHandlerNode): Route {
166166
return this.route(pattern, ['DELETE'], handler)
167167
}
168168

‎test/group.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ test.group('Route Group', () => {
220220
methods: ['DELETE'],
221221
domain: 'root',
222222
middleware: [],
223-
handler: 'PhotosController.destroy',
224-
name: 'photos.destroy',
223+
handler: 'PhotosController.delete',
224+
name: 'photos.delete',
225225
},
226226
])
227227
})
@@ -313,8 +313,8 @@ test.group('Route Group', () => {
313313
methods: ['DELETE'],
314314
domain: 'root',
315315
middleware: [],
316-
handler: 'PhotosController.destroy',
317-
name: 'v1.photos.destroy',
316+
handler: 'PhotosController.delete',
317+
name: 'v1.photos.delete',
318318
},
319319
])
320320
})

‎test/resource.spec.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ test.group('Route Resource', () => {
9696
methods: ['DELETE'],
9797
domain: 'root',
9898
middleware: [],
99-
handler: 'PhotosController.destroy',
100-
name: 'photos.destroy',
99+
handler: 'PhotosController.delete',
100+
name: 'photos.delete',
101101
},
102102
])
103103
})
@@ -187,8 +187,8 @@ test.group('Route Resource', () => {
187187
},
188188
domain: 'root',
189189
middleware: [],
190-
handler: 'AdsController.destroy',
191-
name: 'magazines.ads.destroy',
190+
handler: 'AdsController.delete',
191+
name: 'magazines.ads.delete',
192192
},
193193
])
194194
})
@@ -278,8 +278,8 @@ test.group('Route Resource', () => {
278278
methods: ['DELETE'],
279279
domain: 'root',
280280
middleware: [],
281-
handler: 'AdsController.destroy',
282-
name: 'magazines.ads.destroy',
281+
handler: 'AdsController.delete',
282+
name: 'magazines.ads.delete',
283283
},
284284
])
285285
})
@@ -302,7 +302,7 @@ test.group('Route Resource', () => {
302302
assert.isFalse(resource.routes.find((route) => route.name === 'photos.show')!.deleted)
303303
assert.isTrue(resource.routes.find((route) => route.name === 'photos.edit')!.deleted)
304304
assert.isTrue(resource.routes.find((route) => route.name === 'photos.update')!.deleted)
305-
assert.isTrue(resource.routes.find((route) => route.name === 'photos.destroy')!.deleted)
305+
assert.isTrue(resource.routes.find((route) => route.name === 'photos.delete')!.deleted)
306306
})
307307

308308
test('mark all defined as delete', (assert) => {
@@ -315,7 +315,7 @@ test.group('Route Resource', () => {
315315
assert.isTrue(resource.routes.find((route) => route.name === 'photos.show')!.deleted)
316316
assert.isFalse(resource.routes.find((route) => route.name === 'photos.edit')!.deleted)
317317
assert.isFalse(resource.routes.find((route) => route.name === 'photos.update')!.deleted)
318-
assert.isFalse(resource.routes.find((route) => route.name === 'photos.destroy')!.deleted)
318+
assert.isFalse(resource.routes.find((route) => route.name === 'photos.delete')!.deleted)
319319
})
320320

321321
test('define middleware on routes', (assert) => {
@@ -356,7 +356,7 @@ test.group('Route Resource', () => {
356356
)
357357

358358
assert.deepEqual(
359-
resource.routes.find((route) => route.name === 'photos.destroy')!['routeMiddleware'],
359+
resource.routes.find((route) => route.name === 'photos.delete')!['routeMiddleware'],
360360
[],
361361
)
362362
})
@@ -408,7 +408,7 @@ test.group('Route Resource', () => {
408408
)
409409

410410
assert.deepEqual(
411-
resource.routes.find((route) => route.name === 'photos.destroy')!['matchers'],
411+
resource.routes.find((route) => route.name === 'photos.delete')!['matchers'],
412412
{
413413
id: /[a-z]/,
414414
},
@@ -515,8 +515,8 @@ test.group('Route Resource', () => {
515515
methods: ['DELETE'],
516516
domain: 'root',
517517
middleware: [],
518-
handler: 'PhotosController.destroy',
519-
name: 'photos.destroy',
518+
handler: 'PhotosController.delete',
519+
name: 'photos.delete',
520520
},
521521
])
522522
})
@@ -606,8 +606,8 @@ test.group('Route Resource', () => {
606606
methods: ['DELETE'],
607607
domain: 'root',
608608
middleware: [],
609-
handler: 'ProfileController.destroy',
610-
name: 'user_profile.destroy',
609+
handler: 'ProfileController.delete',
610+
name: 'user_profile.delete',
611611
},
612612
])
613613
})
@@ -697,8 +697,8 @@ test.group('Route Resource', () => {
697697
methods: ['DELETE'],
698698
domain: 'root',
699699
middleware: [],
700-
handler: 'CommentsController.destroy',
701-
name: 'user_profile.comments.destroy',
700+
handler: 'CommentsController.delete',
701+
name: 'user_profile.comments.delete',
702702
},
703703
])
704704
})
@@ -719,7 +719,7 @@ test.group('Route Resource', () => {
719719
'photos.show': ['auth'],
720720
'photos.edit': ['auth'],
721721
'photos.update': ['auth'],
722-
'photos.destroy': ['auth'],
722+
'photos.delete': ['auth'],
723723
})
724724
})
725725

@@ -739,7 +739,7 @@ test.group('Route Resource', () => {
739739
'photos.show': ['auth'],
740740
'photos.edit': ['auth'],
741741
'photos.update': ['auth', 'self'],
742-
'photos.destroy': ['auth'],
742+
'photos.delete': ['auth'],
743743
})
744744
})
745745

@@ -754,7 +754,7 @@ test.group('Route Resource', () => {
754754
'public_photos.show',
755755
'public_photos.edit',
756756
'public_photos.update',
757-
'public_photos.destroy',
757+
'public_photos.delete',
758758
])
759759
})
760760

@@ -769,7 +769,7 @@ test.group('Route Resource', () => {
769769
'photos.show',
770770
'photos.edit',
771771
'photos.update',
772-
'photos.destroy',
772+
'photos.delete',
773773
])
774774
})
775775
})

‎test/router.spec.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test.group('Router | add', () => {
3737
const postRoute = router.post('/', 'HomeController.store')
3838
const putRoute = router.put('/', 'HomeController.update')
3939
const patchRoute = router.patch('/', 'HomeController.updatePatch')
40-
const destroyRoute = router.destroy('/', 'HomeController.destroy')
40+
const deleteRoute = router.delete('/', 'HomeController.delete')
4141
const anyRoute = router.any('/', 'HomeController.handle')
4242

4343
assert.deepEqual(getRoute.toJSON(), {
@@ -92,15 +92,15 @@ test.group('Router | add', () => {
9292
name: undefined,
9393
})
9494

95-
assert.deepEqual(destroyRoute.toJSON(), {
95+
assert.deepEqual(deleteRoute.toJSON(), {
9696
pattern: '/',
9797
methods: ['DELETE'],
9898
meta: {
9999
namespace: undefined,
100100
},
101101
matchers: {},
102102
domain: 'root',
103-
handler: 'HomeController.destroy',
103+
handler: 'HomeController.delete',
104104
middleware: [],
105105
name: undefined,
106106
})
@@ -828,12 +828,12 @@ test.group('Router | commit', () => {
828828
routes: {
829829
'/api/posts/:id': {
830830
pattern: '/api/posts/:id',
831-
handler: 'PostController.destroy',
831+
handler: 'PostController.delete',
832832
meta: {
833833
namespace: undefined,
834834
},
835835
middleware: [],
836-
name: 'posts.destroy',
836+
name: 'posts.delete',
837837
},
838838
},
839839
},
@@ -1162,12 +1162,12 @@ test.group('Router | commit', () => {
11621162
routes: {
11631163
'/api/v1/posts/:id': {
11641164
pattern: '/api/v1/posts/:id',
1165-
handler: 'PostController.destroy',
1165+
handler: 'PostController.delete',
11661166
meta: {
11671167
namespace: undefined,
11681168
},
11691169
middleware: [],
1170-
name: 'posts.destroy',
1170+
name: 'posts.delete',
11711171
},
11721172
},
11731173
},
@@ -1434,12 +1434,12 @@ test.group('Router | commit', () => {
14341434
routes: {
14351435
'/comments/:id': {
14361436
pattern: '/comments/:id',
1437-
handler: 'CommentsController.destroy',
1437+
handler: 'CommentsController.delete',
14381438
meta: {
14391439
namespace: undefined,
14401440
},
14411441
middleware: [],
1442-
name: 'posts.comments.destroy',
1442+
name: 'posts.comments.delete',
14431443
},
14441444
},
14451445
},
@@ -1811,8 +1811,8 @@ test.group('Router | match', () => {
18111811
},
18121812
middleware: [],
18131813
pattern: '/photos/:id',
1814-
name: 'photos.destroy',
1815-
handler: 'PhotosController.destroy',
1814+
name: 'photos.delete',
1815+
handler: 'PhotosController.delete',
18161816
},
18171817
subdomains: {},
18181818
})

0 commit comments

Comments
 (0)