Merge pull request #318 from maxfierke/mf-fix_nested_encapsulated_tas…

…k_injection Ensure tasks are assigned to a container
machty · Sep 24, 2019 · 42d7b9b · 42d7b9b
2 parents 047caf7 + 7b291b1
commit 42d7b9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/addon/-task-property.js b/addon/-task-property.js
@@ -2,7 +2,7 @@ import { scheduleOnce } from '@ember/runloop';
 import { addObserver } from '@ember/object/observers';
 import { addListener } from '@ember/object/events';
 import EmberObject from '@ember/object';
-import { getOwner } from '@ember/application';
+import { getOwner, setOwner } from '@ember/application';
 import { default as TaskInstance, getRunningInstance } from './-task-instance';
 import {
   PERFORM_TYPE_DEFAULT,
@@ -383,6 +383,8 @@ export const Task = EmberObject.extend(TaskStateMixin, {
       _performType: performType,
     });
 
+    setOwner(taskInstance, getOwner(this.context));
+
     if (performType === PERFORM_TYPE_LINKED) {
       linkedObject._expectsLinkedYield = true;
     }

diff --git a/tests/dummy/app/task-injection-test/controller.js b/tests/dummy/app/task-injection-test/controller.js
@@ -7,18 +7,17 @@ export default Controller.extend({
 
   myTask: task({
     fun: service(),
-    perform: function * () {
+    *perform() {
       let value = yield this.get('subtask').perform();
       return `${this.get('fun.foo')}-${value}`;
     },
 
     subtask: task({
       fun: service(),
       wat: 2,
-      perform: function * () {
+      *perform() {
         return this.get('fun.foo') * this.wat;
       },
     }),
   }),
 });
-