diff --git a/addon-test-support/@ember/test-helpers/setup-rendering-context.ts b/addon-test-support/@ember/test-helpers/setup-rendering-context.ts index 9c08b083f..d860abf77 100644 --- a/addon-test-support/@ember/test-helpers/setup-rendering-context.ts +++ b/addon-test-support/@ember/test-helpers/setup-rendering-context.ts @@ -10,7 +10,7 @@ import { } from './setup-context'; import { Promise } from './-utils'; import settled from './settled'; -import { hbs, TemplateFactory } from 'ember-cli-htmlbars'; +import { hbs } from 'ember-cli-htmlbars'; import getRootElement from './dom/get-root-element'; import { Owner } from './build-owner'; import getTestMetadata from './test-metadata'; @@ -21,14 +21,13 @@ import isComponent from './-internal/is-component'; import { macroCondition, dependencySatisfies } from '@embroider/macros'; import { ComponentRenderMap, SetUsage } from './setup-context'; import { ensureSafeComponent } from '@embroider/util'; -import type { ComponentInstance } from '@glimmer/interfaces'; const OUTLET_TEMPLATE = hbs`{{outlet}}`; const EMPTY_TEMPLATE = hbs``; const INVOKE_PROVIDED_COMPONENT = hbs``; export interface RenderingTestContext extends TestContext { - render(template: TemplateFactory): Promise; + render(template: object): Promise; clearRender(): Promise; element: Element | Document; @@ -100,7 +99,7 @@ export interface RenderOptions { await render(hbs`
`); */ export function render( - templateOrComponent: TemplateFactory | ComponentInstance, + templateOrComponent: object, options?: RenderOptions ): Promise { let context = getContext(); @@ -298,7 +297,7 @@ export default function setupRenderingContext( .then(() => { let { owner } = context; - let renderDeprecationWrapper = function (template: TemplateFactory) { + let renderDeprecationWrapper = function (template: object) { deprecate( 'Using this.render has been deprecated, consider using `render` imported from `@ember/test-helpers`.', false, diff --git a/type-tests/api.ts b/type-tests/api.ts index 3a1619912..f3894036d 100644 --- a/type-tests/api.ts +++ b/type-tests/api.ts @@ -156,10 +156,7 @@ expectTypeOf(currentURL).toEqualTypeOf<() => string>(); // Rendering Helpers expectTypeOf(render).toMatchTypeOf< - ( - templateOrComponent: TemplateFactory | ComponentInstance, - options?: { owner?: Owner } - ) => Promise + (templateOrComponent: object, options?: { owner?: Owner }) => Promise >(); expectTypeOf(clearRender).toEqualTypeOf<() => Promise>();