els functions & terminal improvements

Author: DavertMik

lib/els.js

@@ -5,13 +5,13 @@ const container = require('./container');
 const event = require('./event');
 const Step = require('./step');
 const { truth } = require('./assert/truth');
-const { isAsyncFunction } = require('./utils');
+const { isAsyncFunction, humanizeFunction } = require('./utils');
 
 function element(purpose, locator, fn) {
   if (!fn) {
     fn = locator;
     locator = purpose;
-    purpose = `element (${fn.toString()})`;
+    purpose = 'first element';
   }
 
   const step = prepareStep(purpose, locator, fn);
@@ -29,7 +29,7 @@ function eachElement(purpose, locator, fn) {
   if (!fn) {
     fn = locator;
     locator = purpose;
-    purpose = `each element (${fn.toString()})`;
+    purpose = 'for each element';
   }
 
   const step = prepareStep(purpose, locator, fn);
@@ -58,7 +58,7 @@ function eachElement(purpose, locator, fn) {
 }
 
 function expectElement(locator, fn) {
-  const step = prepareStep(`expect element to be (${fn.toString()})`, locator, fn);
+  const step = prepareStep('expect element to be', locator, fn);
   if (!step) return;
 
   return executeStep(step, async () => {
@@ -72,7 +72,7 @@ function expectElement(locator, fn) {
 }
 
 function expectAnyElement(locator, fn) {
-  const step = prepareStep(`expect any element to be (${fn.toString()})`, locator, fn);
+  const step = prepareStep('expect any element to be', locator, fn);
   if (!step) return;
 
   return executeStep(step, async () => {
@@ -94,7 +94,7 @@ function expectAnyElement(locator, fn) {
 }
 
 function expectAllElements(locator, fn) {
-  const step = prepareStep(`expect all elements to be (${fn.toString()})`, locator, fn);
+  const step = prepareStep('expect all elements', locator, fn);
   if (!step) return;
 
   return executeStep(step, async () => {
@@ -105,7 +105,7 @@ function expectAllElements(locator, fn) {
     for (const el of els) {
       output.debug(`checking element #${i}: ${el}`);
       const result = await fn(el);
-      const assertion = truth(`element #${i} of (${locator})`, fn.toString());
+      const assertion = truth(`element #${i} of (${locator})`, humanizeFunction(fn));
       assertion.assert(result);
       i++;
     }
@@ -134,7 +134,11 @@ function prepareStep(purpose, locator, fn) {
     throw new Error('Async function should be passed into each element');
   }
 
-  const step = new Step(helper, `${purpose} within "${locator}"`);
+  const isAssertion = purpose.startsWith('expect');
+
+  const step = new Step(helper, `${purpose} within "${locator}" ${isAssertion ? 'to be' : 'to'}`);
+  step.setActor('EL');
+  step.setArguments([humanizeFunction(fn)]);
   step.helperMethod = '_locate';
 
   return step;