From 70d1a30c64079dbf881c2d3e83f00542dcb46c02 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 30 Mar 2015 13:30:57 +0200
Subject: [PATCH] style

---
 test/acceptance/multilayer_server.js | 73 ++++++++++++++++------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js
index ee013eeb..7c6d6a92 100644
--- a/test/acceptance/multilayer_server.js
+++ b/test/acceptance/multilayer_server.js
@@ -1,16 +1,19 @@
 require(__dirname + '/../support/test_helper');
 
-var assert      = require('../support/assert');
+var assert = require('../support/assert');
 
-var redis       = require('redis');
+var redis = require('redis');
+var _ = require('underscore');
 
-var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/cartodb_windshaft');
-var serverOptions = require(__dirname + '/../../lib/cartodb/server_options')();
+var CartodbWindshaft = require('../../lib/cartodb/cartodb_windshaft');
+var serverOptions = require('../../lib/cartodb/server_options')();
 var server = new CartodbWindshaft(serverOptions);
 server.setMaxListeners(0);
 
 describe('tests from old api translated to multilayer', function() {
 
+    var test_database = _.template(global.environment.postgres_auth_user, {user_id:1}) + '_db';
+
     var layergroupUrl = '/api/v1/map';
 
     var redisClient = redis.createClient(global.environment.redis.port);
@@ -45,36 +48,46 @@ describe('tests from old api translated to multilayer', function() {
 
     it("layergroup creation fails if CartoCSS is bogus", function(done) {
         var layergroup = singleLayergroupConfig(wadusSql, '#my_table3{');
-        assert.response(server, {
-            url: layergroupUrl,
-            method: 'POST',
-            headers: {host: 'localhost', 'Content-Type': 'application/json' },
-            data: JSON.stringify(layergroup)
-        }, {}, function(res) {
-            assert.equal(res.statusCode, 400, res.body);
-            var parsed = JSON.parse(res.body);
-            assert.ok(parsed.errors[0].match(/^style0/));
-            assert.ok(parsed.errors[0].match(/missing closing/));
-            done();
-        });
+        assert.response(server,
+            {
+                url: layergroupUrl,
+                method: 'POST',
+                headers: {host: 'localhost', 'Content-Type': 'application/json' },
+                data: JSON.stringify(layergroup)
+            },
+            {
+                status: 400
+            },
+            function(res) {
+                var parsed = JSON.parse(res.body);
+                assert.ok(parsed.errors[0].match(/^style0/));
+                assert.ok(parsed.errors[0].match(/missing closing/));
+                done();
+            }
+        );
     });
 
     it("multiple bad styles returns 400 with all errors", function(done) {
         var layergroup = singleLayergroupConfig(wadusSql, '#my_table4{backgxxxxxround-color:#fff;foo:bar}');
-        assert.response(server, {
-            url: layergroupUrl,
-            method: 'POST',
-            headers: {host: 'localhost', 'Content-Type': 'application/json' },
-            data: JSON.stringify(layergroup)
-        }, {}, function(res) {
-            assert.equal(res.statusCode, 400, res.body);
-            var parsed = JSON.parse(res.body);
-            assert.equal(parsed.errors.length, 1);
-            assert.ok(parsed.errors[0].match(/^style0/));
-            assert.ok(parsed.errors[0].match(/Unrecognized rule: backgxxxxxround-color/));
-            assert.ok(parsed.errors[0].match(/Unrecognized rule: foo/));
-            done();
-        });
+        assert.response(server,
+            {
+                url: layergroupUrl,
+                method: 'POST',
+                headers: {host: 'localhost', 'Content-Type': 'application/json' },
+                data: JSON.stringify(layergroup)
+            },
+            {
+                status: 400
+            },
+            function(res) {
+                var parsed = JSON.parse(res.body);
+                assert.equal(parsed.errors.length, 1);
+                assert.ok(parsed.errors[0].match(/^style0/));
+                assert.ok(parsed.errors[0].match(/Unrecognized rule: backgxxxxxround-color/));
+                assert.ok(parsed.errors[0].match(/Unrecognized rule: foo/));
+                done();
+            }
+        );
     });
 
 });