Merge pull request #987 from emberjs/set-owner

Support getOwner
emberjs · Feb 12, 2021 · d9bd493 · d9bd493
2 parents f2ebea6 + 6ae11c8
commit d9bd493
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/addon-test-support/@ember/test-helpers/setup-context.ts b/addon-test-support/@ember/test-helpers/setup-context.ts
@@ -1,6 +1,7 @@
 import { run } from '@ember/runloop';
 import { set, setProperties, get, getProperties } from '@ember/object';
 import Resolver from '@ember/application/resolver';
+import { setOwner } from '@ember/application';
 
 import buildOwner, { Owner } from './build-owner';
 import { _setupAJAXHooks, _teardownAJAXHooks } from './settled';
@@ -211,6 +212,7 @@ export default function setupContext(
         value: owner,
         writable: false,
       });
+      setOwner(context, owner);
 
       Object.defineProperty(context, 'set', {
         configurable: true,

diff --git a/tests/unit/setup-rendering-context-test.js b/tests/unit/setup-rendering-context-test.js
@@ -23,6 +23,7 @@ import {
 import hasEmberVersion from '@ember/test-helpers/has-ember-version';
 import { setResolverRegistry, application, resolver } from '../helpers/resolver';
 import { hbs } from 'ember-cli-htmlbars';
+import { getOwner } from '@ember/application';
 
 module('setupRenderingContext', function (hooks) {
   if (!hasEmberVersion(2, 4)) {
@@ -431,6 +432,10 @@ module('setupRenderingContext', function (hooks) {
       assert.strictEqual(this.element, originalElement, 'this.element is stable');
     });
 
+    test('context supports getOwner', async function (assert) {
+      assert.equal(getOwner(this), this.owner);
+    });
+
     module('this.render and this.clearRender deprecations', function () {
       test('this.render() and this.clearRender deprecation message', async function (assert) {
         await this.render(hbs`<button>Click me</button>`);