add test case for validator & update sth

Author: IndexXuan

README.md

@@ -1,5 +1,5 @@
 <p align="center">
- <a href="https://www.v2ex.com/">
+ <a href="https://www.v2ex.com/" target="_blank">
  <img src="https://v2ex.assets.uxengine.net/site/logo@2x.png?m=1346064962" alt="V2EX" title="V2EX" />
  </a>
 </p>
@@ -19,7 +19,7 @@ Node.js >= 7.6.0 required(async & await native supported).
 ## Features
 
 - ✔︎ Full APIs Wrapped
-- ✔︎ Restful Style
+- ✔︎ RESTful Style
 - ✔︎ 100% Unit Test
 
 ### Unit Test

app/controller/members.js

@@ -13,7 +13,7 @@ module.exports = app => {
  async show (ctx) {
  ctx.validate({
  username: { type: 'string', required: false },
- id: { type: 'string', required: false } 
+ id: { type: 'id', required: false } 
  }, ctx.params)
 
  ctx.body = await ctx.service.members.show(ctx.params)

app/controller/nodes.js

@@ -15,6 +15,12 @@ module.exports = app => {
  }
 
  async show (ctx) {
+ // validate
+ ctx.validate({
+ id: { type: 'id', required: false },
+ name: { type: 'string', required: false }
+ }, ctx.params)
+
  ctx.body = await ctx.service.nodes.show(ctx.params)
  }
 

app/controller/replies.js

@@ -12,7 +12,7 @@ module.exports = app => {
 
  async show (ctx) {
  ctx.validate({
- topic_id: { type: 'string', required: true }
+ topic_id: { type: 'id', required: true }
  }, ctx.params)
 
  ctx.params = Object.assign(ctx.params, ctx.query)

app/controller/topics.js

@@ -26,15 +26,20 @@ module.exports = app => {
  }
 
  async show (ctx) {
+ // validate
+ ctx.validate({
+ id: { type: 'id', required: true }
+ }, ctx.params)
+
  ctx.body = await ctx.service.topics.show(ctx.params)
  }
 
  async getAllByType (ctx) {
  // validate the params
  ctx.validate({
- username: { type: 'string', required: false },
- node_name: { type: 'string', required: false },
- node_id: { type: 'string', required: false }
+ type: { type: 'enum', values: [ 'username', 'node_name', 'node_id' ], required: true },
+ value: { type: 'string', required: true },
+ page: { type: 'id', required: false }
  }, ctx.params)
 
  // set default page in controller

app/service/replies.js

@@ -18,7 +18,6 @@ module.exports = app => {
 
  async request (query, opts) {
  const url = `${this.root}/${query}.json`
- console.log(url)
  opts = Object.assign({
  timeout: [ '30s', '30s' ],
  dataType: 'json'

test/app/controller/members.test.js

@@ -48,4 +48,15 @@ describe('test/app/controller/members.test.js', () => {
  assert(item.username === 'IndexXuan')
  })
 
+ it('3 should validation failed for id', async () => {
+ const r = await request(app.callback())
+ .get('/api/v2/members/id/abcdef')
+ .expect(422)
+
+ const b = r.body
+ assert(b.error === 'Validation Failed')
+ assert(b.detail[0].field === 'id')
+ })
+
 }) // /.describe
+

test/app/controller/nodes.test.js

@@ -60,5 +60,15 @@ describe('test/app/controller/nodes.test.js', () => {
  assert(vim.url.includes('v2ex.com/go/vim'))
  })
 
+ it('4 should validation failed for id', async () => {
+ const r = await request(app.callback())
+ .get('/api/v2/nodes/id/abc')
+ .expect(422)
+
+ const b = r.body
+ assert(b.error === 'Validation Failed')
+ assert(b.detail[0].field === 'id')
+ })
+
 })
 

test/app/controller/replies.test.js

@@ -35,5 +35,15 @@ describe('test/app/controller/replies.test.js', () => {
  assert(item.content.includes('站长辛苦了'))
  })
 
+ it('2 should validation failed for topic_id', async () => {
+ const r = await request(app.callback())
+ .get('/api/v2/replies/abcdef')
+ .expect(422)
+
+ const b = r.body
+ assert(b.error === 'Validation Failed')
+ assert(b.detail[0].field === 'topic_id')
+ })
+
 }) // /.describe
 

test/app/controller/topics.test.js

@@ -104,5 +104,25 @@ describe('test/app/controller/topics.test.js', () => {
  }
  })
 
+ it('6 should return all vim\'s topics by node_id', async () => {
+ const r = await request(app.callback())
+ .get('/api/v2/topics/all/node_id/249')
+ .expect(200)
+
+ assert(Array.isArray(r.body))
+ const item = r.body.filter(item => item.id === 344868)[0]
+ })
+
+ it('7 should validation failed for enum type when get all topics', async () => {
+ const r = await request(app.callback())
+ .get('/api/v2/topics/all/not_node_name/vim')
+ .expect(422)
+
+ const b = r.body
+ assert(b.error === 'Validation Failed')
+ assert(b.detail[0].message.includes('one of'))
+ assert(b.detail[0].field === 'type')
+ })
+
 }) // /.describe