[experiment] Explore user actions

addon-test-support/-private/better-errors.js

@@ -1,5 +1,6 @@
 import EmberError from '@ember/error';
 import Ceibo from 'ceibo';
+import { getRoot } from './helpers';
 
 export const ELEMENT_NOT_FOUND = 'Element not found.';
 
@@ -8,25 +9,35 @@ export const ELEMENT_NOT_FOUND = 'Element not found.';
  *
  * @param {Ceibo} node              PageObject node containing the property that triggered the error
  * @param {string} key              Key of PageObject property tht triggered the error
- * @param {string} msg              Error message
+ * @param {Error|string} err        Error or error text
  * @param {Object} options
  * @param {string} options.selector Selector of element targeted by PageObject property
  * @return {Ember.Error}
  */
-export function throwBetterError(node, key, msg, { selector } = {}) {
-  let path = [key];
+export function throwBetterError(node, key, err, { selector } = {}) {
+  const executionContext = getRoot(node).__execution_context__;
+  const _key = key || (executionContext && executionContext.key);
+
+  let fullErrorMessage = typeof err === Error ? err.message : err.toString();
+
+  let path = [];
   let current;
 
   for (current = node; current; current = Ceibo.parent(current)) {
     path.unshift(Ceibo.meta(current).key);
   }
 
   path[0] = 'page';
+  if (_key && _key.trim().length > 0) {
+    path.push(_key);
+  }
 
-  let fullErrorMessage = `${msg}\n\nPageObject: '${path.join('.')}'`;
+  if (path.length > 0) {
+    fullErrorMessage += `\n\nPageObject: '${path.join('.')}'`;
+  }
 
-  if (selector) {
-    fullErrorMessage = `${fullErrorMessage}\n  Selector: '${selector}'`;
+  if (typeof selector === 'string' && selector.trim().length > 0) {
+    fullErrorMessage += `\n  Selector: '${selector}'`;
   }
 
   console.error(fullErrorMessage);

addon-test-support/-private/dsl.js

@@ -10,16 +10,17 @@ import { isPresent } from '../properties/is-present';
 import { isVisible } from '../properties/is-visible';
 import { text } from '../properties/text';
 import { value } from '../properties/value';
-
 import { getRoot } from './helpers';
 
 const thenDescriptor = {
   isDescriptor: true,
-  value() {
-    const root = getRoot(this);
-    const chainedRoot = root._chainedTree || root;
+  get() {
+    return function() {
+      // this is a chainable node instance
+      const { _promise } = getRoot(this).__execution_context__;
 
-    return chainedRoot._promise.then(...arguments);
+      return _promise.then(...arguments);
+    }
   }
 };
 

addon-test-support/-private/execution_context/acceptance.js

@@ -1,23 +1,22 @@
-import { run } from '../action';
-import {
-  guardMultiple,
-  buildSelector,
-  findClosestValue
-} from '../helpers';
+import run from '../run';
+import $ from '-jquery';
 import {
   fillElement,
   assertFocusable
 } from './helpers';
-import {
-  ELEMENT_NOT_FOUND,
-  throwBetterError
-} from '../better-errors';
 
 export default function AcceptanceExecutionContext(pageObjectNode) {
   this.pageObjectNode = pageObjectNode;
 }
 
 AcceptanceExecutionContext.prototype = {
+  get testContainer() {
+    // @todo: fix usage of private `_element`
+    return this.testContext ?
+      this.testContext._element :
+      '#ember-testing';
+  },
+
   andThen(cb) {
     return window.wait().then(() => {
       cb(this);
@@ -33,103 +32,36 @@ AcceptanceExecutionContext.prototype = {
     visit(path);
   },
 
-  click(selector, container) {
+  click(element) {
     /* global click */
-    click(selector, container);
+    click(element);
   },
 
-  fillIn(selector, container, options, content) {
-    let $selection = find(selector, container || findClosestValue(this.pageObjectNode, 'testContainer'));
-
+  fillIn(element, content) {
     /* global focus */
-    focus($selection);
+    focus(element);
 
-    fillElement($selection, content, {
-      selector,
-      pageObjectNode: this.pageObjectNode,
-      pageObjectKey: options.pageObjectKey
-    });
+    fillElement(element, content);
 
     /* global triggerEvent */
-    triggerEvent(selector, container, 'input');
-    triggerEvent(selector, container, 'change');
+    triggerEvent(element, 'input');
+    triggerEvent(element, 'change');
   },
 
-  triggerEvent(selector, container, options, eventName, eventOptions) {
+  triggerEvent(element, eventName, eventOptions) {
     /* global triggerEvent */
-    triggerEvent(selector, container, eventName, eventOptions);
+    triggerEvent(element, eventName, eventOptions);
   },
 
-  focus(selector, options) {
-    let $selection = this.findWithAssert(selector, options);
-
-    assertFocusable($selection[0], {
-      selector,
-      pageObjectNode: this.pageObjectNode,
-      pageObjectKey: options.pageObjectKey
-    });
-
-    $selection.focus();
-  },
-
-  blur(selector, options) {
-    let $selection = this.findWithAssert(selector, options);
-
-    assertFocusable($selection[0], {
-      selector,
-      pageObjectNode: this.pageObjectNode,
-      pageObjectKey: options.pageObjectKey
-    });
+  focus(element) {
+    assertFocusable(element);
 
-    $selection.blur();
+    $(element).focus();
   },
 
-  assertElementExists(selector, options) {
-    /* global find */
-    let result = find(selector, options.testContainer || findClosestValue(this.pageObjectNode, 'testContainer'));
+  blur(element) {
+    assertFocusable(element);
 
-    if (result.length === 0) {
-      throwBetterError(
-        this.pageObjectNode,
-        options.pageObjectKey,
-        ELEMENT_NOT_FOUND,
-        { selector }
-      );
-    }
+    $(element).blur();
   },
-
-  find(selector, options) {
-    let result;
-
-    selector = buildSelector(this.pageObjectNode, selector, options);
-
-    /* global find */
-    result = find(selector, options.testContainer || findClosestValue(this.pageObjectNode, 'testContainer'));
-
-    guardMultiple(result, selector, options.multiple);
-
-    return result;
-  },
-
-  findWithAssert(selector, options) {
-    let result;
-
-    selector = buildSelector(this.pageObjectNode, selector, options);
-
-    /* global find */
-    result = find(selector, options.testContainer || findClosestValue(this.pageObjectNode, 'testContainer'));
-
-    if (result.length === 0) {
-      throwBetterError(
-        this.pageObjectNode,
-        options.pageObjectKey,
-        ELEMENT_NOT_FOUND,
-        { selector }
-      );
-    }
-
-    guardMultiple(result, selector, options.multiple);
-
-    return result;
-  }
 };

addon-test-support/-private/execution_context/helpers.js

@@ -1,7 +1,3 @@
-import {
-  throwBetterError
-} from '../better-errors';
-
 import $ from '-jquery';
 
 /**
@@ -19,19 +15,13 @@ import $ from '-jquery';
  *
  * @throws Will throw an error if called on a contenteditable element that has `contenteditable="false"`
  */
-export function fillElement(selection, content, { selector, pageObjectNode, pageObjectKey }) {
+export function fillElement(selection, content) {
   const $selection = $(selection);
 
   if ($selection.is('[contenteditable][contenteditable!="false"]')) {
     $selection.html(content);
   } else if ($selection.is('[contenteditable="false"]')) {
-    throwBetterError(
-      pageObjectNode,
-      pageObjectKey,
-      'Element cannot be filled because it has `contenteditable="false"`.', {
-        selector
-      }
-    );
+    throw new Error('Element cannot be filled because it has `contenteditable="false"`.');
   } else {
     $selection.val(content);
   }
@@ -44,7 +34,7 @@ export function fillElement(selection, content, { selector, pageObjectNode, page
  *
  * @param {Element} element - the element to check
  */
-export function assertFocusable(element, { selector, pageObjectNode, pageObjectKey }) {
+export function assertFocusable(element) {
   let $element = $(element);
 
   let error;
@@ -60,12 +50,6 @@ export function assertFocusable(element, { selector, pageObjectNode, pageObjectK
   }
 
   if (error) {
-    throwBetterError(
-      pageObjectNode,
-      pageObjectKey,
-      `Element is not focusable because it is ${error}`, {
-        selector
-      }
-    );
+    throw new Error(`Element is not focusable because it is ${error}`);
   }
 }