ensure compileFile runs callback if cache found. Fixes gh-291

paularmstrong · Aug 21, 2013 · a185ea2 · a185ea2
1 parent 40f49a3
commit a185ea2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/swig.js b/lib/swig.js
@@ -589,6 +589,10 @@ exports.Swig = function (opts) {
     cached = cacheGet(pathname);
 
     if (cached) {
+      if (cb) {
+        cb(null, cached);
+        return;
+      }
       return cached;
     }
 

diff --git a/tests/basic.test.js b/tests/basic.test.js
@@ -172,10 +172,14 @@ describe('swig.compileFile', function () {
   });
 
   it('can run asynchronously', function (done) {
-    expect(swig.compileFile(test, {}, function (err, fn) {
+    // Run twice to ensure cached result uses the callback [gh-291]
+    swig.compileFile(test, {}, function (err, fn) {
       expect(fn).to.be.a(Function);
-      done();
-    }));
+      expect(swig.compileFile(test, {}, function (err, fn) {
+        expect(fn).to.be.a(Function);
+        done();
+      }));
+    });
   });
 });