Skip to content

Commit 421d2a0

Browse files
committed
render accepts any object with a component manager
1 parent e3f1cb8 commit 421d2a0

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

addon-test-support/@ember/test-helpers/setup-rendering-context.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
} from './setup-context';
1111
import { Promise } from './-utils';
1212
import settled from './settled';
13-
import { hbs, TemplateFactory } from 'ember-cli-htmlbars';
13+
import { hbs } from 'ember-cli-htmlbars';
1414
import getRootElement from './dom/get-root-element';
1515
import { Owner } from './build-owner';
1616
import getTestMetadata from './test-metadata';
@@ -21,14 +21,13 @@ import isComponent from './-internal/is-component';
2121
import { macroCondition, dependencySatisfies } from '@embroider/macros';
2222
import { ComponentRenderMap, SetUsage } from './setup-context';
2323
import { ensureSafeComponent } from '@embroider/util';
24-
import type { ComponentInstance } from '@glimmer/interfaces';
2524

2625
const OUTLET_TEMPLATE = hbs`{{outlet}}`;
2726
const EMPTY_TEMPLATE = hbs``;
2827
const INVOKE_PROVIDED_COMPONENT = hbs`<this.ProvidedComponent />`;
2928

3029
export interface RenderingTestContext extends TestContext {
31-
render(template: TemplateFactory): Promise<void>;
30+
render(template: object): Promise<void>;
3231
clearRender(): Promise<void>;
3332

3433
element: Element | Document;
@@ -100,7 +99,7 @@ export interface RenderOptions {
10099
await render(hbs`<div class="container"></div>`);
101100
*/
102101
export function render(
103-
templateOrComponent: TemplateFactory | ComponentInstance,
102+
templateOrComponent: object,
104103
options?: RenderOptions
105104
): Promise<void> {
106105
let context = getContext();
@@ -298,7 +297,7 @@ export default function setupRenderingContext(
298297
.then(() => {
299298
let { owner } = context;
300299

301-
let renderDeprecationWrapper = function (template: TemplateFactory) {
300+
let renderDeprecationWrapper = function (template: object) {
302301
deprecate(
303302
'Using this.render has been deprecated, consider using `render` imported from `@ember/test-helpers`.',
304303
false,

type-tests/api.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,7 @@ expectTypeOf(currentURL).toEqualTypeOf<() => string>();
156156

157157
// Rendering Helpers
158158
expectTypeOf(render).toMatchTypeOf<
159-
(
160-
templateOrComponent: TemplateFactory | ComponentInstance,
161-
options?: { owner?: Owner }
162-
) => Promise<void>
159+
(templateOrComponent: object, options?: { owner?: Owner }) => Promise<void>
163160
>();
164161
expectTypeOf(clearRender).toEqualTypeOf<() => Promise<void>>();
165162

0 commit comments

Comments
 (0)