Skip to content

Commit

Permalink
Roll back changes that will have to wait for v3.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kjellmorten
kjellmorten committed May 5, 2018
1 parent c36806f commit 43880c5
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 36 deletions.
1 change: 0 additions & 1 deletion .travis.yml
View file
Expand Up @@ -9,7 +9,6 @@ node_js:
- 4
- 6
- 8
- 10
before_script:
- npm prune
branches:
Expand Down
70 changes: 35 additions & 35 deletions test/index.js
View file
@@ -1,7 +1,7 @@
'use strict';

const Boom = require('boom');
const { expect } = require('code');
const Code = require('code');
const Hapi = require('hapi');
const Hoek = require('hoek');
const Lab = require('lab');
Expand All @@ -11,11 +11,11 @@ const lab = exports.lab = Lab.script();
const errorCheck = function (response, code, detail) {

const payload = JSON.parse(response.payload);
expect(payload).to.include('errors');
expect(payload.errors).to.have.length(1);
expect(payload.meta).to.include('id');
Code.expect(payload).to.include('errors');
Code.expect(payload.errors).to.have.length(1);
Code.expect(payload.meta).to.include('id');
if (detail) {
expect(payload.errors[0].detail).to.include(detail);
Code.expect(payload.errors[0].detail).to.include(detail);
}
};

Expand Down Expand Up @@ -87,10 +87,10 @@ lab.experiment('hapi-json-api', () => {
//server.inject(options, function (response) {

//var payload = JSON.parse(response.payload);
//expect(response.statusCode).to.equal(200);
//expect(payload).to.include({data: {id: 'ok'}});
//expect(payload.meta).to.include('test', 'id');
//expect(payload.meta.test).to.equal(true);
//Code.expect(response.statusCode).to.equal(200);
//Code.expect(payload).to.include({data: {id: 'ok'}});
//Code.expect(payload.meta).to.include('test', 'id');
//Code.expect(payload.meta.test).to.equal(true);
//done();
//});
//});
Expand All @@ -102,7 +102,7 @@ lab.experiment('hapi-json-api', () => {
//};
//server.inject(options, function (response) {

//expect(response.statusCode).to.equal(400);
//Code.expect(response.statusCode).to.equal(400);
//done();
//});
//});
Expand Down Expand Up @@ -148,10 +148,10 @@ lab.experiment('hapi-json-api', () => {
//server.inject(options, function (response) {

//var payload = JSON.parse(response.payload);
//expect(response.statusCode).to.equal(200);
//expect(payload).to.include({data: {id: 'ok'}});
//expect(payload.meta).to.include('test', 'id');
//expect(payload.meta.test).to.equal(true);
//Code.expect(response.statusCode).to.equal(200);
//Code.expect(payload).to.include({data: {id: 'ok'}});
//Code.expect(payload.meta).to.include('test', 'id');
//Code.expect(payload.meta.test).to.equal(true);
//done();
//});
//});
Expand All @@ -166,10 +166,10 @@ lab.experiment('hapi-json-api', () => {
//server.inject(options, function (response) {

//var payload = JSON.parse(response.payload);
//expect(response.statusCode).to.equal(200);
//expect(payload).to.include({data: {id: 'ok'}});
//expect(payload.meta).to.include('test', 'id');
//expect(payload.meta.test).to.equal(true);
//Code.expect(response.statusCode).to.equal(200);
//Code.expect(payload).to.include({data: {id: 'ok'}});
//Code.expect(payload.meta).to.include('test', 'id');
//Code.expect(payload.meta.test).to.equal(true);
//done();
//});
//});
Expand Down Expand Up @@ -222,8 +222,8 @@ lab.experiment('hapi-json-api', () => {
server.inject(options, (response) => {

const payload = JSON.parse(response.payload);
expect(response.statusCode).to.equal(200);
expect(payload).to.part.include({ data: { id: 'post' } });
Code.expect(response.statusCode).to.equal(200);
Code.expect(payload).to.part.include({ data: { id: 'post' } });
done();
});
});
Expand Down Expand Up @@ -308,8 +308,8 @@ lab.experiment('hapi-json-api', () => {
server.inject(options, (response) => {

const payload = JSON.parse(response.payload);
expect(response.statusCode).to.equal(200);
expect(payload).to.part.include({ data: { id: 'post' } });
Code.expect(response.statusCode).to.equal(200);
Code.expect(payload).to.part.include({ data: { id: 'post' } });
done();
});
});
Expand All @@ -329,7 +329,7 @@ lab.experiment('hapi-json-api', () => {

errorCheck(response, 404);
const payload = JSON.parse(response.payload);
expect(payload.meta.test).to.equal(true);
Code.expect(payload.meta.test).to.equal(true);
done();
});

Expand Down Expand Up @@ -362,8 +362,8 @@ lab.experiment('hapi-json-api', () => {
};
server.inject(options, (response) => {

expect(response.statusCode).to.equal(204);
expect(response.payload).to.equal('');
Code.expect(response.statusCode).to.equal(204);
Code.expect(response.payload).to.equal('');
done();
});
});
Expand All @@ -379,7 +379,7 @@ lab.experiment('hapi-json-api', () => {
};
server.inject(options, (response) => {

expect(response.statusCode).to.equal(200);
Code.expect(response.statusCode).to.equal(200);
done();
});
});
Expand Down Expand Up @@ -424,10 +424,10 @@ lab.experiment('hapi-json-api', () => {
server.inject(options, (response) => {

const payload = JSON.parse(response.payload);
expect(response.statusCode).to.equal(200);
expect(payload).to.part.include({ data: { id: 'ok' } });
expect(payload.meta).to.include('id');
expect(response.headers['content-type']).to.equal('application/vnd.api+json');
Code.expect(response.statusCode).to.equal(200);
Code.expect(payload).to.part.include({ data: { id: 'ok' } });
Code.expect(payload.meta).to.include('id');
Code.expect(response.headers['content-type']).to.equal('application/vnd.api+json');
done();
});
});
Expand Down Expand Up @@ -456,9 +456,9 @@ lab.experiment('hapi-json-api', () => {
server.inject(options, (response) => {

const payload = response.payload;
expect(response.statusCode).to.equal(200);
expect(response.headers['content-type']).to.equal('text/plain; charset=utf-8');
expect(payload).to.equal('ok');
Code.expect(response.statusCode).to.equal(200);
Code.expect(response.headers['content-type']).to.equal('text/plain; charset=utf-8');
Code.expect(payload).to.equal('ok');
done();
});
});
Expand All @@ -474,8 +474,8 @@ lab.experiment('hapi-json-api', () => {
server.inject(options, (response) => {

const payload = response.payload;
expect(response.statusCode).to.equal(200);
expect(payload).to.equal('ok');
Code.expect(response.statusCode).to.equal(200);
Code.expect(payload).to.equal('ok');
done();
});
});
Expand Down

0 comments on commit 43880c5

Please sign in to comment.