From 4143928405a283afb9e369318850b37ad7aa0126 Mon Sep 17 00:00:00 2001 From: Severyn Kozak Date: Mon, 4 May 2015 14:49:35 -0400 Subject: [PATCH] Fix longitude-sanitization tests. test/unit/sanitiser/(search, suggest, reverse).js -Update/fix all of the tests that started failing as a result of the removal of longitude sanitization in 90a7683. --- test/unit/sanitiser/reverse.js | 23 ++++++----------------- test/unit/sanitiser/search.js | 17 +++-------------- test/unit/sanitiser/suggest.js | 17 +++-------------- 3 files changed, 12 insertions(+), 45 deletions(-) diff --git a/test/unit/sanitiser/reverse.js b/test/unit/sanitiser/reverse.js index c28eeb03..d2bd39f9 100644 --- a/test/unit/sanitiser/reverse.js +++ b/test/unit/sanitiser/reverse.js @@ -3,7 +3,7 @@ var suggest = require('../../../sanitiser/reverse'), _sanitize = suggest.sanitize, middleware = suggest.middleware, delim = ',', - defaultError = 'missing param \'lat\': must be >-90 and <90', + defaultError = 'missing param \'lat\'', defaultClean = { lat:0, layers: [ 'geoname', 'osmnode', 'osmway', 'admin0', 'admin1', 'admin2', 'neighborhood', 'locality', 'local_admin', 'osmaddress', 'openaddresses' ], @@ -58,7 +58,7 @@ module.exports.tests.sanitize_lat = function(test, common) { test('missing lat', function(t) { lats.missing.forEach( function( lat ){ sanitize({ lat: lat, lon: 0 }, function( err, clean ){ - t.equal(err, 'missing param \'lat\': must be >-90 and <90', 'latitude is a required field'); + t.equal(err, 'missing param \'lat\'', 'latitude is a required field'); t.equal(clean, undefined, 'clean not set'); }); }); @@ -68,20 +68,9 @@ module.exports.tests.sanitize_lat = function(test, common) { module.exports.tests.sanitize_lon = function(test, common) { var lons = { - invalid: [ -360, -181, 181, 360 ], - valid: [ -180, -1, -0, 0, 45, 90, '-180', '0', '180' ], + valid: [ -360, -181, 181, -180, -1, -0, 0, 45, 90, '-180', '0', '180' ], missing: ['', undefined, null] }; - test('invalid lon', function(t) { - lons.invalid.forEach( function( lon ){ - sanitize({ input: 'test', lat: 0, lon: lon }, function( err, clean ){ - t.equal(err, 'invalid param \'lon\': must be >-180 and <180', lon + ' is an invalid longitude'); - t.equal(clean, undefined, 'clean not set'); - - }); - }); - t.end(); - }); test('valid lon', function(t) { lons.valid.forEach( function( lon ){ sanitize({ input: 'test', lat: 0, lon: lon }, function( err, clean ){ @@ -96,7 +85,7 @@ module.exports.tests.sanitize_lon = function(test, common) { test('missing lon', function(t) { lons.missing.forEach( function( lon ){ sanitize({ lat: 0, lon: lon }, function( err, clean ){ - t.equal(err, 'missing param \'lon\': must be >-180 and <180', 'longitude is a required field'); + t.equal(err, 'missing param \'lon\'', 'longitude is a required field'); t.equal(clean, undefined, 'clean not set'); }); }); @@ -286,7 +275,7 @@ module.exports.tests.middleware_failure = function(test, common) { t.equal(code, 400, 'status set'); }}; var next = function( message ){ - t.equal(message, defaultError); + t.equals(message, defaultError); t.end(); }; middleware( {}, res, next ); @@ -314,4 +303,4 @@ module.exports.all = function (tape, common) { for( var testCase in module.exports.tests ){ module.exports.tests[testCase](test, common); } -}; \ No newline at end of file +}; diff --git a/test/unit/sanitiser/search.js b/test/unit/sanitiser/search.js index 37763165..61978d29 100644 --- a/test/unit/sanitiser/search.js +++ b/test/unit/sanitiser/search.js @@ -107,19 +107,8 @@ module.exports.tests.sanitize_lat = function(test, common) { module.exports.tests.sanitize_lon = function(test, common) { var lons = { - invalid: [ -360, -181, 181, 360 ], - valid: [ -180, -1, -0, 0, 45, 90, '-180', '0', '180' ] + valid: [ -381, -181, -180, -1, -0, 0, 45, 90, '-180', '0', '180', 181 ] }; - test('invalid lon', function(t) { - lons.invalid.forEach( function( lon ){ - sanitize({ input: 'test', lat: 0, lon: lon }, function( err, clean ){ - t.equal(err, 'invalid param \'lon\': must be >-180 and <180', lon + ' is an invalid longitude'); - t.equal(clean, undefined, 'clean not set'); - - }); - }); - t.end(); - }); test('valid lon', function(t) { lons.valid.forEach( function( lon ){ sanitize({ input: 'test', lat: 0, lon: lon }, function( err, clean ){ @@ -188,7 +177,7 @@ module.exports.tests.sanitize_bbox = function(test, common) { test('invalid bbox coordinates', function(t) { bboxes.invalid_coordinates.forEach( function( bbox ){ sanitize({ input: 'test', bbox: bbox }, function( err, clean ){ - t.equal(err, 'invalid bbox', bbox + ' is invalid'); + t.ok(err.match(/Invalid (lat|lon)/), bbox + ' is invalid'); t.equal(clean, undefined, 'clean not set'); }); }); @@ -425,4 +414,4 @@ module.exports.all = function (tape, common) { for( var testCase in module.exports.tests ){ module.exports.tests[testCase](test, common); } -}; \ No newline at end of file +}; diff --git a/test/unit/sanitiser/suggest.js b/test/unit/sanitiser/suggest.js index badbff62..4e543d2d 100644 --- a/test/unit/sanitiser/suggest.js +++ b/test/unit/sanitiser/suggest.js @@ -108,19 +108,8 @@ module.exports.tests.sanitize_lat = function(test, common) { module.exports.tests.sanitize_lon = function(test, common) { var lons = { - invalid: [ -360, -181, 181, 360 ], - valid: [ -180, -1, -0, 0, 45, 90, '-180', '0', '180' ] + valid: [ -381, -181, -180, -1, -0, 0, 45, 90, '-180', '0', '180', 181 ] }; - test('invalid lon', function(t) { - lons.invalid.forEach( function( lon ){ - sanitize({ input: 'test', lat: 0, lon: lon }, function( err, clean ){ - t.equal(err, 'invalid param \'lon\': must be >-180 and <180', lon + ' is an invalid longitude'); - t.equal(clean, undefined, 'clean not set'); - - }); - }); - t.end(); - }); test('valid lon', function(t) { lons.valid.forEach( function( lon ){ sanitize({ input: 'test', lat: 0, lon: lon }, function( err, clean ){ @@ -157,7 +146,7 @@ module.exports.tests.sanitize_bbox = function(test, common) { test('invalid bbox coordinates', function(t) { bboxes.invalid_coordinates.forEach( function( bbox ){ sanitize({ input: 'test', lat: 0, lon: 0, bbox: bbox }, function( err, clean ){ - t.equal(err, 'invalid bbox', bbox + ' is invalid'); + t.ok(err.match(/Invalid (lat|lon)/), bbox + ' is invalid'); t.equal(clean, undefined, 'clean not set'); }); }); @@ -394,4 +383,4 @@ module.exports.all = function (tape, common) { for( var testCase in module.exports.tests ){ module.exports.tests[testCase](test, common); } -}; \ No newline at end of file +};