Fix errors in relative filesystem loader

NightlyCommit · May 20, 2020 · 4f282f3 · 4f282f3
1 parent 128a9e8
commit 4f282f3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/src/lib/loader/relative-filesystem.ts b/src/lib/loader/relative-filesystem.ts
@@ -106,7 +106,13 @@ export class TwingLoaderRelativeFilesystem implements TwingLoaderInterface {
             throw new TwingErrorLoader(this.errorCache.get(name), -1, from);
         };
 
-        return Promise.resolve(_do());
+        return new Promise((resolve, reject) => {
+            try {
+                resolve(_do());
+            } catch (e) {
+                reject(e)
+            }
+        });
     }
 
     protected normalizeName(name: string) {

diff --git a/test/tests/unit/lib/cache/filesystem/test.ts b/test/tests/unit/lib/cache/filesystem/test.ts
@@ -34,7 +34,7 @@ tape('cache filesystem', (test: Test) => {
         });
 
         try {
-            await cache.write('foo', null);
+            await cache.write('foo', 'bar');
 
             test.fail();
         }
@@ -49,7 +49,7 @@ tape('cache filesystem', (test: Test) => {
         });
 
         try {
-            await cache.write('foo', null);
+            await cache.write('foo', 'bar');
 
             test.fail();
         }

diff --git a/test/tests/unit/lib/helpers/format-date-time/test.ts b/test/tests/unit/lib/helpers/format-date-time/test.ts
@@ -1,7 +1,9 @@
 import * as tape from 'tape';
 import {formatDateTime} from "../../../../../../src/lib/helpers/format-date-time";
 
-const {DateTime} = require('luxon');
+const {DateTime, Settings} = require('luxon');
+
+Settings.defaultLocale = 'en';
 
 // Thursday, January 1, 1970 4:12:29 PM
 let date = DateTime.fromMillis(58349457, {zone: 'UTC'});
@@ -210,4 +212,4 @@ tape('format-date-time', (test) => {
     test.same(formatDateTime(date4, 'U'), '102744749', 'Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)');
 
     test.end();
-});
+});
diff --git a/test/tests/unit/lib/loader/chain/test.ts b/test/tests/unit/lib/loader/chain/test.ts
@@ -5,6 +5,7 @@ import {resolve, join} from "path";
 import {TwingLoaderChain} from "../../../../../../src/lib/loader/chain";
 import {TwingLoaderArray} from "../../../../../../src/lib/loader/array";
 import {TwingLoaderFilesystem} from "../../../../../../src/lib/loader/filesystem";
+import {TwingLoaderRelativeFilesystem} from "../../../../../../src/lib/loader/relative-filesystem";
 import {TwingErrorLoader} from "../../../../../../src/lib/error/loader";
 import {TwingError} from "../../../../../../src/lib/error";
 
@@ -354,6 +355,17 @@ tape('loader chain', (test) => {
             test.end();
         });
 
+        test.test('when a relative filesystem loader throws an error in findTemplate', async (test) => {
+            let loader = new TwingLoaderChain([
+                new TwingLoaderRelativeFilesystem(),
+                new TwingLoaderArray({'foo': 'bar'}),
+            ]);
+
+            test.equals(await loader.resolve('foo', null), 'foo');
+
+            test.end();
+        });
+
         test.test('when all loaders throw loader-related errors', async (test) => {
             let loader1 = new TwingLoaderArray({});
             sinon.stub(loader1, 'resolve').returns(Promise.reject(new TwingErrorLoader('foo', 1, null)));