Merge pull request #96 from webnexusmobile/master

Added html escaping for opening and closing brackets in embedded text

Author: wswebcreation

lib/generate-report.js

@@ -334,7 +334,7 @@ function generateReport(options) {
 						]);
 					} else if (embedding.mime_type === 'text/plain' || (embedding.media && embedding.media.type === 'text/plain')) {
 						step.text = (step.text ? step.text : []).concat([
-							_isBase64(embedding.data) ? Base64.decode(embedding.data) :
+							_isBase64(embedding.data) ? _escapeHtml(Base64.decode(embedding.data)) :
 								embedding.data
 						]);
 					} else if (embedding.mime_type === 'image/png' || (embedding.media && embedding.media.type === 'image/png')) {
@@ -435,6 +435,16 @@ function generateReport(options) {
 			(firstPaddingChar === stringLength - 2 && string[ stringLength - 1 ] === '=');
 	}
 
+	/**
+	 * Escape html in string
+	 * @param string
+	 * @return {string}
+	 * @private
+	 */
+	function _escapeHtml(string) {
+		return string.replace(/</g, '&lt;').replace(/>/g, '&gt;')
+	}
+
 	/**
 	 * Generate the features overview
 	 * @param {object} suite JSON object with all the features and scenarios

templates/components/scenarios.tmpl

@@ -159,7 +159,7 @@
                                             <% } %>
 
                                                   <% if (step.image) { %>
-                                                    <a href="#info<%= scenarioIndex %><%= stepIndex %>-image" data-toggle="collapse">Screenshot +</a>
+                                                    <a href="#info<%= scenarioIndex %><%= stepIndex %>-image" data-toggle="collapse">+ Screenshot</a>
                                                     <% } %>
 
                                                       <% if (!_.isEmpty(step.attachments)) { %>