added 'message' parameter to all commands that are eventemitters

Author: maxgalbu

docs/saveElementScreenshot.md

@@ -28,6 +28,7 @@ Author: maxgalbu
 
 * **String** *elementSelector* - css/xpath selector for the element
 * **Function** *fileName* - file path where the screenshot is saved
+* **String** *[defaultMessage]* - message to display
 
 <!-- End es6/commands/saveElementScreenshot.js -->
 

docs/setValueAndTrigger.md

@@ -14,6 +14,7 @@ Author: maxgalbu
 * **String** *selector* - jQuery selector for the element
 * **String** *value* - value of the element to be set
 * **Function** *[callback]* - function that will be called after the change event is triggered
+* **String** *[message]* - message to display
 
 <!-- End es6/commands/setValueAndTrigger.js -->
 

docs/waitForAttribute.md

@@ -25,6 +25,7 @@ See: https://github.com/beatfactor/nightwatch/issues/246#issuecomment-59461345
 * **String** *attribute* - attribute to be checked
 * **Function** *checker* - function that must return true if the attribute matches, false otherwise
 * **Integer** *[timeoutInMilliseconds]* - timeout of this wait commands in milliseconds
+* **String** *[defaultMessage]* - message to display
 
 <!-- End es6/commands/waitForAttribute.js -->
 

docs/waitForJqueryAjaxRequest.md

@@ -17,6 +17,7 @@ Author: maxgalbu
 ### Params:
 
 * **Integer** *[timeoutInMilliseconds]* - timeout of this wait commands in milliseconds
+* **String** *[defaultMessage]* - message to display
 
 <!-- End es6/commands/waitForJqueryAjaxRequest.js -->
 

docs/waitForJqueryElement.md

@@ -20,6 +20,7 @@ Author: maxgalbu
 
 * **String** *elementSelector* - jquery selector for the element
 * **Integer** *[timeoutInMilliseconds]* - timeout of this wait commands in milliseconds
+* **String** *[defaultMessage]* - message to display
 
 <!-- End es6/commands/waitForJqueryElement.js -->
 

docs/waitForText.md

@@ -24,6 +24,7 @@ See: https://github.com/beatfactor/nightwatch/issues/246#issuecomment-59461345
 * **String** *elementSelector* - css/xpath selector for the element
 * **Function** *checker* - function that must return true if the element's text matches your requisite, false otherwise
 * **Integer** *[timeoutInMilliseconds]* - timeout of this wait commands in milliseconds
+* **String** *[defaultMessage]* - message to display
 
 <!-- End es6/commands/waitForText.js -->
 

docs/waitForTitle.md

@@ -23,6 +23,7 @@ See: https://github.com/beatfactor/nightwatch/issues/246#issuecomment-59461345
 
 * **Function** *checker* - function that must return true if the title matches your requisite, false otherwise
 * **Integer** *[timeoutInMilliseconds]* - timeout of this wait commands in milliseconds
+* **String** *[defaultMessage]* - message to display
 
 <!-- End es6/commands/waitForTitle.js -->
 

es6/commands/saveElementScreenshot.js

@@ -23,13 +23,19 @@
  * @author maxgalbu
  * @param {String} elementSelector - css/xpath selector for the element
  * @param {Function} fileName - file path where the screenshot is saved
+ * @param {String} [defaultMessage] - message to display
 */
 
 import events from 'events';
 import easyimg from 'easyimage';
 
 class SaveElementScreenshotAction extends events.EventEmitter {
-	command(elementSelector, fileName) {
+	command(elementSelector, fileName, defaultMessage) {
+		if (defaultMessage && typeof defaultMessage !== 'string') {
+            this.emit('error', "defaultMessage is not a string");
+            return;
+        }
+
 		this.api.getElementSize(elementSelector, sizeResult => {
 			return this.api.getLocation(elementSelector, locationResult => {
 				return this.api.saveScreenshot(fileName, () => {
@@ -51,8 +57,19 @@ class SaveElementScreenshotAction extends events.EventEmitter {
 			y: location.y,
 			gravity: 'North-West'
 		}).then(
-			file => this.emit("complete"),
-			err => (console.error(err), this.emit("complete"))
+			file => {
+				let message = `Saved screenshot for <${elementSelector}> to ${fileName}`;
+				if (defaultMessage) {
+					message = defaultMessage;
+				}
+
+				this.client.assertion(result, 'expression false', 'expression true', message, true); 
+				return this.emit("complete");
+			},
+			err => {
+				this.emit('error', `SaveElementScreenshotAction: could not save screenshot (error is ${err})`);
+				return this.emit("complete");
+			}
 		);
 
 	}

es6/commands/setValueAndTrigger.js

@@ -9,6 +9,7 @@
  * @param {String} selector - jQuery selector for the element
  * @param {String} value - value of the element to be set
  * @param {Function} [callback] - function that will be called after the change event is triggered
+ * @param {String} [message] - message to display
 */
 
 //=include ../getMultipleSelectors.js

es6/commands/waitForAttribute.js

@@ -19,6 +19,7 @@ import events from 'events';
  * @param {String} attribute - attribute to be checked
  * @param {Function} checker - function that must return true if the attribute matches, false otherwise
  * @param {Integer} [timeoutInMilliseconds] - timeout of this wait commands in milliseconds
+ * @param {String} [defaultMessage] - message to display
 */
 
 class WaitForAttribute extends events.EventEmitter {
@@ -40,7 +41,7 @@ class WaitForAttribute extends events.EventEmitter {
 		}
 	}
 
-	command(elementSelector, attribute, checker, timeoutInMilliseconds) {
+	command(elementSelector, attribute, checker, timeoutInMilliseconds, defaultMessage) {
 		//Save the origian locate strategy, because if this command is used with
 		//page objects, the "checker" function of this command is wrapped with another
 		//function which resets the locate strategy after the function is called,
@@ -56,10 +57,16 @@ class WaitForAttribute extends events.EventEmitter {
 		if (typeof timeoutInMilliseconds !== 'number') {
 			timeoutInMilliseconds = this.defaultTimeoutInMilliseconds;
 		}
+		if (defaultMessage && typeof defaultMessage !== 'string') {
+            this.emit('error', "defaultMessage is not a string");
+            return;
+        }
 
 		this.check(elementSelector, attribute, checker, (result, loadedTimeInMilliseconds) => {
 			let message = "";
-			if (result) {
+			if (defaultMessage) {
+				message = defaultMessage;
+			} else if (result) {
 				message = `waitForAttribute: ${elementSelector}@${attribute}. Expression was true after ${loadedTimeInMilliseconds - this.startTimeInMilliseconds}.`;
 			} else {
 				message = `waitForAttribute: ${elementSelector}@${attribute}. Expression wasn't true in ${timeoutInMilliseconds} ms.`;