Upgrade dependencies and regenerate npm-shrinkwrap.json

Surrogate keys tests sleeping :-(

npm-shrinkwrap.json

@@ -119,12 +119,114 @@
     },
     "fastly-purge": {
       "version": "1.0.0",
-      "from": "fastly-purge@~1.0.0",
+      "from": "fastly-purge@~1.0.0"
+    },
+    "log4js": {
+      "version": "0.6.25",
+      "from": "https://github.com/CartoDB/log4js-node/tarball/cdb",
+      "resolved": "https://github.com/CartoDB/log4js-node/tarball/cdb",
       "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "from": "async@~0.2.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+        },
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@~1.0.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.1",
+              "from": "core-util-is@~1.0.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@~0.10.x",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@2",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            }
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "from": "semver@~4.3.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+        },
+        "underscore": {
+          "version": "1.8.2",
+          "from": "underscore@1.8.2",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz"
+        }
+      }
+    },
+    "lru-cache": {
+      "version": "2.6.5",
+      "from": "lru-cache@2.6.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+    },
+    "lzma": {
+      "version": "1.3.7",
+      "from": "lzma@~1.3.7",
+      "resolved": "https://registry.npmjs.org/lzma/-/lzma-1.3.7.tgz"
+    },
+    "node-statsd": {
+      "version": "0.0.7",
+      "from": "node-statsd@~0.0.7",
+      "resolved": "https://registry.npmjs.org/node-statsd/-/node-statsd-0.0.7.tgz"
+    },
+    "queue-async": {
+      "version": "1.0.7",
+      "from": "queue-async@~1.0.7",
+      "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz"
+    },
+    "redis-mpool": {
+      "version": "0.4.0",
+      "from": "redis-mpool@~0.4.0",
+      "dependencies": {
+        "generic-pool": {
+          "version": "2.1.1",
+          "from": "generic-pool@~2.1.1",
+          "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz"
+        },
+        "redis": {
+          "version": "0.12.1",
+          "from": "redis@~0.12.1",
+          "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"
+        },
+        "hiredis": {
+          "version": "0.1.17",
+          "from": "hiredis@~0.1.17",
+          "resolved": "https://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz",
+          "dependencies": {
+            "bindings": {
+              "version": "1.2.1",
+              "from": "bindings@*",
+              "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+            },
+            "nan": {
+              "version": "1.1.2",
+              "from": "nan@~1.1.0",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
+            }
+          }
+        }
+      }
+    },
     "request": {
-          "version": "2.61.0",
+      "version": "2.62.0",
-          "from": "request@^2.55.0",
+      "from": "request@~2.62.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.61.0.tgz",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.62.0.tgz",
       "dependencies": {
         "bl": {
           "version": "1.0.0",
@@ -143,7 +245,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                      "from": "inherits@~2.0.1",
+                  "from": "inherits@2",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "isarray": {
@@ -220,9 +322,9 @@
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
-              "version": "4.0.0",
+          "version": "5.1.0",
-              "from": "qs@~4.0.0",
+          "from": "qs@~5.1.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"
+          "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.1",
@@ -267,9 +369,9 @@
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
           "dependencies": {
             "hoek": {
-                  "version": "2.15.0",
+              "version": "2.16.0",
               "from": "hoek@2.x.x",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.15.0.tgz"
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.0.tgz"
             },
             "boom": {
               "version": "2.8.0",
@@ -420,119 +522,10 @@
           }
         }
       }
-        }
-      }
-    },
-    "log4js": {
-      "version": "0.6.25",
-      "from": "https://github.com/CartoDB/log4js-node/tarball/cdb",
-      "resolved": "https://github.com/CartoDB/log4js-node/tarball/cdb",
-      "dependencies": {
-        "async": {
-          "version": "0.2.10",
-          "from": "async@~0.2.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.33",
-          "from": "readable-stream@~1.0.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-          "dependencies": {
-            "core-util-is": {
-              "version": "1.0.1",
-              "from": "core-util-is@~1.0.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "from": "isarray@0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@~0.10.x",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@~2.0.1",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            }
-          }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "from": "semver@~4.3.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-        },
-        "underscore": {
-          "version": "1.8.2",
-          "from": "underscore@1.8.2",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz"
-        }
-      }
-    },
-    "lru-cache": {
-      "version": "2.6.5",
-      "from": "lru-cache@2.6.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
-    },
-    "lzma": {
-      "version": "1.3.7",
-      "from": "lzma@~1.3.7",
-      "resolved": "https://registry.npmjs.org/lzma/-/lzma-1.3.7.tgz"
-    },
-    "node-statsd": {
-      "version": "0.0.7",
-      "from": "node-statsd@~0.0.7",
-      "resolved": "https://registry.npmjs.org/node-statsd/-/node-statsd-0.0.7.tgz"
-    },
-    "queue-async": {
-      "version": "1.0.7",
-      "from": "queue-async@~1.0.7",
-      "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz"
-    },
-    "redis-mpool": {
-      "version": "0.4.0",
-      "from": "redis-mpool@~0.4.0",
-      "dependencies": {
-        "generic-pool": {
-          "version": "2.1.1",
-          "from": "generic-pool@~2.1.1",
-          "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz"
-        },
-        "redis": {
-          "version": "0.12.1",
-          "from": "redis@~0.12.1",
-          "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"
-        },
-        "hiredis": {
-          "version": "0.1.17",
-          "from": "hiredis@~0.1.17",
-          "resolved": "https://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz",
-          "dependencies": {
-            "bindings": {
-              "version": "1.2.1",
-              "from": "bindings@*",
-              "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
-            },
-            "nan": {
-              "version": "1.1.2",
-              "from": "nan@~1.1.0",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
-            }
-          }
-        }
-      }
-    },
-    "request": {
-      "version": "2.9.203",
-      "from": "request@~2.9.203",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
     },
     "step": {
       "version": "0.0.6",
-      "from": "step@~0.0.5",
+      "from": "step@~0.0.6",
       "resolved": "https://registry.npmjs.org/step/-/step-0.0.6.tgz"
     },
     "step-profiler": {
@@ -550,11 +543,6 @@
       "from": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations",
       "resolved": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations",
       "dependencies": {
-        "chronograph": {
-          "version": "0.1.0",
-          "from": "chronograph@git://github.com/CartoDB/chronographjs.git#0.1.0",
-          "resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d"
-        },
         "grainstore": {
           "version": "1.0.0",
           "from": "grainstore@~1.0.0",
@@ -2776,194 +2764,43 @@
             }
           }
         },
+        "cartodb-psql": {
+          "version": "0.6.1",
+          "from": "cartodb-psql@~0.6.1",
+          "dependencies": {
+            "pg": {
+              "version": "2.6.2-cdb3",
+              "from": "pg@git://github.com/CartoDB/node-postgres.git#2.6.2-cdb3",
+              "resolved": "git://github.com/CartoDB/node-postgres.git#069c5296d1a093077feff21719641bb9e71fc50e",
+              "dependencies": {
+                "generic-pool": {
+                  "version": "2.0.3",
+                  "from": "generic-pool@2.0.3",
+                  "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.0.3.tgz"
+                },
+                "buffer-writer": {
+                  "version": "1.0.0",
+                  "from": "buffer-writer@1.0.0",
+                  "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.0.tgz"
+                }
+              }
+            }
+          }
+        },
         "torque.js": {
           "version": "2.11.0",
           "from": "torque.js@~2.11.0",
           "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz"
         },
-        "request": {
-          "version": "2.48.0",
-          "from": "request@2.48.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz",
-          "dependencies": {
-            "bl": {
-              "version": "0.9.4",
-              "from": "bl@~0.9.0",
-              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@~1.0.26",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1",
-                      "from": "core-util-is@~1.0.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@~0.10.x",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@~2.0.1",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "caseless": {
-              "version": "0.7.0",
-              "from": "caseless@~0.7.0",
-              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"
-            },
-            "forever-agent": {
-              "version": "0.5.2",
-              "from": "forever-agent@~0.5.0",
-              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-            },
-            "form-data": {
-              "version": "0.1.4",
-              "from": "form-data@~0.1.0",
-              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-              "dependencies": {
-                "mime": {
-                  "version": "1.2.11",
-                  "from": "mime@~1.2.11",
-                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-                },
-                "async": {
-                  "version": "0.9.2",
-                  "from": "async@~0.9.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-                }
-              }
-            },
-            "json-stringify-safe": {
-              "version": "5.0.1",
-              "from": "json-stringify-safe@~5.0.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-            },
-            "mime-types": {
-              "version": "1.0.2",
-              "from": "mime-types@~1.0.1",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-            },
-            "node-uuid": {
-              "version": "1.4.3",
-              "from": "node-uuid@~1.4.0",
-              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
-            },
-            "qs": {
-              "version": "2.3.3",
-              "from": "qs@~2.3.1",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
-            },
-            "tunnel-agent": {
-              "version": "0.4.1",
-              "from": "tunnel-agent@~0.4.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-            },
-            "tough-cookie": {
-              "version": "2.0.0",
-              "from": "tough-cookie@>=0.12.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
-            },
-            "http-signature": {
-              "version": "0.10.1",
-              "from": "http-signature@~0.10.0",
-              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-              "dependencies": {
-                "assert-plus": {
-                  "version": "0.1.5",
-                  "from": "assert-plus@^0.1.5",
-                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                },
-                "asn1": {
-                  "version": "0.1.11",
-                  "from": "asn1@0.1.11",
-                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                },
-                "ctype": {
-                  "version": "0.5.3",
-                  "from": "ctype@0.5.3",
-                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                }
-              }
-            },
-            "oauth-sign": {
-              "version": "0.5.0",
-              "from": "oauth-sign@~0.5.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
-            },
-            "hawk": {
-              "version": "1.1.1",
-              "from": "hawk@1.1.1",
-              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-              "dependencies": {
-                "hoek": {
-                  "version": "0.9.1",
-                  "from": "hoek@0.9.x",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                },
-                "boom": {
-                  "version": "0.4.2",
-                  "from": "boom@0.4.x",
-                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                },
-                "cryptiles": {
-                  "version": "0.2.2",
-                  "from": "cryptiles@0.2.x",
-                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                },
-                "sntp": {
-                  "version": "0.2.4",
-                  "from": "sntp@0.2.x",
-                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                }
-              }
-            },
-            "aws-sign2": {
-              "version": "0.5.0",
-              "from": "aws-sign2@~0.5.0",
-              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-            },
-            "stringstream": {
-              "version": "0.0.4",
-              "from": "stringstream@~0.0.4",
-              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
-            },
-            "combined-stream": {
-              "version": "0.0.7",
-              "from": "combined-stream@~0.0.5",
-              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-              "dependencies": {
-                "delayed-stream": {
-                  "version": "0.0.5",
-                  "from": "delayed-stream@0.0.5",
-                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                }
-              }
-            }
-          }
-        },
         "abaculus": {
           "version": "1.1.0",
           "from": "https://github.com/CartoDB/abaculus/tarball/cdb",
           "resolved": "https://github.com/CartoDB/abaculus/tarball/cdb"
         },
         "sphericalmercator": {
-          "version": "1.0.2",
+          "version": "1.0.3",
-          "from": "sphericalmercator@1.0.2",
+          "from": "sphericalmercator@1.0.3",
-          "resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.2.tgz"
+          "resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.3.tgz"
         }
       }
     }

package.json

@@ -29,9 +29,9 @@
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
         "windshaft": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations",
-        "step": "~0.0.5",
+        "step": "~0.0.6",
         "queue-async": "~1.0.7",
-        "request": "~2.9.203",
+        "request": "~2.62.0",
         "cartodb-redis": "~0.13.0",
         "cartodb-psql": "~0.4.0",
         "fastly-purge": "~1.0.0",
@@ -43,7 +43,7 @@
     "devDependencies": {
         "istanbul": "~0.3.6",
         "mocha": "~1.21.4",
-        "nock": "~1.3.0",
+        "nock": "~2.11.0",
         "jshint": "~2.6.0",
         "redis": "~0.8.6",
         "strftime": "~0.8.2",

test/acceptance/cache/surrogate_keys_invalidation.js

@@ -158,7 +158,9 @@ describe('templates surrogate keys', function() {
                         status: 200
                     },
                     function(res) {
+                        setTimeout(function() {
                             next(null, res);
+                        }, 50);
                     }
                 );
             },
@@ -229,7 +231,9 @@ describe('templates surrogate keys', function() {
                         status: 204
                     },
                     function(res) {
+                        setTimeout(function() {
                             next(null, res);
+                        }, 50);
                     }
                 );
             },
@@ -256,6 +260,15 @@ describe('templates surrogate keys', function() {
             .matchHeader('Invalidation-Match', invalidationMatchHeader)
             .reply(503, '');
 
+        var fastlyScope = nock(FastlyPurge.FASTLY_API_ENDPOINT)
+            .post(fastlyPurgePath)
+            .matchHeader('Fastly-Key', FAKE_FASTLY_API_KEY)
+            .matchHeader('Fastly-Soft-Purge', 1)
+            .matchHeader('Accept', 'application/json')
+            .reply(200, {
+                status:'ok'
+            });
+
         step(
             function createTemplateToUpdate() {
                 createTemplate(this);
@@ -280,7 +293,9 @@ describe('templates surrogate keys', function() {
                         status: 200
                     },
                     function(res) {
+                        setTimeout(function() {
                             next(null, res);
+                        }, 50);
                     }
                 );
             },
@@ -292,6 +307,7 @@ describe('templates surrogate keys', function() {
                 assert.deepEqual(parsedBody, expectedBody);
 
                 assert.equal(scope.pendingMocks().length, 0);
+                assert.equal(fastlyScope.pendingMocks().length, 0);
 
                 return null;
             },