Make sure a proper context applied before DOM helper

san650 · Nov 16, 2019 · 3947a21 · 3947a21
1 parent 124a23d
commit 3947a21
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/addon-test-support/-private/dsl.js b/addon-test-support/-private/dsl.js
@@ -11,13 +11,14 @@ import { isVisible } from '../properties/is-visible';
 import { text } from '../properties/text';
 import { value } from '../properties/value';
 import { getRoot } from './helpers';
+import { chainable } from './run';
 
 const thenDescriptor = {
   isDescriptor: true,
   get() {
     return function() {
       // this is a chainable node instance
-      const { _promise } = getRoot(this).__execution_context__;
+      const { _promise } = getRoot(chainable(this)).__execution_context__;
 
       return _promise.then(...arguments);
     }

diff --git a/addon-test-support/-private/run.js b/addon-test-support/-private/run.js
@@ -15,13 +15,10 @@ export default function run(node, cb) {
   const _cb = cb.bind(chainedNode);
 
   let executionContext;
+  const chainedRoot = getRoot(chainedNode);
   if (isChainedNode(node)) {
-    executionContext = getRoot(node).__execution_context__;
-    if (!executionContext) {
-      executionContext = getRoot(node).__execution_context__ = getExecutionContext(node);
-    }
+    executionContext = chainedRoot.__execution_context__;
   } else {
-    const chainedRoot = getRoot(chainedNode);
     executionContext = chainedRoot.__execution_context__ = getExecutionContext(chainedNode);
   }
 

diff --git a/addon-test-support/extend/action.js b/addon-test-support/extend/action.js
@@ -21,6 +21,8 @@ export default function action(fn) {
 
           context.key = `${key}(${formattedArgs})`;
 
+          getRoot(this).__execution_context__ = context;
+
           return fn.bind(this)(...args);
         });
       }