ensure can pass settled as fulfillment value to promise

emberjs · Feb 10, 2018 · 22d1538 · 22d1538
1 parent 2c279f5
commit 22d1538
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/addon-test-support/@ember/test-helpers/settled.js b/addon-test-support/@ember/test-helpers/settled.js
@@ -201,10 +201,10 @@ export function isSettled() {
 export default function settled() {
   let options = arguments[0];
 
-  if (arguments.length > 0) {
+  if (options) {
     assert(
       `The 'settled' (formerly 'wait') testing helper only accepts an object. You passed ${options}`,
-      typeof options === 'object' && options !== null
+      typeof options === 'object'
     );
   }
 

diff --git a/addon-test-support/@ember/test-helpers/setup-application-context.js b/addon-test-support/@ember/test-helpers/setup-application-context.js
@@ -21,9 +21,7 @@ export function visit() {
     .then(() => {
       context.element = document.querySelector('#ember-testing > .ember-view');
     })
-    .then(() => {
-      return settled();
-    });
+    .then(settled);
 }
 
 /**