Fix ember-link

buschtoens · Jan 24, 2024 · 5d3b936 · 5d3b936
1 parent ca4e2a3
commit 5d3b936
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/ember-link/src/helpers/link.ts b/ember-link/src/helpers/link.ts
@@ -111,10 +111,10 @@ export default class LinkHelper extends Helper<LinkSignature> {
       models: Array.isArray(named.models)
         ? named.models
         : named.model
-        ? [named.model]
-        : positional.length > 1
-        ? (positional.slice(1, positionalQueryParameters ? -1 : undefined) as RouteModel[])
-        : undefined,
+          ? [named.model]
+          : positional.length > 1
+            ? (positional.slice(1, positionalQueryParameters ? -1 : undefined) as RouteModel[])
+            : undefined,
       query: named.query ?? positionalQueryParameters,
       onTransitionTo: named.onTransitionTo,
       onReplaceWith: named.onReplaceWith,

diff --git a/ember-link/src/test-support/setup-link.ts b/ember-link/src/test-support/setup-link.ts
@@ -12,11 +12,15 @@ export default function setupLink(hooks: Hooks /* NestedHooks */) {
   hooks.beforeEach(function (this: TestContext) {
     assert(
       'ember-link.setupLink: You have already called `setupLink` once',
-      // !this.owner.hasRegistration('service:link-manager') ||
-      !(this.owner.lookup('service:link-manager') instanceof TestInstrumentedLinkManagerService)
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      !this.owner.hasRegistration('service:link-manager') ||
+        !(this.owner.lookup('service:link-manager') instanceof TestInstrumentedLinkManagerService)
     );
 
-    // this.owner.unregister('service:link-manager');
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    this.owner.unregister('service:link-manager');
     this.owner.register('service:link-manager', TestInstrumentedLinkManagerService);
   });
 }