From f582b04b23ca5bdde1e9e6c61c696d0b9a48dff7 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 29 Nov 2013 13:20:21 +0100
Subject: [PATCH] Enable test for fetcing tiles of private tables using api_key

See #39 and #91
---
 test/acceptance/multilayer.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js
index 531c1029..c7d6f3bd 100644
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -783,7 +783,7 @@ suite('multilayer', function() {
 
     // See https://github.com/CartoDB/Windshaft-cartodb/issues/91
     // and https://github.com/CartoDB/Windshaft-cartodb/issues/38
-    test.skip("tiles for private tables can be fetched with api_key", function(done) {
+    test("tiles for private tables can be fetched with api_key", function(done) {
       var errors = [];
       var layergroup =  {
         version: '1.0.0',
@@ -801,7 +801,7 @@ suite('multilayer', function() {
         {
           var next = this;
           assert.response(server, {
-              url: '/tiles/layergroup',
+              url: '/tiles/layergroup?api_key=1234',
               method: 'POST',
               headers: {host: 'localhost', 'Content-Type': 'application/json' },
               data: JSON.stringify(layergroup)
@@ -822,6 +822,23 @@ suite('multilayer', function() {
           }
           next(null, res);
         },
+        function do_get_tile(err)
+        {
+          if ( err ) throw err;
+          var next = this;
+          assert.response(server, {
+              url: '/tiles/layergroup/' + expected_token + ':cb0/0/0/0.png?api_key=1234',
+              method: 'GET',
+              headers: {host: 'localhost' },
+              encoding: 'binary'
+          }, {}, function(res) { next(null, res); });
+        },
+        function check_get_tile(err, res) {
+          if ( err ) throw err;
+          var next = this;
+          assert.equal(res.statusCode, 200, res.body);
+          return null;
+        },
         function cleanup(err) {
           if ( err ) errors.push(err.message);
           if ( ! expected_token ) return null;