From e38f353a2b846e0483004e4100eefce19c1aee57 Mon Sep 17 00:00:00 2001 From: Isaac Ezer Date: Fri, 2 Mar 2018 17:35:47 -0500 Subject: [PATCH] normalize specifiers before passing to fallback --- mu-trees/addon/resolvers/fallback/index.js | 2 +- mu-trees/tests/unit/resolvers/fallback/basic-test.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mu-trees/addon/resolvers/fallback/index.js b/mu-trees/addon/resolvers/fallback/index.js index c8a18a46..58636dfc 100644 --- a/mu-trees/addon/resolvers/fallback/index.js +++ b/mu-trees/addon/resolvers/fallback/index.js @@ -11,6 +11,6 @@ export default Resolver.extend({ }, resolve(name, referrer, targetNamespace) { let result = this._super(name, referrer, targetNamespace); - return result || this._fallback.resolve(name); + return result || this._fallback.resolve(this._fallback.normalize(name)); } }); diff --git a/mu-trees/tests/unit/resolvers/fallback/basic-test.js b/mu-trees/tests/unit/resolvers/fallback/basic-test.js index 01320f75..b86827bd 100644 --- a/mu-trees/tests/unit/resolvers/fallback/basic-test.js +++ b/mu-trees/tests/unit/resolvers/fallback/basic-test.js @@ -44,6 +44,14 @@ test('resolves from classic resolver', function(assert) { assert.equal(this.resolver.resolve('router:/app/main/classic', 'referrer'), this.classic, 'returns classic resolver result'); }); +test('resolves normalized specifiers classic resolver', function(assert) { + this.resolver._fallback.resolve = (specifier) => { + return specifier === 'router:classic-router' ? this.classic : null; + }; + + assert.equal(this.resolver.resolve('router:classicRouter'), this.classic, 'returns classic resolver result'); +}); + test('returns null if neither resolver resolves', function(assert) { let specifier = 'router:/app/main/nowhere'; let referrer = 'router:/app/main/referrer';