Skip to content

Commit ce4f99f

Browse files
author
Sandro Santilli
committed
Print body on unexpected non-200 response status
1 parent f7451e9 commit ce4f99f

File tree

1 file changed

+24
-27
lines changed

1 file changed

+24
-27
lines changed

test/acceptance/app.test.js

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,35 +46,38 @@ test('GET /api/v1/sql', function(){
4646
});
4747

4848

49-
test('GET /api/v1/sql with SQL parameter on SELECT only. No oAuth included ', function(){
49+
test('GET /api/v1/sql with SQL parameter on SELECT only. No oAuth included ', function(done){
5050
assert.response(app, {
5151
url: '/api/v1/sql?q=SELECT%20*%20FROM%20untitle_table_4&database=cartodb_test_user_1_db',
5252
method: 'GET'
53-
},{
54-
status: 200
53+
},{ }, function(res) {
54+
assert.equal(res.statusCode, 200, res.body);
55+
done();
5556
});
5657
});
5758

5859

59-
test('GET /api/v1/sql with SQL parameter on SELECT only. no database param, just id using headers', function(){
60+
test('GET /api/v1/sql with SQL parameter on SELECT only. no database param, just id using headers', function(done){
6061
assert.response(app, {
6162
url: '/api/v1/sql?q=SELECT%20*%20FROM%20untitle_table_4',
6263
headers: {host: 'vizzuality.cartodb.com'},
6364
method: 'GET'
64-
},{
65-
status: 200
65+
},{ }, function(res) {
66+
assert.equal(res.statusCode, 200, res.body);
67+
done();
6668
});
6769
});
6870

6971

70-
test('POST /api/v1/sql with SQL parameter on SELECT only. no database param, just id using headers', function(){
72+
test('POST /api/v1/sql with SQL parameter on SELECT only. no database param, just id using headers', function(done){
7173
assert.response(app, {
7274
url: '/api/v1/sql',
7375
data: querystring.stringify({q: "SELECT * FROM untitle_table_4"}),
7476
headers: {host: 'vizzuality.cartodb.com', 'Content-Type': 'application/x-www-form-urlencoded' },
7577
method: 'POST'
76-
},{
77-
status: 200
78+
},{ }, function(res) {
79+
assert.equal(res.statusCode, 200, res.body);
80+
done();
7881
});
7982
});
8083

@@ -121,9 +124,8 @@ test('GET /api/v1/sql with SQL parameter and geojson format, ensuring content-di
121124
url: '/api/v1/sql?q=SELECT%20*%20FROM%20untitle_table_4&format=geojson',
122125
headers: {host: 'vizzuality.cartodb.com'},
123126
method: 'GET'
124-
},{
125-
status: 200
126-
}, function(res){
127+
},{ }, function(res){
128+
assert.equal(res.statusCode, 200, res.body);
127129
var cd = res.header('Content-Disposition');
128130
assert.equal(true, /filename=cartodb-query.geojson/gi.test(cd));
129131
done();
@@ -135,9 +137,8 @@ test('GET /api/v1/sql with SQL parameter and no format, ensuring content-disposi
135137
url: '/api/v1/sql?q=SELECT%20*%20FROM%20untitle_table_4',
136138
headers: {host: 'vizzuality.cartodb.com'},
137139
method: 'GET'
138-
},{
139-
status: 200
140-
}, function(res){
140+
},{ }, function(res){
141+
assert.equal(res.statusCode, 200, res.body);
141142
var cd = res.header('Content-Disposition');
142143
assert.equal(true, /filename=cartodb-query.json/gi.test(cd));
143144
done();
@@ -163,9 +164,8 @@ test('GET /api/v1/sql as geojson limiting decimal places', function(done){
163164
url: '/api/v1/sql?q=SELECT%20*%20FROM%20untitle_table_4&format=geojson&dp=1',
164165
headers: {host: 'vizzuality.cartodb.com'},
165166
method: 'GET'
166-
},{
167-
status: 200
168-
}, function(res){
167+
},{ }, function(res){
168+
assert.equal(res.statusCode, 200, res.body);
169169
var result = JSON.parse(res.body);
170170
assert.equal(1, checkDecimals(result.features[0].geometry.coordinates[0], '.'));
171171
done();
@@ -177,9 +177,8 @@ test('GET /api/v1/sql as geojson with default dp as 6', function(done){
177177
url: '/api/v1/sql?q=SELECT%20*%20FROM%20untitle_table_4&format=geojson',
178178
headers: {host: 'vizzuality.cartodb.com'},
179179
method: 'GET'
180-
},{
181-
status: 200
182-
}, function(res){
180+
},{ }, function(res){
181+
assert.equal(res.statusCode, 200, res.body);
183182
var result = JSON.parse(res.body);
184183
assert.equal(6, checkDecimals(result.features[0].geometry.coordinates[0], '.'));
185184
done();
@@ -191,9 +190,8 @@ test('GET /api/v1/sql as csv', function(done){
191190
url: '/api/v1/sql?q=SELECT%20cartodb_id,ST_AsEWKT(the_geom)%20as%20geom%20FROM%20untitle_table_4%20LIMIT%201&format=csv',
192191
headers: {host: 'vizzuality.cartodb.com'},
193192
method: 'GET'
194-
},{
195-
status: 200
196-
}, function(res){
193+
},{ }, function(res){
194+
assert.equal(res.statusCode, 200, res.body);
197195
var body = "cartodb_id,geom\r\n1,SRID=4326;POINT(-3.699732 40.423012)";
198196
assert.equal(body, res.body);
199197
done();
@@ -205,9 +203,8 @@ test('GET /api/v1/sql as csv, properly escaped', function(done){
205203
url: '/api/v1/sql?q=SELECT%20cartodb_id,%20address%20FROM%20untitle_table_4%20LIMIT%201&format=csv',
206204
headers: {host: 'vizzuality.cartodb.com'},
207205
method: 'GET'
208-
},{
209-
status: 200
210-
}, function(res){
206+
},{ }, function(res){
207+
assert.equal(res.statusCode, 200, res.body);
211208
var body = 'cartodb_id,address\r\n1,"Calle de Pérez Galdós 9, Madrid, Spain"';
212209
assert.equal(body, res.body);
213210
done();

0 commit comments

Comments
 (0)