Merge pull request #50 from mulesoft-labs/23_support_mediaTypeExtension

Fixes #23 add support for mediatypeextension
mulesoft-labs · Apr 4, 2018 · 7311a36 · 7311a36
2 parents 8b65548 + 9577b0d
commit 7311a36
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 11 deletions.
diff --git a/osprey-mock-service.js b/osprey-mock-service.js
@@ -116,7 +116,12 @@ function handler (method) {
   return function (req, res) {
     var negotiator = new Negotiator(req)
     var type = negotiator.mediaType(types)
-    var body = bodies[type]
+    if (req.params && (req.params.mediaTypeExtension || req.params.ext)) {
+      var ext = req.params.mediaTypeExtension || req.params.ext
+      ext = ext.slice(1)
+      type = 'application/' + ext
+    }
+    var body = bodies[type] || {}
 
     res.statusCode = statusCode
     setHeaders(res, headers)

diff --git a/test/fixtures/example.xml b/test/fixtures/example.xml
@@ -0,0 +1,4 @@
+<resource>
+  <stringProperty>foo</stringProperty>
+  <numberProperty>23</numberProperty>
+</resource>
diff --git a/test/fixtures/example10.raml b/test/fixtures/example10.raml
@@ -87,6 +87,7 @@ mediaType: application/json
         headers:
           foo:
             default: test
+
 /defaultmediatype:
   get:
     responses:
@@ -95,3 +96,28 @@ mediaType: application/json
           example:
             stringProperty: foo
             numberProperty: 23
+
+/mediatypeextension{mediaTypeExtension}:
+  get:
+    responses:
+      200:
+        body:
+          application/json:
+            example:
+              stringProperty: foo
+              numberProperty: 23
+          application/xml:
+            example: !include ./example.xml
+
+/ext{ext}:
+  get:
+    responses:
+      200:
+        body:
+          application/json:
+            example:
+              stringProperty: foo
+              numberProperty: 23
+          application/xml:
+            example: !include ./example.xml
+
diff --git a/test/test10.js b/test/test10.js
@@ -61,11 +61,11 @@ describe('osprey mock service v1.0', function () {
           url: '/api/boolean'
         }
       )
-      .use(server(http))
-      .then(function (res) {
-        expect(JSON.parse(res.body)).to.equal(true)
-        expect(res.status).to.equal(200)
-      })
+        .use(server(http))
+        .then(function (res) {
+          expect(JSON.parse(res.body)).to.equal(true)
+          expect(res.status).to.equal(200)
+        })
     })
 
     it('should respond with multiple examples', function () {
@@ -169,11 +169,38 @@ describe('osprey mock service v1.0', function () {
           url: '/api/defaultmediatype'
         }
       )
-      .use(server(http))
-      .then(function (res) {
-        expect(JSON.parse(res.body))
-        .to.deep.equal({stringProperty: 'foo', numberProperty: 23})
-      })
+        .use(server(http))
+        .then(function (res) {
+          expect(JSON.parse(res.body))
+            .to.deep.equal({stringProperty: 'foo', numberProperty: 23})
+        })
+    })
+
+    it('should respect mediaTypeExtensions', function () {
+      return popsicle.default(
+        {
+          method: 'GET',
+          url: '/api/mediatypeextension.xml'
+        }
+      )
+        .use(server(http))
+        .then(function (res) {
+          expect(res.body).to.contain('<resource>', '<stringProperty>', '<numberProperty>')
+        })
+    })
+
+    it('should respect ext', function () {
+      return popsicle.default(
+        {
+          method: 'GET',
+          url: '/api/ext.json'
+        }
+      )
+        .use(server(http))
+        .then(function (res) {
+          expect(JSON.parse(res.body))
+            .to.deep.equal({stringProperty: 'foo', numberProperty: 23})
+        })
     })
   })
 })