From 90d726c0cbe1e1558e25170f725c7de9383fa4b6 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 9 Oct 2012 18:35:27 +0200
Subject: [PATCH] Fix test expectance after windshaft/grainstore upgrade

Now GET /style response includes CartoCSS version...
---
 test/acceptance/server.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index ad88d7f0..dcf590ff 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -47,8 +47,12 @@ suite('server', function() {
         },{
             status: 200,
             headers: { 'X-Cache-Channel': 'cartodb_test_user_1_db:my_table' },
-            body: '{"style":"#my_table {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}"}'
-        }, function() { done(); });
+        }, function(res) {
+            var parsed = JSON.parse(res.body);
+            assert.equal(parsed.style, "#my_table {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}");
+            assert.equal(parsed.version, '2.0.0');
+            done();
+        });
     });
 
     // See https://github.com/Vizzuality/Windshaft-cartodb/issues/43
@@ -77,7 +81,9 @@ suite('server', function() {
         },{
         }, function(res) {
           assert.equal(res.statusCode, 200, res.body);
-          assert.deepEqual(res.body, '{"style":"#test_table_private_1 {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}"}');
+          var parsed = JSON.parse(res.body);
+          assert.equal(parsed.style, "#test_table_private_1 {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}");
+          assert.equal(parsed.version, '2.0.0');
           done();
         });
     });