fixed cache bug

fehguy · Jun 6, 2018 · de7d8d8 · de7d8d8
1 parent 0bcbe10
commit de7d8d8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/index.js b/index.js
@@ -33,21 +33,15 @@ module.exports.cacheWith = (cache) => {
 
 module.exports.fromCache = () => {
   return new Promise((resolve, reject) => {
-    if(container.router) {
-      resolve(container.router);
+    if(container.swambda) {
+      resolve(container.swambda);
     }
     else {
       reject();
     }
   });
 };
 
-module.exports.cache = (router) => {
-  if(container) {
-    container.router = router;
-  }
-};
-
 const Swambda = module.exports.Swambda = class Swambda {
   constructor(prefix) {
     this.prefix = prefix;
@@ -110,8 +104,8 @@ Swambda.prototype.cors = function (extra) {
 
 Swambda.prototype.load = function (identifier) {
   return new Promise((resolve, reject) => {
-    if(container.router) {
-      resolve(container.router);
+    if(container.swambda) {
+      resolve(container.swambda);
       return;
     }
     const self = this;
@@ -125,7 +119,7 @@ Swambda.prototype.load = function (identifier) {
         router.compilePaths(self.spec.paths);
         self.router = router;
 
-        container.router = router;
+        container.swambda = self;
         resolve(self);
       })
       .catch((err) => {

diff --git a/test/routing.js b/test/routing.js
@@ -22,7 +22,7 @@ describe("routing", () => {
       });
   });
 
-  it("routes an valid query parameter", (done) => {
+  it("uses the cache", (done) => {
     let cache = {};
     swambda.cacheWith(cache);
     const event = {
@@ -40,7 +40,15 @@ describe("routing", () => {
           .then((response) => {
             expect(response.statusCode).toBe(200);
             expect(JSON.parse(response.body)).toEqual([{foo: "bar"}]);
-            done();
+            swambda.fromCache()
+              .then((res) => {
+                res.process(event)
+                  .then((response) => {
+                    expect(response.statusCode).toBe(200);
+                    expect(JSON.parse(response.body)).toEqual([{foo: "bar"}]);
+                    done();
+                  })
+              });
           })
           .catch(err => {
             done(err);