Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

test query params are an object

Browse Source
This commit is contained in:
Jeff Miccolis 2016-03-29 13:35:56 -04:00 committed by Patrick Niklaus
parent 88a1a69c1b
commit 0fcdb4b8e6
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/step_definitions/hooks.js
View File

@ -5,7 +5,7 @@ module.exports = function () {
this.scenarioTitle = scenario.getName(); this.scenarioTitle = scenario.getName();
this.loadMethod = this.DEFAULT_LOAD_METHOD; this.loadMethod = this.DEFAULT_LOAD_METHOD;
this.queryParams = []; this.queryParams = {};
var d = new Date(); var d = new Date();
this.scenarioTime = util.format('%d-%d-%dT%s:%s:%sZ', d.getFullYear(), d.getMonth()+1, d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds()); this.scenarioTime = util.format('%d-%d-%dT%s:%s:%sZ', d.getFullYear(), d.getMonth()+1, d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds());
this.resetData(); this.resetData();

4
features/step_definitions/options.js
View File

@ -60,8 +60,8 @@ module.exports = function () {
}); });
this.Given(/^the query options$/, (table, callback) => { this.Given(/^the query options$/, (table, callback) => {
table.raw().forEach((tuple) => { table.raw().forEach(tuple => {
this.queryParams.push(tuple); this.queryParams[tuple[0]] = tuple[1]
}); });
callback(); callback();

2
features/step_definitions/requests.js
View File

@ -3,7 +3,7 @@ var assert = require('assert');
module.exports = function () { module.exports = function () {
this.When(/^I request \/(.*)$/, (path, callback) => { this.When(/^I request \/(.*)$/, (path, callback) => {
this.reprocessAndLoadData(() => { this.reprocessAndLoadData(() => {
this.requestPath(path, [], (err, res, body) => { this.requestPath(path, {}, (err, res, body) => {
this.response = res; this.response = res;
callback(err, res, body); callback(err, res, body);
}); });

2
features/support/hooks.js
View File

@ -12,7 +12,7 @@ module.exports = function () {
this.scenarioTitle = scenario.getName(); this.scenarioTitle = scenario.getName();
this.loadMethod = this.DEFAULT_LOAD_METHOD; this.loadMethod = this.DEFAULT_LOAD_METHOD;
this.queryParams = []; this.queryParams = {};
var d = new Date(); var d = new Date();
this.scenarioTime = util.format('%d-%d-%dT%s:%s:%sZ', d.getFullYear(), d.getMonth()+1, d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds()); this.scenarioTime = util.format('%d-%d-%dT%s:%s:%sZ', d.getFullYear(), d.getMonth()+1, d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds());
this.resetData(); this.resetData();

5
features/support/http.js
View File

@ -3,9 +3,12 @@ var request = require('request');
module.exports = function () { module.exports = function () {
this.paramsToString = (params) => { this.paramsToString = (params) => {
var paramString = params.coordinates.join(';') + '.' + params.output; var paramString = '';
if (params.coordinates !== undefined && params.output !== undefined) {
paramString = params.coordinates.join(';') + '.' + params.output;
delete params.coordinates; delete params.coordinates;
delete params.output; delete params.output;
}
if (Object.keys(params).length) { if (Object.keys(params).length) {
paramString += '?' + Object.keys(params).map(k => k + '=' + params[k]).join('&'); paramString += '?' + Object.keys(params).map(k => k + '=' + params[k]).join('&');
} }

8
features/support/route.js
View File

@ -3,7 +3,13 @@ var request = require('request');
module.exports = function () { module.exports = function () {
this.requestPath = (service, params, callback) => { this.requestPath = (service, params, callback) => {
var uri = [this.HOST, service, 'v1', this.profile].join('/'); var uri;
if (service == 'timestamp') {
uri = [this.HOST, service].join('/');
} else {
uri = [this.HOST, service, 'v1', this.profile].join('/');
}
return this.sendRequest(uri, params, callback); return this.sendRequest(uri, params, callback);
}; };