From 2fa288fc4db30ba560feed067029dd35bd22cd62 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 27 Nov 2013 09:47:33 +0100
Subject: [PATCH] Add (pending) test for getting unrenderable stored styles
 (#94)

Required upgrading mocha tester to ~0.14.0
---
 npm-shrinkwrap.json       | 44 ++++++++++++++++++++++++++++++++-------
 package.json              |  2 +-
 test/acceptance/server.js | 37 ++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 2b739d45..bb1dcd9f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "dependencies": {
     "node-varnish": {
       "version": "0.1.1"
@@ -286,37 +286,65 @@
     "lzma": {
       "version": "1.2.3"
     },
-    "strftime": {
-      "version": "0.6.2"
-    },
     "semver": {
       "version": "1.1.4"
     },
+    "strftime": {
+      "version": "0.6.2"
+    },
     "redis": {
       "version": "0.8.6"
     },
     "mocha": {
-      "version": "1.2.1",
+      "version": "1.14.0",
       "dependencies": {
         "commander": {
-          "version": "0.6.1"
+          "version": "2.0.0"
         },
         "growl": {
-          "version": "1.5.1"
+          "version": "1.7.0"
         },
         "jade": {
           "version": "0.26.3",
           "dependencies": {
+            "commander": {
+              "version": "0.6.1"
+            },
             "mkdirp": {
               "version": "0.3.0"
             }
           }
         },
         "diff": {
-          "version": "1.0.2"
+          "version": "1.0.7"
         },
         "debug": {
           "version": "0.7.4"
+        },
+        "mkdirp": {
+          "version": "0.3.5"
+        },
+        "glob": {
+          "version": "3.2.3",
+          "dependencies": {
+            "minimatch": {
+              "version": "0.2.12",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0"
+                },
+                "sigmund": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "graceful-fs": {
+              "version": "2.0.1"
+            },
+            "inherits": {
+              "version": "2.0.1"
+            }
+          }
         }
       }
     }
diff --git a/package.json b/package.json
index 12792441..3ebace19 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
         "lzma": "~1.2.3"
     },
     "devDependencies": {
-        "mocha": "1.2.1",
+        "mocha": "1.14.0",
         "redis": "~0.8.3",
         "strftime": "~0.6.0",
         "semver": "~1.1.0"
diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index a72969d3..95a4eac2 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -163,6 +163,43 @@ suite('server', function() {
         });
     });
 
+    // See https://github.com/CartoDB/Windshaft-cartodb/issues/94
+    test.skip("get'ing unrenderable style", function(done) {
+      var base_key = 'map_style|'+test_database+'|my_table';
+      var style = '#s{bogus}';
+      Step(
+        function checkRedis() {
+          redis_client.keys(base_key+'*', this);
+        },
+        function setupRedisBase(err, matches) {
+          if ( err ) throw err;
+          assert.equal(matches.length, 0);
+          redis_client.set(base_key, 
+            JSON.stringify({ style: style }),
+          this);
+        },
+        function getStyle(err) {
+          if ( err ) throw err;
+          var next = this;
+          assert.response(server, {
+              headers: {host: 'localhost'},
+              url: '/tiles/my_table/style',
+              method: 'GET'
+              }, {}, function(res) { next(null, res); });
+        },
+        function checkStyle(err, res) {
+          if ( err ) throw err;
+          assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
+          var parsed = JSON.parse(res.body);
+          assert.equal(parsed.style, style);
+          return null
+        },
+        function finish(err) {
+          done(err);
+        }
+      );
+    });
+
     /////////////////////////////////////////////////////////////////////////////////
     //
     // POST STYLE