Find helper results null when query has empty result

addon-test-support/helpers.js

@@ -177,7 +177,7 @@ export function keyEvent(selector, type, keyCode) {
   @method find
   @param {String|HTMLElement|NodeList} CSS selector to find one or more elements in the test DOM
   @param {HTMLElement} contextEl to query within, query from its contained DOM
-  @return {HTMLElement|NodeList} one element or a (non-live) list of element objects
+  @return {null|HTMLElement|NodeList} null, one element or a (non-live) list of element objects
   @public
 */
 export function find(selector, contextEl) {
@@ -189,7 +189,7 @@ export function find(selector, contextEl) {
   } else if (Object.prototype.toString.call(selector) === "[object String]") {
     result = document.querySelectorAll(`${settings.rootElement} ${selector}`);
   }
-  return (result.length === 1) ? result[0] : result;
+  return (result.length === 0) ? null : (result.length === 1) ? result[0] : result;
 }
 
 

tests/integration/find-test.js

@@ -108,3 +108,12 @@ test('if a node list is passed to find instead of a selector it is returned', fu
   let actual = find(expected);
   assert.strictEqual(actual, expected, 'node list was returned from find');
 });
+
+test('with empty query result, find returns null', function(assert) {
+  this.render(hbs`
+    <div class='hiding'>You can't find me</div>
+  `);
+  let expected = null;
+  let actual = find('.hidden');
+  assert.strictEqual(actual, expected, 'null is returned for an empty query');
+});