Streamlined test requests with defaults wrapper creation.

src/server/api/auth/api-auth-login.js

@@ -3,6 +3,7 @@
 
 import _ from 'underscore';
 import crypto from 'crypto';
+import httpConst from 'http-constants';
 
 import resource from './api-auth-resource.js';
 import query from '../../neo4j.js'
@@ -52,7 +53,7 @@ operation.handler = (request, response, params) => {
 
 		if (!result || !result.user) {
 			console.info(`Couldn't find user for email ${email}`);
-			return response.status(404).json({});;
+			return response.status(httpConst.codes.NOT_FOUND).json({});
 		}
 
 		const user = _.extend({}, result.user, {
@@ -66,15 +67,15 @@ operation.handler = (request, response, params) => {
 
 		if (hash !== user.password) {
 			console.info(`Couldn't validate user's password`);
-			return response.status(401).json({});
+			return response.status(httpConst.codes.UNAUTHORIZED).json({});
 		}
 
 		user.token = crypto.createHash('md5')
 				.update(user.email + hash)
 				.digest('hex');
 
 		request.session.user = user;
-		return response.status(200).json(user);
+		return response.status(httpConst.codes.OK).json(user);
 
 	});
 

src/server/api/users/api-users-list.js

@@ -20,7 +20,7 @@ export const name = 'list';
 
 operation.validator = (c) => {
 	return {
-	}
+	};
 };
 
 operation.handler = (request, response, params) => {

src/test/api/auth/login.spec.js

@@ -2,7 +2,6 @@
 'use strict';
 
 import chai from 'chai';
-import req from 'request-promise';
 
 const expect = chai.expect;
 
@@ -14,12 +13,9 @@ export const request = (email, password) => {
 	email && ( body.email = email );
 	password && ( body.password = password );
 
-	return req({
-		resolveWithFullResponse: true,
+	return setup.request({
 		uri: `${setup.baseurl}/auth`,
 		method: 'PUT',
-		simple: false,
-		json: true,
 		body: body
 	});
 

src/test/api/options.spec.js

@@ -8,12 +8,9 @@ const expect = chai.expect;
 import * as setup from './setup.js';
 
 export const request = () => {
-	return req({
-		resolveWithFullResponse: true,
+	return setup.request({
 		uri: `${setup.baseurl}`,
-		method: 'OPTIONS',
-		simple: false,
-		json: true
+		method: 'OPTIONS'
 	});
 };
 

src/test/api/setup.js

@@ -1,3 +1,24 @@
 /* globals before, after, describe, it, console */
 
+import req from 'request-promise';
+
 export const baseurl = 'http://localhost:8000/api';
+
+export const request = req.defaults({
+	resolveWithFullResponse: true,
+	simple: false,
+	json: true,
+	jar: true
+});
+
+before(() => {
+
+	req.debug = true;
+
+});
+
+beforeEach(() => {
+
+	request.jar();
+
+});

src/test/api/users/list.spec.js

@@ -1,20 +1,20 @@
 /* globals require, describe, it */
 
 let chai = require('chai');
-let req = require('request-promise');
 
 let expect = chai.expect;
 
 import * as setup from '../setup.js';
 import { request as login } from '../auth/login.spec.js';
 
 export const request = () => {
-	return req({
+	return setup.request({
 		resolveWithFullResponse: true,
 		uri: `${setup.baseurl}/users`,
 		method: 'GET',
 		simple: false,
-		json: true
+		json: true,
+		jar: true
 	});
 };
 
@@ -32,7 +32,7 @@ describe("GET:/users", () => {
 
 	it('should provide a list of users', () => {
 
-		return login('[email protected]', 'realpassword').then((response) => {
+		return login('[email protected]', 'password').then((response) => {
 			expect(response.statusCode).to.equal(200);
 			return request();