diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 0adf29cb..b27a9629 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -187,4 +187,36 @@ describe('tests from old api translated to multilayer', function() { }); }); + it("creating a layergroup from lzma param, invalid json input", function(done){ + + var params = { + config: 'WADUS' + }; + + testHelper.lzma_compress_to_base64(JSON.stringify(params), 1, function(err, lzma) { + if (err) { + return done(err); + } + assert.response(server, + { + url: layergroupUrl + '?lzma=' + encodeURIComponent(lzma), + method: 'GET', + headers: { + host: 'localhost' + }, + encoding: 'binary' + }, + { + status: 400 + }, + function(res) { + var parsed = JSON.parse(res.body); + assert.deepEqual(parsed, { errors: [ 'Unexpected token W' ] }); + + done(); + } + ); + }); + }); + }); diff --git a/test/acceptance/server.js b/test/acceptance/server.js index ce77619a..7d256fbd 100644 --- a/test/acceptance/server.js +++ b/test/acceptance/server.js @@ -64,7 +64,7 @@ suite('server', function() { }); }); -suite('server old_api', function() { +suite.skip('server old_api', function() { var redis_client = redis.createClient(global.environment.redis.port); diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh index 8185da4d..dba10043 100755 --- a/test/support/prepare_db.sh +++ b/test/support/prepare_db.sh @@ -79,8 +79,8 @@ if test x"$PREPARE_PGSQL" = xyes; then psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1 psql -c "CREATE EXTENSION plpythonu;" ${TEST_DB} - curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql - curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql +# curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql +# curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql cat sql/CDB_QueryStatements.sql sql/CDB_QueryTables.sql | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1