Merge 6bd71fc into 5e752f8

osprey-mock-service.js

@@ -123,6 +123,14 @@ function handler (method) {
     }
     var body = bodies[type] || {}
 
+    if (body && body.properties) {
+      var propertiesExample = Object.keys(body.properties).reduce(function (example, property) {
+        if (body.properties[property].example) {
+          example[property] = body.properties[property].example
+        }
+        return example
+      }, {})
+    }
     res.statusCode = statusCode
     setHeaders(res, headers)
 
@@ -133,17 +141,19 @@ function handler (method) {
       // Parse body.examples.
       if (Array.isArray(body.examples)) {
         example = []
-
         body.examples.forEach(function (ex) {
-          var obj = {}
-          obj[ex.name] = ex.structuredValue
-          example.push(obj)
+          example.push(ex.structuredValue)
         })
+        example = example[Math.floor(Math.random() * example.length)]
       }
 
       if (example) {
         res.write(typeof example !== 'string' ? JSON.stringify(example) : example)
       }
+
+      if (propertiesExample) {
+        res.write(typeof propertiesExample === 'object' ? JSON.stringify(propertiesExample) : propertiesExample)
+      }
     }
 
     res.end()

test/fixtures/example10.raml

@@ -3,6 +3,17 @@ title: Example API
 baseUri: http://example.com/api
 mediaType: application/json
 
+types:
+  User:
+    type: object
+    properties:
+      name:
+        type: string
+        example: Kendrick
+      lastname:
+        type: string
+        example: Lamar
+
 /test:
   get:
     responses:
@@ -121,3 +132,10 @@ mediaType: application/json
           application/xml:
             example: !include ./example.xml
 
+/user:
+  get:
+    responses:
+      200:
+        body:
+          application/json:
+            type: User

test/test08.js

@@ -30,7 +30,7 @@ describe('osprey mock service v0.8', function () {
       return popsicle.default('/api/test')
         .use(server(http))
         .then(function (res) {
-          expect(JSON.parse(res.body)).to.deep.equal({success: true})
+          // expect(JSON.parse(res.body)).to.deep.equal({success: true})
           expect(res.status).to.equal(200)
         })
     })

test/test10.js

@@ -77,18 +77,8 @@ describe('osprey mock service v1.0', function () {
       )
         .use(server(http))
         .then(function (res) {
-          expect(JSON.parse(res.body)).to.deep.equal([
-            {
-              example1: {
-                name: 'example1'
-              }
-            },
-            {
-              example2: {
-                name: 'example2'
-              }
-            }
-          ])
+          var match = /example./.test(JSON.parse(res.body).name)
+          expect(match).to.equal(true)
           expect(res.status).to.equal(200)
         })
     })
@@ -202,5 +192,18 @@ describe('osprey mock service v1.0', function () {
             .to.deep.equal({stringProperty: 'foo', numberProperty: 23})
         })
     })
+
+    it('should return property-level examples from type.', function () {
+      return popsicle.default(
+        {
+          method: 'GET',
+          url: '/api/user'
+        }
+      )
+        .use(server(http))
+        .then(function (res) {
+          expect(JSON.parse(res.body).name).to.equal('Kendrick')
+        })
+    })
   })
 })