Browse Source

update ciao tests, update ciao itself

pull/276/head
Peter Johnson 9 years ago
parent
commit
bfb63ec912
  1. 2
      package.json
  2. 4
      test/ciao/404.coffee
  3. 8
      test/ciao/autocomplete/basic_autocomplete.coffee
  4. 11
      test/ciao/autocomplete/null_island.coffee
  5. 2
      test/ciao/index.coffee
  6. 8
      test/ciao/place/basic_place.coffee
  7. 8
      test/ciao/place/missing_id.coffee
  8. 9
      test/ciao/reverse/basic_reverse.coffee
  9. 9
      test/ciao/reverse/null_island.coffee
  10. 41
      test/ciao/search/address_parsing.coffee
  11. 8
      test/ciao/search/basic_search.coffee
  12. 33
      test/ciao/search/no_params.coffee
  13. 10
      test/ciao/search/null_island.coffee

2
package.json

@ -59,7 +59,7 @@
"through2": "0.6.5" "through2": "0.6.5"
}, },
"devDependencies": { "devDependencies": {
"ciao": "^0.3.4", "ciao": "^0.6.0",
"istanbul": "^0.3.13", "istanbul": "^0.3.13",
"jshint": "^2.5.6", "jshint": "^2.5.6",
"nsp": "^0.3.0", "nsp": "^0.3.0",

4
test/ciao/404.coffee

@ -3,7 +3,7 @@
path: '/notexist' path: '/notexist'
#? not found #? not found
response.statusCode.should.equal 404 response.statusCode.should.be.equal 404
#? content-type header correctly set #? content-type header correctly set
response.should.have.header 'Content-Type','application/json; charset=utf-8' response.should.have.header 'Content-Type','application/json; charset=utf-8'
@ -14,4 +14,4 @@ response.should.have.header 'Cache-Control','public,max-age=300'
#? should respond in json with server info #? should respond in json with server info
should.exist json should.exist json
should.exist json.error should.exist json.error
json.error.should.equal 'not found: invalid path' json.error.should.be.equal 'not found: invalid path'

8
test/ciao/autocomplete/basic_autocomplete.coffee

@ -3,7 +3,7 @@
path: '/v1/autocomplete?text=a' path: '/v1/autocomplete?text=a'
#? 200 ok #? 200 ok
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8' response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8' response.should.have.header 'content-type', 'application/json; charset=utf-8'
@ -19,7 +19,7 @@ should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp should.exist json.geocoding.timestamp
#? valid geojson #? valid geojson
json.type.should.equal 'FeatureCollection' json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array json.features.should.be.instanceof Array
#? expected errors #? expected errors
@ -27,3 +27,7 @@ should.not.exist json.geocoding.errors
#? expected warnings #? expected warnings
should.not.exist json.geocoding.warnings should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['text'].should.eql 'a'
json.geocoding.query['size'].should.eql 10

11
test/ciao/autocomplete/null_island.coffee

@ -1,9 +1,9 @@
#> null island #> null island
path: '/v1/autocomplete?text=a&lat=0&lon=0' path: '/v1/autocomplete?text=a&focus.point.lat=0&focus.point.lon=0'
#? 200 ok #? 200 ok
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8' response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8' response.should.have.header 'content-type', 'application/json; charset=utf-8'
@ -19,7 +19,7 @@ should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp should.exist json.geocoding.timestamp
#? valid geojson #? valid geojson
json.type.should.equal 'FeatureCollection' json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array json.features.should.be.instanceof Array
#? expected errors #? expected errors
@ -27,3 +27,8 @@ should.not.exist json.geocoding.errors
#? expected warnings #? expected warnings
should.not.exist json.geocoding.warnings should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['lat'].should.eql 0
json.geocoding.query['lon'].should.eql 0
json.geocoding.query['size'].should.eql 10

2
test/ciao/index.coffee

@ -3,7 +3,7 @@
path: '/v1/' path: '/v1/'
#? endpoint available #? endpoint available
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
#? content-type header correctly set #? content-type header correctly set
response.should.have.header 'Content-Type','text/html; charset=utf-8' response.should.have.header 'Content-Type','text/html; charset=utf-8'

8
test/ciao/place/basic_place.coffee

@ -3,7 +3,7 @@
path: '/v1/place?id=geoname:1' path: '/v1/place?id=geoname:1'
#? 200 ok #? 200 ok
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8' response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8' response.should.have.header 'content-type', 'application/json; charset=utf-8'
@ -19,7 +19,7 @@ should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp should.exist json.geocoding.timestamp
#? valid geojson #? valid geojson
json.type.should.equal 'FeatureCollection' json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array json.features.should.be.instanceof Array
#? expected errors #? expected errors
@ -27,3 +27,7 @@ should.not.exist json.geocoding.errors
#? expected warnings #? expected warnings
should.not.exist json.geocoding.warnings should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['ids'].should.eql [{ id: '1', type: 'geoname' }]
should.not.exist json.geocoding.query['size']

8
test/ciao/place/missing_id.coffee

@ -3,7 +3,7 @@
path: '/v1/place' path: '/v1/place'
#? 200 ok #? 200 ok
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8' response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8' response.should.have.header 'content-type', 'application/json; charset=utf-8'
@ -19,7 +19,7 @@ should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp should.exist json.geocoding.timestamp
#? valid geojson #? valid geojson
json.type.should.equal 'FeatureCollection' json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array json.features.should.be.instanceof Array
#? expected errors #? expected errors
@ -28,3 +28,7 @@ json.geocoding.errors.should.eql [ 'invalid param \'id\': text length, must be >
#? expected warnings #? expected warnings
should.not.exist json.geocoding.warnings should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['ids'].should.eql []
should.not.exist json.geocoding.query['size']

9
test/ciao/reverse/basic_reverse.coffee

@ -3,7 +3,7 @@
path: '/v1/reverse?point.lat=1&point.lon=2' path: '/v1/reverse?point.lat=1&point.lon=2'
#? 200 ok #? 200 ok
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8' response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8' response.should.have.header 'content-type', 'application/json; charset=utf-8'
@ -19,7 +19,7 @@ should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp should.exist json.geocoding.timestamp
#? valid geojson #? valid geojson
json.type.should.equal 'FeatureCollection' json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array json.features.should.be.instanceof Array
#? expected errors #? expected errors
@ -27,3 +27,8 @@ should.not.exist json.geocoding.errors
#? expected warnings #? expected warnings
should.not.exist json.geocoding.warnings should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['lat'].should.eql 1
json.geocoding.query['lon'].should.eql 2
json.geocoding.query['size'].should.eql 10

9
test/ciao/reverse/null_island.coffee

@ -3,7 +3,7 @@
path: '/v1/reverse?point.lat=0&point.lon=0' path: '/v1/reverse?point.lat=0&point.lon=0'
#? 200 ok #? 200 ok
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8' response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8' response.should.have.header 'content-type', 'application/json; charset=utf-8'
@ -19,7 +19,7 @@ should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp should.exist json.geocoding.timestamp
#? valid geojson #? valid geojson
json.type.should.equal 'FeatureCollection' json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array json.features.should.be.instanceof Array
#? expected errors #? expected errors
@ -27,3 +27,8 @@ should.not.exist json.geocoding.errors
#? expected warnings #? expected warnings
should.not.exist json.geocoding.warnings should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['lat'].should.eql 0
json.geocoding.query['lon'].should.eql 0
json.geocoding.query['size'].should.eql 10

41
test/ciao/search/address_parsing.coffee

@ -0,0 +1,41 @@
#> address parsing
path: '/v1/search?text=30%20w%2026th%20st%2C%20ny'
#? 200 ok
response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8'
#? valid geocoding block
should.exist json.geocoding
should.exist json.geocoding.version
should.exist json.geocoding.attribution
should.exist json.geocoding.query
should.exist json.geocoding.engine
should.exist json.geocoding.engine.name
should.exist json.geocoding.engine.author
should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp
#? valid geojson
json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array
#? expected errors
should.not.exist json.geocoding.errors
#? expected warnings
should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['text'].should.eql '30 w 26th st, ny'
json.geocoding.query['size'].should.eql 10
#? address parsing
json.geocoding.query.parsed_text['name'].should.eql '30 w 26th st'
json.geocoding.query.parsed_text['number'].should.eql 30
json.geocoding.query.parsed_text['street'].should.eql 'w 26th st'
json.geocoding.query.parsed_text['state'].should.eql 'NY'
json.geocoding.query.parsed_text['regions'].should.eql []
json.geocoding.query.parsed_text['admin_parts'].should.eql "ny"

8
test/ciao/search/basic_search.coffee

@ -3,7 +3,7 @@
path: '/v1/search?text=a' path: '/v1/search?text=a'
#? 200 ok #? 200 ok
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8' response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8' response.should.have.header 'content-type', 'application/json; charset=utf-8'
@ -19,7 +19,7 @@ should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp should.exist json.geocoding.timestamp
#? valid geojson #? valid geojson
json.type.should.equal 'FeatureCollection' json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array json.features.should.be.instanceof Array
#? expected errors #? expected errors
@ -27,3 +27,7 @@ should.not.exist json.geocoding.errors
#? expected warnings #? expected warnings
should.not.exist json.geocoding.warnings should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['text'].should.eql 'a'
json.geocoding.query['size'].should.eql 10

33
test/ciao/search/no_params.coffee

@ -0,0 +1,33 @@
#> no params specified
path: '/v1/search'
#? 200 ok
response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8'
#? valid geocoding block
should.exist json.geocoding
should.exist json.geocoding.version
should.exist json.geocoding.attribution
should.exist json.geocoding.query
should.exist json.geocoding.engine
should.exist json.geocoding.engine.name
should.exist json.geocoding.engine.author
should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp
#? valid geojson
json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array
#? expected errors
should.exist json.geocoding.errors
json.geocoding.errors.should.eql [ 'invalid param \'text\': text length, must be >0' ]
#? expected warnings
should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['size'].should.eql 10

10
test/ciao/search/null_island.coffee

@ -3,7 +3,7 @@
path: '/v1/search?text=a&focus.point.lat=0&focus.point.lon=0' path: '/v1/search?text=a&focus.point.lat=0&focus.point.lon=0'
#? 200 ok #? 200 ok
response.statusCode.should.equal 200 response.statusCode.should.be.equal 200
response.should.have.header 'charset', 'utf8' response.should.have.header 'charset', 'utf8'
response.should.have.header 'content-type', 'application/json; charset=utf-8' response.should.have.header 'content-type', 'application/json; charset=utf-8'
@ -19,7 +19,7 @@ should.exist json.geocoding.engine.version
should.exist json.geocoding.timestamp should.exist json.geocoding.timestamp
#? valid geojson #? valid geojson
json.type.should.equal 'FeatureCollection' json.type.should.be.equal 'FeatureCollection'
json.features.should.be.instanceof Array json.features.should.be.instanceof Array
#? expected errors #? expected errors
@ -27,3 +27,9 @@ should.not.exist json.geocoding.errors
#? expected warnings #? expected warnings
should.not.exist json.geocoding.warnings should.not.exist json.geocoding.warnings
#? inputs
json.geocoding.query['text'].should.eql 'a'
json.geocoding.query['size'].should.eql 10
json.geocoding.query['lat'].should.eql 0
json.geocoding.query['lon'].should.eql 0
Loading…
Cancel
Save