Skip to content

Commit d9bd493

Browse files
authored
Merge pull request #987 from emberjs/set-owner
Support getOwner
2 parents f2ebea6 + 6ae11c8 commit d9bd493

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { run } from '@ember/runloop';
22
import { set, setProperties, get, getProperties } from '@ember/object';
33
import Resolver from '@ember/application/resolver';
4+
import { setOwner } from '@ember/application';
45

56
import buildOwner, { Owner } from './build-owner';
67
import { _setupAJAXHooks, _teardownAJAXHooks } from './settled';
@@ -211,6 +212,7 @@ export default function setupContext(
211212
value: owner,
212213
writable: false,
213214
});
215+
setOwner(context, owner);
214216

215217
Object.defineProperty(context, 'set', {
216218
configurable: true,

tests/unit/setup-rendering-context-test.js

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
2424
import { setResolverRegistry, application, resolver } from '../helpers/resolver';
2525
import { hbs } from 'ember-cli-htmlbars';
26+
import { getOwner } from '@ember/application';
2627

2728
module('setupRenderingContext', function (hooks) {
2829
if (!hasEmberVersion(2, 4)) {
@@ -431,6 +432,10 @@ module('setupRenderingContext', function (hooks) {
431432
assert.strictEqual(this.element, originalElement, 'this.element is stable');
432433
});
433434

435+
test('context supports getOwner', async function (assert) {
436+
assert.equal(getOwner(this), this.owner);
437+
});
438+
434439
module('this.render and this.clearRender deprecations', function () {
435440
test('this.render() and this.clearRender deprecation message', async function (assert) {
436441
await this.render(hbs`<button>Click me</button>`);

0 commit comments

Comments
 (0)