Merge pull request #5 from jelhan/fix-content-type

set correct content type

Author: IanVS

lib/responses/ok.js

@@ -60,7 +60,12 @@ module.exports = function sendOK(data) {
   // Serialize to jsonapi
   jsonApiRes = new JSONAPISerializer(modelName, data, opts);
 
-  // Set status code and send response
+  // Set mime type
+  res.set('Content-Type', 'application/vnd.api+json');
+
+  // Set status code
   res.status(200);
+
+  // Send response
   return res.json(jsonApiRes);
 };

tests/responses/ok-test.js

@@ -80,7 +80,7 @@ test('Book model and fixture is loaded correctly', function (t) {
 });
 
 test('Returns correct attributes', function (t) {
-  t.plan(7);
+  t.plan(9);
 
   sails.request({
     url   : '/user',
@@ -90,6 +90,8 @@ test('Returns correct attributes', function (t) {
       t.fail(err);
     }
     try {
+      t.equal(res.statusCode, 200, 'HTTP status code is 200');
+      t.equal(res.headers['Content-Type'], 'application/vnd.api+json', 'Sends jsonapi mime type');
       t.ok(body.data, 'Body contains a "data" property');
       t.equal(body.data.length, 2, 'There are two user objects');
       t.equal(body.data[0].id, '1', 'First model id is 1');
@@ -105,7 +107,7 @@ test('Returns correct attributes', function (t) {
 });
 
 test('Returns correct nested resources', function (t) {
-  t.plan(3);
+  t.plan(5);
 
   sails.config.jsonapi.compoundDoc = false;
 
@@ -117,6 +119,8 @@ test('Returns correct nested resources', function (t) {
       t.fail(err);
     }
     try {
+      t.equal(res.statusCode, 200, 'HTTP status code is 200');
+      t.equal(res.headers['Content-Type'], 'application/vnd.api+json', 'Sends jsonapi mime type');
       t.ok(body.data[0].attributes.books, '"attributes" contains a "books" property');
       t.equal(typeof body.data[0].attributes.books, 'object', '"books" is an object');
       t.deepEqual(body.data[0].attributes.books[0].title, 'A Game of Thrones', '"title" of first book is "A Game of Thrones"');
@@ -128,7 +132,7 @@ test('Returns correct nested resources', function (t) {
 });
 
 test('Returns relationships for compound document', function (t) {
-  t.plan(4);
+  t.plan(6);
 
   sails.config.jsonapi.compoundDoc = true;
 
@@ -140,6 +144,8 @@ test('Returns relationships for compound document', function (t) {
       t.fail(err);
     }
     try {
+      t.equal(res.statusCode, 200, 'HTTP status code is 200');
+      t.equal(res.headers['Content-Type'], 'application/vnd.api+json', 'Sends jsonapi mime type');
       t.ok(body.data[0].relationships, 'Body contains a "relationships" property');
       t.ok(body.data[0].relationships.books, 'Relationships contains a "books" property');
       t.ok(body.data[0].relationships.books.data, 'Relationships contains a "books" property');
@@ -152,7 +158,7 @@ test('Returns relationships for compound document', function (t) {
 });
 
 test('Returns included data', function (t) {
-  t.plan(8);
+  t.plan(10);
 
   sails.config.jsonapi.compoundDoc = true;
   sails.config.jsonapi.included = true;
@@ -165,6 +171,8 @@ test('Returns included data', function (t) {
       t.fail(err);
     }
     try {
+      t.equal(res.statusCode, 200, 'HTTP status code is 200');
+      t.equal(res.headers['Content-Type'], 'application/vnd.api+json', 'Sends jsonapi mime type');
       t.ok(body.included, 'Body contains an "included" property');
       t.equal(body.included.length, 3, 'Three books are included');
       t.ok(body.included[0].type, '"included" contains a "type" property');
@@ -181,7 +189,7 @@ test('Returns included data', function (t) {
 });
 
 test('Does not return included data if "included = false"', function (t) {
-  t.plan(2);
+  t.plan(4);
 
   sails.config.jsonapi.compoundDoc = true;
   sails.config.jsonapi.included = false;
@@ -194,6 +202,8 @@ test('Does not return included data if "included = false"', function (t) {
       t.fail(err);
     }
     try {
+      t.equal(res.statusCode, 200, 'HTTP status code is 200');
+      t.equal(res.headers['Content-Type'], 'application/vnd.api+json', 'Sends jsonapi mime type');
       t.notOk(body.included, 'Body does not contain an "included" property');
       t.ok(body.data[0].relationships, 'But it still has a "relationships" property (compound doc)');
     } catch (err) {