From 8048cf60e8eb8ade2a06a795fe4a1134fe67f98c Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Tue, 6 Jan 2015 11:40:19 +0100 Subject: [PATCH 01/55] Create README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..b570da6 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +BehatHtmlFormatterPlugin +======================== + +This is a behat plugin to generate HTML reports From b96a5c21181671b110eb806fa05119d239ca88dc Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Tue, 6 Jan 2015 11:45:54 +0100 Subject: [PATCH 02/55] Update README.md Updated Readme file --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index b570da6..bbf91a2 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,11 @@ BehatHtmlFormatterPlugin ======================== This is a behat plugin to generate HTML reports + +Add this to your behat.yml file + +formatters: + html: true + extensions: + emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension: + name: html From c60f30bfed4cc3b596ea87d7c701788b9ab5fc58 Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Tue, 6 Jan 2015 11:47:19 +0100 Subject: [PATCH 03/55] Update README.md Updated README file --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bbf91a2..8eed34f 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,10 @@ This is a behat plugin to generate HTML reports Add this to your behat.yml file +
 formatters:
     html: true
   extensions:
     emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension:
         name: html
+
From e053e02e67ab212d14bc5114f4d90ee48b457375 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Tue, 6 Jan 2015 11:52:38 +0100 Subject: [PATCH 04/55] Added todo list to README. --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 8eed34f..06ccc35 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,12 @@ formatters: emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension: name: html + +To be done: +======================== + +1. Store previous runs +2. Add parameters for behat.yml file +3. Add bootstrap as dependency +4. clean up html report +5. ... From 998d20ad613513a441c566c53e68d59985283190 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Tue, 6 Jan 2015 11:55:28 +0100 Subject: [PATCH 05/55] Fixed namespace. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ea12eda..38b8916 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "autoload": { "psr-4": { - "emuse\\BehatHTMLFormatter": "src/" + "emuse\\BehatHTMLFormatter\\": "src/" } } } From c9a0be34aaba8dd84916616ba8641761b0a1da47 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Tue, 6 Jan 2015 11:56:16 +0100 Subject: [PATCH 06/55] Refactored composer file. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 38b8916..b804ff2 100644 --- a/composer.json +++ b/composer.json @@ -10,10 +10,10 @@ "minimum-stability": "dev", "require": { "php": ">=5.3.0", - "twig/twig":"~1.0" + "twig/twig":"~1.0", + "behat/behat": "~3.0" }, "require-dev": { - "behat/behat": "~3.0" }, "autoload": { "psr-4": { From 2c11fe528510f389d47c44a1dbc6c6c82a4a20c9 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Tue, 6 Jan 2015 15:30:02 +0100 Subject: [PATCH 07/55] Updated camposer name. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b804ff2..6e7b1bd 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "emuse/behat-html-formatter", + "name": "emuse/BehatHtmlFormatter", "description": "This will create a html formatter for Behat.", "authors": [ { From 402d51a483c600732e2760d88e959556f5dbe48a Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Tue, 6 Jan 2015 15:31:13 +0100 Subject: [PATCH 08/55] Updated camposer name. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6e7b1bd..b804ff2 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "emuse/BehatHtmlFormatter", + "name": "emuse/behat-html-formatter", "description": "This will create a html formatter for Behat.", "authors": [ { From b36d0c70559146809dffd89b3128204a538339f1 Mon Sep 17 00:00:00 2001 From: Chris Throup Date: Wed, 7 Jan 2015 23:57:45 +0000 Subject: [PATCH 09/55] Rename BehatHTMlFormatterExtension.php to BehatHTMLFormatterExtension.php Unix filesystems are case sensitive, so this class could not be autoloaded. --- ...HTMlFormatterExtension.php => BehatHTMLFormatterExtension.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{BehatHTMlFormatterExtension.php => BehatHTMLFormatterExtension.php} (100%) diff --git a/src/BehatHTMlFormatterExtension.php b/src/BehatHTMLFormatterExtension.php similarity index 100% rename from src/BehatHTMlFormatterExtension.php rename to src/BehatHTMLFormatterExtension.php From 6b85be5459803c032b900e035d6690edf35e641f Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Thu, 8 Jan 2015 12:30:27 +0100 Subject: [PATCH 10/55] Updated dashbard. --- assets/css/style.css | 63 ++++++++++ assets/css/style.less | 74 ++++++++++++ assets/js/Chart.min.js | 11 ++ reports/test_report.html | 197 ++++++++++++++++++++----------- src/BehatHTMLFormatter.php | 19 +++ src/Classes/Feature.php | 60 ++++++++++ templates/index.backup.html.twig | 98 +++++++++++++++ templates/index.html.twig | 115 ++++++++++++++---- 8 files changed, 548 insertions(+), 89 deletions(-) create mode 100644 assets/css/style.css create mode 100644 assets/css/style.less create mode 100644 assets/js/Chart.min.js create mode 100644 templates/index.backup.html.twig diff --git a/assets/css/style.css b/assets/css/style.css new file mode 100644 index 0000000..8aa5177 --- /dev/null +++ b/assets/css/style.css @@ -0,0 +1,63 @@ +body { + background-color: #f9f9f9; + font-family: 'Source Sans Pro', sans-serif; +} +.card { + position: relative; + background: #ffffff; + margin-bottom: 20px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + width: 100%; + box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1); +} +.card.passed .header { + background-color: #00a65a; +} +.card.failed .header { + background-color: red; +} +.card .header { + color: #fff; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + border-bottom: 0px solid #f4f4f4; +} +.card .header:before, +.card .header:after { + display: table; + content: " "; +} +.card .header h2 { + display: inline-block; + padding: 10px 10px 10px 10px; + margin: 0; + font-size: 20px; + font-weight: 400; + cursor: default; +} +.card .info { + padding: 10px; + height: 130px; +} +.card .footer { + border-top: 1px solid #f4f4f4; + -webkit-border-top-left-radius: 0; + -webkit-border-top-right-radius: 0; + -webkit-border-bottom-right-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-topleft: 0; + -moz-border-radius-topright: 0; + -moz-border-radius-bottomright: 3px; + -moz-border-radius-bottomleft: 3px; + border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; + padding: 10px; + background-color: #ffffff; + height: 30px; +} diff --git a/assets/css/style.less b/assets/css/style.less new file mode 100644 index 0000000..22327e0 --- /dev/null +++ b/assets/css/style.less @@ -0,0 +1,74 @@ +body { + background-color: #f9f9f9; + font-family: 'Source Sans Pro', sans-serif; +} + +.card { + position: relative; + background: #ffffff; + margin-bottom: 20px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + width: 100%; + box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1); + + &.passed { + .header { + background-color: #00a65a; + } + } + + &.failed { + .header { + background-color: red; + } + } + + .header { + color: #fff; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + border-bottom: 0px solid #f4f4f4; + + &:before, &:after { + display: table; + content: " "; + } + h2 { + display: inline-block; + padding: 10px 10px 10px 10px; + margin: 0; + font-size: 20px; + font-weight: 400; + cursor: default; + } + } + + .info { + padding: 10px; + height: 130px; + } + + .footer { + border-top: 1px solid #f4f4f4; + -webkit-border-top-left-radius: 0; + -webkit-border-top-right-radius: 0; + -webkit-border-bottom-right-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-topleft: 0; + -moz-border-radius-topright: 0; + -moz-border-radius-bottomright: 3px; + -moz-border-radius-bottomleft: 3px; + border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; + padding: 10px; + background-color: #ffffff; + height: 30px; + } + +} diff --git a/assets/js/Chart.min.js b/assets/js/Chart.min.js new file mode 100644 index 0000000..3804f84 --- /dev/null +++ b/assets/js/Chart.min.js @@ -0,0 +1,11 @@ +/*! + * Chart.js + * http://chartjs.org/ + * Version: 1.0.1 + * + * Copyright 2015 Nick Downie + * Released under the MIT license + * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md + */ +(function(){"use strict";var t=this,i=t.Chart,e=function(t){this.canvas=t.canvas,this.ctx=t;this.width=t.canvas.width,this.height=t.canvas.height;return this.aspectRatio=this.width/this.height,s.retinaScale(this),this};e.defaults={global:{animation:!0,animationSteps:60,animationEasing:"easeOutQuart",showScale:!0,scaleOverride:!1,scaleSteps:null,scaleStepWidth:null,scaleStartValue:null,scaleLineColor:"rgba(0,0,0,.1)",scaleLineWidth:1,scaleShowLabels:!0,scaleLabel:"<%=value%>",scaleIntegersOnly:!0,scaleBeginAtZero:!1,scaleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",scaleFontSize:12,scaleFontStyle:"normal",scaleFontColor:"#666",responsive:!1,maintainAspectRatio:!0,showTooltips:!0,customTooltips:!1,tooltipEvents:["mousemove","touchstart","touchmove","mouseout"],tooltipFillColor:"rgba(0,0,0,0.8)",tooltipFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipFontSize:14,tooltipFontStyle:"normal",tooltipFontColor:"#fff",tooltipTitleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipTitleFontSize:14,tooltipTitleFontStyle:"bold",tooltipTitleFontColor:"#fff",tooltipYPadding:6,tooltipXPadding:6,tooltipCaretSize:8,tooltipCornerRadius:6,tooltipXOffset:10,tooltipTemplate:"<%if (label){%><%=label%>: <%}%><%= value %>",multiTooltipTemplate:"<%= value %>",multiTooltipKeyBackground:"#fff",onAnimationProgress:function(){},onAnimationComplete:function(){}}},e.types={};var s=e.helpers={},n=s.each=function(t,i,e){var s=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var n;for(n=0;n=0;s--){var n=t[s];if(i(n))return n}},s.inherits=function(t){var i=this,e=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return i.apply(this,arguments)},s=function(){this.constructor=e};return s.prototype=i.prototype,e.prototype=new s,e.extend=r,t&&a(e.prototype,t),e.__super__=i.prototype,e}),c=s.noop=function(){},u=s.uid=function(){var t=0;return function(){return"chart-"+t++}}(),d=s.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},p=s.amd="function"==typeof define&&define.amd,f=s.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},g=s.max=function(t){return Math.max.apply(Math,t)},m=s.min=function(t){return Math.min.apply(Math,t)},v=(s.cap=function(t,i,e){if(f(i)){if(t>i)return i}else if(f(e)&&e>t)return e;return t},s.getDecimalPlaces=function(t){return t%1!==0&&f(t)?t.toString().split(".")[1].length:0}),S=s.radians=function(t){return t*(Math.PI/180)},x=(s.getAngleFromPoint=function(t,i){var e=i.x-t.x,s=i.y-t.y,n=Math.sqrt(e*e+s*s),o=2*Math.PI+Math.atan2(s,e);return 0>e&&0>s&&(o+=2*Math.PI),{angle:o,distance:n}},s.aliasPixel=function(t){return t%2===0?0:.5}),y=(s.splineCurve=function(t,i,e,s){var n=Math.sqrt(Math.pow(i.x-t.x,2)+Math.pow(i.y-t.y,2)),o=Math.sqrt(Math.pow(e.x-i.x,2)+Math.pow(e.y-i.y,2)),a=s*n/(n+o),h=s*o/(n+o);return{inner:{x:i.x-a*(e.x-t.x),y:i.y-a*(e.y-t.y)},outer:{x:i.x+h*(e.x-t.x),y:i.y+h*(e.y-t.y)}}},s.calculateOrderOfMagnitude=function(t){return Math.floor(Math.log(t)/Math.LN10)}),C=(s.calculateScaleRange=function(t,i,e,s,n){var o=2,a=Math.floor(i/(1.5*e)),h=o>=a,l=g(t),r=m(t);l===r&&(l+=.5,r>=.5&&!s?r-=.5:l+=.5);for(var c=Math.abs(l-r),u=y(c),d=Math.ceil(l/(1*Math.pow(10,u)))*Math.pow(10,u),p=s?0:Math.floor(r/(1*Math.pow(10,u)))*Math.pow(10,u),f=d-p,v=Math.pow(10,u),S=Math.round(f/v);(S>a||a>2*S)&&!h;)if(S>a)v*=2,S=Math.round(f/v),S%1!==0&&(h=!0);else if(n&&u>=0){if(v/2%1!==0)break;v/=2,S=Math.round(f/v)}else v/=2,S=Math.round(f/v);return h&&(S=o,v=f/S),{steps:S,stepValue:v,min:p,max:p+S*v}},s.template=function(t,i){function e(t,i){var e=/\W/.test(t)?new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+t.replace(/[\r\t\n]/g," ").split("<%").join(" ").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split(" ").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');"):s[t]=s[t];return i?e(i):e}if(t instanceof Function)return t(i);var s={};return e(t,i)}),w=(s.generateLabels=function(t,i,e,s){var o=new Array(i);return labelTemplateString&&n(o,function(i,n){o[n]=C(t,{value:e+s*(n+1)})}),o},s.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-0.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-0.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-0.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-0.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),st?-.5*s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e):s*Math.pow(2,-10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)*.5+1)},easeInBack:function(t){var i=1.70158;return 1*(t/=1)*t*((i+1)*t-i)},easeOutBack:function(t){var i=1.70158;return 1*((t=t/1-1)*t*((i+1)*t+i)+1)},easeInOutBack:function(t){var i=1.70158;return(t/=.5)<1?.5*t*t*(((i*=1.525)+1)*t-i):.5*((t-=2)*t*(((i*=1.525)+1)*t+i)+2)},easeInBounce:function(t){return 1-w.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?7.5625*t*t:2/2.75>t?1*(7.5625*(t-=1.5/2.75)*t+.75):2.5/2.75>t?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return.5>t?.5*w.easeInBounce(2*t):.5*w.easeOutBounce(2*t-1)+.5}}),b=s.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),P=(s.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),s.animationLoop=function(t,i,e,s,n,o){var a=0,h=w[e]||w.linear,l=function(){a++;var e=a/i,r=h(e);t.call(o,r,e,a),s.call(o,r,e),i>a?o.animationFrame=b(l):n.apply(o)};b(l)},s.getRelativePosition=function(t){var i,e,s=t.originalEvent||t,n=t.currentTarget||t.srcElement,o=n.getBoundingClientRect();return s.touches?(i=s.touches[0].clientX-o.left,e=s.touches[0].clientY-o.top):(i=s.clientX-o.left,e=s.clientY-o.top),{x:i,y:e}},s.addEvent=function(t,i,e){t.addEventListener?t.addEventListener(i,e):t.attachEvent?t.attachEvent("on"+i,e):t["on"+i]=e}),L=s.removeEvent=function(t,i,e){t.removeEventListener?t.removeEventListener(i,e,!1):t.detachEvent?t.detachEvent("on"+i,e):t["on"+i]=c},k=(s.bindEvents=function(t,i,e){t.events||(t.events={}),n(i,function(i){t.events[i]=function(){e.apply(t,arguments)},P(t.chart.canvas,i,t.events[i])})},s.unbindEvents=function(t,i){n(i,function(i,e){L(t.chart.canvas,e,i)})}),F=s.getMaximumWidth=function(t){var i=t.parentNode;return i.clientWidth},R=s.getMaximumHeight=function(t){var i=t.parentNode;return i.clientHeight},T=(s.getMaximumSize=s.getMaximumWidth,s.retinaScale=function(t){var i=t.ctx,e=t.canvas.width,s=t.canvas.height;window.devicePixelRatio&&(i.canvas.style.width=e+"px",i.canvas.style.height=s+"px",i.canvas.height=s*window.devicePixelRatio,i.canvas.width=e*window.devicePixelRatio,i.scale(window.devicePixelRatio,window.devicePixelRatio))}),A=s.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},M=s.fontString=function(t,i,e){return i+" "+t+"px "+e},W=s.longestText=function(t,i,e){t.font=i;var s=0;return n(e,function(i){var e=t.measureText(i).width;s=e>s?e:s}),s},z=s.drawRoundedRectangle=function(t,i,e,s,n,o){t.beginPath(),t.moveTo(i+o,e),t.lineTo(i+s-o,e),t.quadraticCurveTo(i+s,e,i+s,e+o),t.lineTo(i+s,e+n-o),t.quadraticCurveTo(i+s,e+n,i+s-o,e+n),t.lineTo(i+o,e+n),t.quadraticCurveTo(i,e+n,i,e+n-o),t.lineTo(i,e+o),t.quadraticCurveTo(i,e,i+o,e),t.closePath()};e.instances={},e.Type=function(t,i,s){this.options=i,this.chart=s,this.id=u(),e.instances[this.id]=this,i.responsive&&this.resize(),this.initialize.call(this,t)},a(e.Type.prototype,{initialize:function(){return this},clear:function(){return A(this.chart),this},stop:function(){return s.cancelAnimFrame.call(t,this.animationFrame),this},resize:function(t){this.stop();var i=this.chart.canvas,e=F(this.chart.canvas),s=this.options.maintainAspectRatio?e/this.chart.aspectRatio:R(this.chart.canvas);return i.width=this.chart.width=e,i.height=this.chart.height=s,T(this.chart),"function"==typeof t&&t.apply(this,Array.prototype.slice.call(arguments,1)),this},reflow:c,render:function(t){return t&&this.reflow(),this.options.animation&&!t?s.animationLoop(this.draw,this.options.animationSteps,this.options.animationEasing,this.options.onAnimationProgress,this.options.onAnimationComplete,this):(this.draw(),this.options.onAnimationComplete.call(this)),this},generateLegend:function(){return C(this.options.legendTemplate,this)},destroy:function(){this.clear(),k(this,this.events);var t=this.chart.canvas;t.width=this.chart.width,t.height=this.chart.height,t.style.removeProperty?(t.style.removeProperty("width"),t.style.removeProperty("height")):(t.style.removeAttribute("width"),t.style.removeAttribute("height")),delete e.instances[this.id]},showTooltip:function(t,i){"undefined"==typeof this.activeElements&&(this.activeElements=[]);var o=function(t){var i=!1;return t.length!==this.activeElements.length?i=!0:(n(t,function(t,e){t!==this.activeElements[e]&&(i=!0)},this),i)}.call(this,t);if(o||i){if(this.activeElements=t,this.draw(),this.options.customTooltips&&this.options.customTooltips(!1),t.length>0)if(this.datasets&&this.datasets.length>1){for(var a,h,r=this.datasets.length-1;r>=0&&(a=this.datasets[r].points||this.datasets[r].bars||this.datasets[r].segments,h=l(a,t[0]),-1===h);r--);var c=[],u=[],d=function(){var t,i,e,n,o,a=[],l=[],r=[];return s.each(this.datasets,function(i){t=i.points||i.bars||i.segments,t[h]&&t[h].hasValue()&&a.push(t[h])}),s.each(a,function(t){l.push(t.x),r.push(t.y),c.push(s.template(this.options.multiTooltipTemplate,t)),u.push({fill:t._saved.fillColor||t.fillColor,stroke:t._saved.strokeColor||t.strokeColor})},this),o=m(r),e=g(r),n=m(l),i=g(l),{x:n>this.chart.width/2?n:i,y:(o+e)/2}}.call(this,h);new e.MultiTooltip({x:d.x,y:d.y,xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,xOffset:this.options.tooltipXOffset,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,titleTextColor:this.options.tooltipTitleFontColor,titleFontFamily:this.options.tooltipTitleFontFamily,titleFontStyle:this.options.tooltipTitleFontStyle,titleFontSize:this.options.tooltipTitleFontSize,cornerRadius:this.options.tooltipCornerRadius,labels:c,legendColors:u,legendColorBackground:this.options.multiTooltipKeyBackground,title:t[0].label,chart:this.chart,ctx:this.chart.ctx,custom:this.options.customTooltips}).draw()}else n(t,function(t){var i=t.tooltipPosition();new e.Tooltip({x:Math.round(i.x),y:Math.round(i.y),xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,caretHeight:this.options.tooltipCaretSize,cornerRadius:this.options.tooltipCornerRadius,text:C(this.options.tooltipTemplate,t),chart:this.chart,custom:this.options.customTooltips}).draw()},this);return this}},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)}}),e.Type.extend=function(t){var i=this,s=function(){return i.apply(this,arguments)};if(s.prototype=o(i.prototype),a(s.prototype,t),s.extend=e.Type.extend,t.name||i.prototype.name){var n=t.name||i.prototype.name,l=e.defaults[i.prototype.name]?o(e.defaults[i.prototype.name]):{};e.defaults[n]=a(l,t.defaults),e.types[n]=s,e.prototype[n]=function(t,i){var o=h(e.defaults.global,e.defaults[n],i||{});return new s(t,o,this)}}else d("Name not provided for this chart, so it hasn't been registered");return i},e.Element=function(t){a(this,t),this.initialize.apply(this,arguments),this.save()},a(e.Element.prototype,{initialize:function(){},restore:function(t){return t?n(t,function(t){this[t]=this._saved[t]},this):a(this,this._saved),this},save:function(){return this._saved=o(this),delete this._saved._saved,this},update:function(t){return n(t,function(t,i){this._saved[i]=this[i],this[i]=t},this),this},transition:function(t,i){return n(t,function(t,e){this[e]=(t-this._saved[e])*i+this._saved[e]},this),this},tooltipPosition:function(){return{x:this.x,y:this.y}},hasValue:function(){return f(this.value)}}),e.Element.extend=r,e.Point=e.Element.extend({display:!0,inRange:function(t,i){var e=this.hitDetectionRadius+this.radius;return Math.pow(t-this.x,2)+Math.pow(i-this.y,2)=this.startAngle&&e.angle<=this.endAngle,o=e.distance>=this.innerRadius&&e.distance<=this.outerRadius;return n&&o},tooltipPosition:function(){var t=this.startAngle+(this.endAngle-this.startAngle)/2,i=(this.outerRadius-this.innerRadius)/2+this.innerRadius;return{x:this.x+Math.cos(t)*i,y:this.y+Math.sin(t)*i}},draw:function(t){var i=this.ctx;i.beginPath(),i.arc(this.x,this.y,this.outerRadius,this.startAngle,this.endAngle),i.arc(this.x,this.y,this.innerRadius,this.endAngle,this.startAngle,!0),i.closePath(),i.strokeStyle=this.strokeColor,i.lineWidth=this.strokeWidth,i.fillStyle=this.fillColor,i.fill(),i.lineJoin="bevel",this.showStroke&&i.stroke()}}),e.Rectangle=e.Element.extend({draw:function(){var t=this.ctx,i=this.width/2,e=this.x-i,s=this.x+i,n=this.base-(this.base-this.y),o=this.strokeWidth/2;this.showStroke&&(e+=o,s-=o,n+=o),t.beginPath(),t.fillStyle=this.fillColor,t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.moveTo(e,this.base),t.lineTo(e,n),t.lineTo(s,n),t.lineTo(s,this.base),t.fill(),this.showStroke&&t.stroke()},height:function(){return this.base-this.y},inRange:function(t,i){return t>=this.x-this.width/2&&t<=this.x+this.width/2&&i>=this.y&&i<=this.base}}),e.Tooltip=e.Element.extend({draw:function(){var t=this.chart.ctx;t.font=M(this.fontSize,this.fontStyle,this.fontFamily),this.xAlign="center",this.yAlign="above";var i=this.caretPadding=2,e=t.measureText(this.text).width+2*this.xPadding,s=this.fontSize+2*this.yPadding,n=s+this.caretHeight+i;this.x+e/2>this.chart.width?this.xAlign="left":this.x-e/2<0&&(this.xAlign="right"),this.y-n<0&&(this.yAlign="below");var o=this.x-e/2,a=this.y-n;if(t.fillStyle=this.fillColor,this.custom)this.custom(this);else{switch(this.yAlign){case"above":t.beginPath(),t.moveTo(this.x,this.y-i),t.lineTo(this.x+this.caretHeight,this.y-(i+this.caretHeight)),t.lineTo(this.x-this.caretHeight,this.y-(i+this.caretHeight)),t.closePath(),t.fill();break;case"below":a=this.y+i+this.caretHeight,t.beginPath(),t.moveTo(this.x,this.y+i),t.lineTo(this.x+this.caretHeight,this.y+i+this.caretHeight),t.lineTo(this.x-this.caretHeight,this.y+i+this.caretHeight),t.closePath(),t.fill()}switch(this.xAlign){case"left":o=this.x-e+(this.cornerRadius+this.caretHeight);break;case"right":o=this.x-(this.cornerRadius+this.caretHeight)}z(t,o,a,e,s,this.cornerRadius),t.fill(),t.fillStyle=this.textColor,t.textAlign="center",t.textBaseline="middle",t.fillText(this.text,o+e/2,a+s/2)}}}),e.MultiTooltip=e.Element.extend({initialize:function(){this.font=M(this.fontSize,this.fontStyle,this.fontFamily),this.titleFont=M(this.titleFontSize,this.titleFontStyle,this.titleFontFamily),this.height=this.labels.length*this.fontSize+(this.labels.length-1)*(this.fontSize/2)+2*this.yPadding+1.5*this.titleFontSize,this.ctx.font=this.titleFont;var t=this.ctx.measureText(this.title).width,i=W(this.ctx,this.font,this.labels)+this.fontSize+3,e=g([i,t]);this.width=e+2*this.xPadding;var s=this.height/2;this.y-s<0?this.y=s:this.y+s>this.chart.height&&(this.y=this.chart.height-s),this.x>this.chart.width/2?this.x-=this.xOffset+this.width:this.x+=this.xOffset},getLineHeight:function(t){var i=this.y-this.height/2+this.yPadding,e=t-1;return 0===t?i+this.titleFontSize/2:i+(1.5*this.fontSize*e+this.fontSize/2)+1.5*this.titleFontSize},draw:function(){if(this.custom)this.custom(this);else{z(this.ctx,this.x,this.y-this.height/2,this.width,this.height,this.cornerRadius);var t=this.ctx;t.fillStyle=this.fillColor,t.fill(),t.closePath(),t.textAlign="left",t.textBaseline="middle",t.fillStyle=this.titleTextColor,t.font=this.titleFont,t.fillText(this.title,this.x+this.xPadding,this.getLineHeight(0)),t.font=this.font,s.each(this.labels,function(i,e){t.fillStyle=this.textColor,t.fillText(i,this.x+this.xPadding+this.fontSize+3,this.getLineHeight(e+1)),t.fillStyle=this.legendColorBackground,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize),t.fillStyle=this.legendColors[e].fill,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize)},this)}}}),e.Scale=e.Element.extend({initialize:function(){this.fit()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}));this.yLabelWidth=this.display&&this.showLabels?W(this.ctx,this.font,this.yLabels):0},addXLabel:function(t){this.xLabels.push(t),this.valuesCount++,this.fit()},removeXLabel:function(){this.xLabels.shift(),this.valuesCount--,this.fit()},fit:function(){this.startPoint=this.display?this.fontSize:0,this.endPoint=this.display?this.height-1.5*this.fontSize-5:this.height,this.startPoint+=this.padding,this.endPoint-=this.padding;var t,i=this.endPoint-this.startPoint;for(this.calculateYRange(i),this.buildYLabels(),this.calculateXLabelRotation();i>this.endPoint-this.startPoint;)i=this.endPoint-this.startPoint,t=this.yLabelWidth,this.calculateYRange(i),this.buildYLabels(),tthis.yLabelWidth+10?e/2:this.yLabelWidth+10,this.xLabelRotation=0,this.display){var n,o=W(this.ctx,this.font,this.xLabels);this.xLabelWidth=o;for(var a=Math.floor(this.calculateX(1)-this.calculateX(0))-6;this.xLabelWidth>a&&0===this.xLabelRotation||this.xLabelWidth>a&&this.xLabelRotation<=90&&this.xLabelRotation>0;)n=Math.cos(S(this.xLabelRotation)),t=n*e,i=n*s,t+this.fontSize/2>this.yLabelWidth+8&&(this.xScalePaddingLeft=t+this.fontSize/2),this.xScalePaddingRight=this.fontSize/2,this.xLabelRotation++,this.xLabelWidth=n*o;this.xLabelRotation>0&&(this.endPoint-=Math.sin(S(this.xLabelRotation))*o+3)}else this.xLabelWidth=0,this.xScalePaddingRight=this.padding,this.xScalePaddingLeft=this.padding},calculateYRange:c,drawingArea:function(){return this.startPoint-this.endPoint},calculateY:function(t){var i=this.drawingArea()/(this.min-this.max);return this.endPoint-i*(t-this.min)},calculateX:function(t){var i=(this.xLabelRotation>0,this.width-(this.xScalePaddingLeft+this.xScalePaddingRight)),e=i/(this.valuesCount-(this.offsetGridLines?0:1)),s=e*t+this.xScalePaddingLeft;return this.offsetGridLines&&(s+=e/2),Math.round(s)},update:function(t){s.extend(this,t),this.fit()},draw:function(){var t=this.ctx,i=(this.endPoint-this.startPoint)/this.steps,e=Math.round(this.xScalePaddingLeft);this.display&&(t.fillStyle=this.textColor,t.font=this.font,n(this.yLabels,function(n,o){var a=this.endPoint-i*o,h=Math.round(a),l=this.showHorizontalLines;t.textAlign="right",t.textBaseline="middle",this.showLabels&&t.fillText(n,e-10,a),0!==o||l||(l=!0),l&&t.beginPath(),o>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),h+=s.aliasPixel(t.lineWidth),l&&(t.moveTo(e,h),t.lineTo(this.width,h),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(e-5,h),t.lineTo(e,h),t.stroke(),t.closePath()},this),n(this.xLabels,function(i,e){var s=this.calculateX(e)+x(this.lineWidth),n=this.calculateX(e-(this.offsetGridLines?.5:0))+x(this.lineWidth),o=this.xLabelRotation>0,a=this.showVerticalLines;0!==e||a||(a=!0),a&&t.beginPath(),e>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),a&&(t.moveTo(n,this.endPoint),t.lineTo(n,this.startPoint-3),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(n,this.endPoint),t.lineTo(n,this.endPoint+5),t.stroke(),t.closePath(),t.save(),t.translate(s,o?this.endPoint+12:this.endPoint+8),t.rotate(-1*S(this.xLabelRotation)),t.font=this.font,t.textAlign=o?"right":"center",t.textBaseline=o?"middle":"top",t.fillText(i,0,0),t.restore()},this))}}),e.RadialScale=e.Element.extend({initialize:function(){this.size=m([this.height,this.width]),this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2},calculateCenterOffset:function(t){var i=this.drawingArea/(this.max-this.min);return(t-this.min)*i},update:function(){this.lineArc?this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2:this.setScaleSize(),this.buildYLabels()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}))},getCircumference:function(){return 2*Math.PI/this.valuesCount},setScaleSize:function(){var t,i,e,s,n,o,a,h,l,r,c,u,d=m([this.height/2-this.pointLabelFontSize-5,this.width/2]),p=this.width,g=0;for(this.ctx.font=M(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),i=0;ip&&(p=t.x+s,n=i),t.x-sp&&(p=t.x+e,n=i):i>this.valuesCount/2&&t.x-e0){var s,n=e*(this.drawingArea/this.steps),o=this.yCenter-n;if(this.lineWidth>0)if(t.strokeStyle=this.lineColor,t.lineWidth=this.lineWidth,this.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,n,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var a=0;a=0;i--){if(this.angleLineWidth>0){var e=this.getPointPosition(i,this.calculateCenterOffset(this.max));t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(e.x,e.y),t.stroke(),t.closePath()}var s=this.getPointPosition(i,this.calculateCenterOffset(this.max)+5);t.font=M(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),t.fillStyle=this.pointLabelFontColor;var o=this.labels.length,a=this.labels.length/2,h=a/2,l=h>i||i>o-h,r=i===h||i===o-h;t.textAlign=0===i?"center":i===a?"center":a>i?"left":"right",t.textBaseline=r?"middle":l?"bottom":"top",t.fillText(this.labels[i],s.x,s.y)}}}}}),s.addEvent(window,"resize",function(){var t;return function(){clearTimeout(t),t=setTimeout(function(){n(e.instances,function(t){t.options.responsive&&t.resize(t.render,!0)})},50)}}()),p?define(function(){return e}):"object"==typeof module&&module.exports&&(module.exports=e),t.Chart=e,e.noConflict=function(){return t.Chart=i,e}}).call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleBeginAtZero:!0,scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowVerticalLines:!0,barShowStroke:!0,barStrokeWidth:2,barValueSpacing:5,barDatasetSpacing:1,legendTemplate:'
    <% for (var i=0; i
  • <%if(datasets[i].label){%><%=datasets[i].label%><%}%>
    • <%}%>
'};i.Type.extend({name:"Bar",defaults:s,initialize:function(t){var s=this.options;this.ScaleClass=i.Scale.extend({offsetGridLines:!0,calculateBarX:function(t,i,e){var n=this.calculateBaseWidth(),o=this.calculateX(e)-n/2,a=this.calculateBarWidth(t);return o+a*i+i*s.barDatasetSpacing+a/2},calculateBaseWidth:function(){return this.calculateX(1)-this.calculateX(0)-2*s.barValueSpacing},calculateBarWidth:function(t){var i=this.calculateBaseWidth()-(t-1)*s.barDatasetSpacing;return i/t}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getBarsAtEvent(t):[];this.eachBars(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),this.BarClass=i.Rectangle.extend({strokeWidth:this.options.barStrokeWidth,showStroke:this.options.barShowStroke,ctx:this.chart.ctx}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,bars:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.bars.push(new this.BarClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.strokeColor,fillColor:i.fillColor,highlightFill:i.highlightFill||i.fillColor,highlightStroke:i.highlightStroke||i.strokeColor}))},this)},this),this.buildScale(t.labels),this.BarClass.prototype.base=this.scale.endPoint,this.eachBars(function(t,i,s){e.extend(t,{width:this.scale.calculateBarWidth(this.datasets.length),x:this.scale.calculateBarX(this.datasets.length,s,i),y:this.scale.endPoint}),t.save()},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachBars(function(t){t.save()}),this.render()},eachBars:function(t){e.each(this.datasets,function(i,s){e.each(i.bars,t,this,s)},this)},getBarsAtEvent:function(t){for(var i,s=[],n=e.getRelativePosition(t),o=function(t){s.push(t.bars[i])},a=0;a<% for (var i=0; i
  • <%if(segments[i].label){%><%=segments[i].label%><%}%>
    • <%}%>'};i.Type.extend({name:"Doughnut",defaults:s,initialize:function(t){this.segments=[],this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,this.SegmentArc=i.Arc.extend({ctx:this.chart.ctx,x:this.chart.width/2,y:this.chart.height/2}),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.calculateTotal(t),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({value:t.value,outerRadius:this.options.animateScale?0:this.outerRadius,innerRadius:this.options.animateScale?0:this.outerRadius/100*this.options.percentageInnerCutout,fillColor:t.color,highlightColor:t.highlight||t.color,showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,startAngle:1.5*Math.PI,circumference:this.options.animateRotate?0:this.calculateCircumference(t.value),label:t.label})),e||(this.reflow(),this.update())},calculateCircumference:function(t){return 2*Math.PI*(t/this.total)},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=t.value},this)},update:function(){this.calculateTotal(this.segments),e.each(this.activeElements,function(t){t.restore(["fillColor"])}),e.each(this.segments,function(t){t.save()}),this.render()},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,e.each(this.segments,function(t){t.update({outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout})},this)},draw:function(t){var i=t?t:1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.calculateCircumference(t.value),outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout},i),t.endAngle=t.startAngle+t.circumference,t.draw(),0===e&&(t.startAngle=1.5*Math.PI),e<% for (var i=0; i
  • <%if(datasets[i].label){%><%=datasets[i].label%><%}%>
    • <%}%>'};i.Type.extend({name:"Line",defaults:s,initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)0&&ithis.scale.endPoint?t.controlPoints.outer.y=this.scale.endPoint:t.controlPoints.outer.ythis.scale.endPoint?t.controlPoints.inner.y=this.scale.endPoint:t.controlPoints.inner.y0&&(s.lineTo(h[h.length-1].x,this.scale.endPoint),s.lineTo(h[0].x,this.scale.endPoint),s.fillStyle=t.fillColor,s.closePath(),s.fill()),e.each(h,function(t){t.draw()})},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowLabelBackdrop:!0,scaleBackdropColor:"rgba(255,255,255,0.75)",scaleBeginAtZero:!0,scaleBackdropPaddingY:2,scaleBackdropPaddingX:2,scaleShowLine:!0,segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'
      <% for (var i=0; i
    • <%if(segments[i].label){%><%=segments[i].label%><%}%>
      • <%}%>
    '};i.Type.extend({name:"PolarArea",defaults:s,initialize:function(t){this.segments=[],this.SegmentArc=i.Arc.extend({showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,ctx:this.chart.ctx,innerRadius:0,x:this.chart.width/2,y:this.chart.height/2}),this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,lineArc:!0,width:this.chart.width,height:this.chart.height,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,valuesCount:t.length}),this.updateScaleRange(t),this.scale.update(),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({fillColor:t.color,highlightColor:t.highlight||t.color,label:t.label,value:t.value,outerRadius:this.options.animateScale?0:this.scale.calculateCenterOffset(t.value),circumference:this.options.animateRotate?0:this.scale.getCircumference(),startAngle:1.5*Math.PI})),e||(this.reflow(),this.update())},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=t.value},this),this.scale.valuesCount=this.segments.length},updateScaleRange:function(t){var i=[];e.each(t,function(t){i.push(t.value)});var s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s,{size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2})},update:function(){this.calculateTotal(this.segments),e.each(this.segments,function(t){t.save()}),this.render()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.updateScaleRange(this.segments),this.scale.update(),e.extend(this.scale,{xCenter:this.chart.width/2,yCenter:this.chart.height/2}),e.each(this.segments,function(t){t.update({outerRadius:this.scale.calculateCenterOffset(t.value)})},this)},draw:function(t){var i=t||1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.scale.getCircumference(),outerRadius:this.scale.calculateCenterOffset(t.value)},i),t.endAngle=t.startAngle+t.circumference,0===e&&(t.startAngle=1.5*Math.PI),e<% for (var i=0; i
  • <%if(datasets[i].label){%><%=datasets[i].label%><%}%>
    • <%}%>'},initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx}),this.datasets=[],this.buildScale(t),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){var o;this.scale.animation||(o=this.scale.getPointPosition(n,this.scale.calculateCenterOffset(e))),s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,x:this.options.animation?this.scale.xCenter:o.x,y:this.options.animation?this.scale.yCenter:o.y,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this)},this),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=e.getRelativePosition(t),s=e.getAngleFromPoint({x:this.scale.xCenter,y:this.scale.yCenter},i),n=2*Math.PI/this.scale.valuesCount,o=Math.round((s.angle-1.5*Math.PI)/n),a=[];return(o>=this.scale.valuesCount||0>o)&&(o=0),s.distance<=this.scale.drawingArea&&e.each(this.datasets,function(t){a.push(t.points[o])}),a},buildScale:function(t){this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,angleLineColor:this.options.angleLineColor,angleLineWidth:this.options.angleShowLineOut?this.options.angleLineWidth:0,pointLabelFontColor:this.options.pointLabelFontColor,pointLabelFontSize:this.options.pointLabelFontSize,pointLabelFontFamily:this.options.pointLabelFontFamily,pointLabelFontStyle:this.options.pointLabelFontStyle,height:this.chart.height,width:this.chart.width,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,labels:t.labels,valuesCount:t.datasets[0].data.length}),this.scale.setScaleSize(),this.updateScaleRange(t.datasets),this.scale.buildYLabels()},updateScaleRange:function(t){var i=function(){var i=[];return e.each(t,function(t){t.data?i=i.concat(t.data):e.each(t.points,function(t){i.push(t.value)})}),i}(),s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s)},addData:function(t,i){this.scale.valuesCount++,e.each(t,function(t,e){var s=this.scale.getPointPosition(this.scale.valuesCount,this.scale.calculateCenterOffset(t));this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:s.x,y:s.y,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.labels.push(i),this.reflow(),this.update()},removeData:function(){this.scale.valuesCount--,this.scale.labels.shift(),e.each(this.datasets,function(t){t.points.shift()},this),this.reflow(),this.update()},update:function(){this.eachPoints(function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.scale,{width:this.chart.width,height:this.chart.height,size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2}),this.updateScaleRange(this.datasets),this.scale.setScaleSize(),this.scale.buildYLabels()},draw:function(t){var i=t||1,s=this.chart.ctx;this.clear(),this.scale.draw(),e.each(this.datasets,function(t){e.each(t.points,function(t,e){t.hasValue()&&t.transition(this.scale.getPointPosition(e,this.scale.calculateCenterOffset(t.value)),i)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(t.points,function(t,i){0===i?s.moveTo(t.x,t.y):s.lineTo(t.x,t.y)},this),s.closePath(),s.stroke(),s.fillStyle=t.fillColor,s.fill(),e.each(t.points,function(t){t.hasValue()&&t.draw()})},this)}})}.call(this); diff --git a/reports/test_report.html b/reports/test_report.html index 9de5030..f3bde9b 100644 --- a/reports/test_report.html +++ b/reports/test_report.html @@ -13,12 +13,17 @@ + + + + + @@ -44,98 +49,100 @@
    -
    +
    - 1 scenarios failed of 2 +
    + +
    + 1 features failed of 4 + features +
    +
    +
    + +
    + 2 scenarios failed of 3 scenarios
    - 3 steps failed of 5 +
    + +
    + 4 steps failed of 7

    Suite: Default

    + +
    +
    +
    +

    Feature: Admin permissions

    -

    In order to perform admin tasks
    +

    +
    +

    In order to perform admin tasks
    As an administrator
    I need to have permissions on everything

    -
    -
    -

    Scenario: As an administrator I can add a node

    - api - javascript -
    -
    /Library/WebServer/Documents/cegeka/cdh-composer/features/generic/administrator_permissions.feature: 9
    -
    -
    - Given I am logged in as a user with the "administrator" role -
    -
    -
    - When I am on the homepage -
    +
    +
    +
    -
    -
    - Then I should see the text Logout -
    +
    +
    +
    +
    +
    +

    Feature: Main

    -
    -
    - Given I am logged in as a user with the "administrator" role -
    +
    +

    In order to acces the footer
    +As a visitor
    +I should see a footer

    -
    -
    - When I am on the homepage -
    +
    +
    +
    -
    -
    - Then I should see the text Login -
    +
    +
    +
    +
    +
    +

    Feature: Main

    -
    -
    - Given I am logged in as a user with the "administrator" role -
    +
    +

    In order to confirm the website basics are configured right
    +As a visitor
    +I see some basic things and be able to access the website

    -
    -
    - When I am on the homepage -
    +
    +
    +
    -
    -
    - Then I should see the text User -
    +
    +
    +
    +
    +
    +

    Feature: Pages

    -
    -

    Feature: Main

    -

    In order to confirm the website basics are configured right
    +

    +

    In order to use the website
    As a visitor
    -I see some basic things and be able to access the website

    -
    -
    -

    Scenario: Check the homepage

    - api -
    -
    /Library/WebServer/Documents/cegeka/cdh-composer/features/generic/main.feature: 8
    -
    -
    - Given I am on the homepage -
    +All pages should be accesible

    -
    -
    - Then I should get a "200" HTTP response -
    +
    +
    +
    -
    -
    +
    +
    +
    +
    @@ -144,5 +151,61 @@

    Scenario: Check the homepage

    + + diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index a6ae83e..7daa3cd 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -69,6 +69,16 @@ class BehatHTMLFormatter implements Formatter */ private $passedScenarios; + /** + * @var Feature[] + */ + private $failedFeatures; + + /** + * @var Feature[] + */ + private $passedFeatures; + /** * @var Step[] */ @@ -202,6 +212,11 @@ public function onBeforeFeatureTested(BeforeFeatureTested $event) public function onAfterFeatureTested(AfterFeatureTested $event) { $this->currentSuite->addFeature($this->currentFeature); + if ($this->currentFeature->allPassed()) { + $this->passedFeatures[] = $this->currentFeature; + } else { + $this->failedFeatures[] = $this->currentFeature; + } } /** @@ -225,8 +240,10 @@ public function onAfterScenarioTested(AfterScenarioTested $event) if ($scenarioPassed) { $this->passedScenarios[] = $this->currentScenario; + $this->currentFeature->addPassedScenario(); } else { $this->failedScenarios[] = $this->currentScenario; + $this->currentFeature->addFailedScenario(); } $this->currentScenario->setPassed($event->getTestResult()->isPassed()); @@ -307,6 +324,8 @@ public function createReport() 'passedScenarios' => $this->passedScenarios, 'failedSteps' => $this->failedSteps, 'passedSteps' => $this->passedSteps, + 'failedFeatures' => $this->failedFeatures, + 'passedFeatures' => $this->passedFeatures, ) ); diff --git a/src/Classes/Feature.php b/src/Classes/Feature.php index 38f0c68..f2c2120 100644 --- a/src/Classes/Feature.php +++ b/src/Classes/Feature.php @@ -15,6 +15,8 @@ class Feature private $description; private $tags; private $file; + private $failedScenarios = 0; + private $passedScenarios = 0; /** * @var Scenario[] @@ -105,4 +107,62 @@ public function addScenario($scenario) { $this->scenarios[] = $scenario; } + + /** + * @return mixed + */ + public function getFailedScenarios() + { + return $this->failedScenarios; + } + + /** + * @param mixed $failedScenarios + */ + public function setFailedScenarios($failedScenarios) + { + $this->failedScenarios = $failedScenarios; + } + + public function addFailedScenario($number = 1) + { + $this->failedScenarios++; + } + + /** + * @return mixed + */ + public function getPassedScenarios() + { + return $this->passedScenarios; + } + + /** + * @param mixed $passedScenarios + */ + public function setPassedScenarios($passedScenarios) + { + $this->passedScenarios = $passedScenarios; + } + + public function addPassedScenario($number = 1) + { + $this->passedScenarios++; + } + + public function allPassed() + { + if ($this->failedScenarios == 0) { + return true; + } + return false; + } + + public function getPassedClass() + { + if ($this->allPassed()) { + return "passed"; + } + return "failed"; + } } diff --git a/templates/index.backup.html.twig b/templates/index.backup.html.twig new file mode 100644 index 0000000..c3d1629 --- /dev/null +++ b/templates/index.backup.html.twig @@ -0,0 +1,98 @@ + + + + + + + Bootstrap 101 Template + + + + + + + + + + + + + + + + + +
    +
    +
    + {{ failedScenarios|length }} scenarios failed of {{ (failedScenarios|length) + (passedScenarios|length) }} + scenarios +
    +
    + {{ failedSteps|length }} steps failed of {{ (failedSteps|length) + (passedSteps|length) }} +
    +
    +
    + {% for suite in suites %} +
    +
    +

    Suite: {{ suite.name }}

    + {% for feature in suite.features %} +

    Feature: {{ feature.name }}

    + {% for tag in feature.tags %} + {{ tag }} + {% endfor %} +

    {{ feature.description|raw|nl2br }}

    + {% for scenario in feature.scenarios %} +
    +
    +

    Scenario: {{ scenario.name }}

    + {% for tag in scenario.tags %} + {{ tag }} + {% endfor %} +
    +
    {{ feature.file }}: {{ scenario.line }}
    + {% for step in scenario.steps %} +
    +
    + {{ step.keyword }} {{ step.text }} +
    +
    + {% endfor %} +
    + {% endfor %} + {% endfor %} +
    +
    +
    + {% endfor %} +
    + + + + + + + diff --git a/templates/index.html.twig b/templates/index.html.twig index c3d1629..9fa4696 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -13,12 +13,17 @@ + + + + + @@ -45,12 +50,25 @@
    -
    +
    +
    + +
    + {{ failedFeatures|length }} features failed of {{ (failedFeatures|length) + (passedFeatures|length) }} + features +
    +
    +
    + +
    {{ failedScenarios|length }} scenarios failed of {{ (failedScenarios|length) + (passedScenarios|length) }} scenarios
    +
    + +
    {{ failedSteps|length }} steps failed of {{ (failedSteps|length) + (passedSteps|length) }}
    @@ -59,31 +77,28 @@

    Suite: {{ suite.name }}

    - {% for feature in suite.features %} -

    Feature: {{ feature.name }}

    - {% for tag in feature.tags %} - {{ tag }} - {% endfor %} -

    {{ feature.description|raw|nl2br }}

    - {% for scenario in feature.scenarios %} -
    -
    -

    Scenario: {{ scenario.name }}

    - {% for tag in scenario.tags %} - {{ tag }} - {% endfor %} -
    -
    {{ feature.file }}: {{ scenario.line }}
    - {% for step in scenario.steps %} -
    -
    - {{ step.keyword }} {{ step.text }} + +
    + {% for feature in suite.features %} +
    +
    +
    +

    Feature: {{ feature.name }}

    +
    +
    +

    {{ feature.description|raw|nl2br }}

    +
    +
    +
    + {% for tag in feature.tags %} + {{ tag }} + {% endfor %}
    - {% endfor %} +
    {% endfor %} - {% endfor %} +
    @@ -94,5 +109,61 @@ + + From c6843bb8809aa2a1da92c754669a20c839ed0011 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Thu, 8 Jan 2015 12:49:05 +0100 Subject: [PATCH 11/55] Added percentages. --- assets/css/style.css | 25 ++++++++++++++++++++-- assets/css/style.less | 30 ++++++++++++++++++++++++-- reports/test_report.html | 44 +++++++++++++++++++++++++++++++++++++++ src/Classes/Feature.php | 15 +++++++++++++ templates/index.html.twig | 11 ++++++++++ 5 files changed, 121 insertions(+), 4 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index 8aa5177..50727ea 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -12,11 +12,14 @@ body { width: 100%; box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1); } +.card:hover { + cursor: pointer; +} .card.passed .header { background-color: #00a65a; } .card.failed .header { - background-color: red; + background-color: #F56956; } .card .header { color: #fff; @@ -59,5 +62,23 @@ body { border-bottom-left-radius: 3px; padding: 10px; background-color: #ffffff; - height: 30px; +} +.card .footer .progress { + margin-bottom: 0px; +} +.progress { + height: 20px; + overflow: hidden; + background-color: #f5f5f5; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); +} +.progress .progress-bar-green { + background-color: #00a65a !important; + background-image: none !important; +} +.progress .progress-bar-red { + background-color: #f56954 !important; + background-image: none !important; } diff --git a/assets/css/style.less b/assets/css/style.less index 22327e0..0e4f0c1 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -13,6 +13,10 @@ body { width: 100%; box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1); + &:hover { + cursor: pointer; + } + &.passed { .header { background-color: #00a65a; @@ -21,7 +25,7 @@ body { &.failed { .header { - background-color: red; + background-color: #F56956; } } @@ -68,7 +72,29 @@ body { border-bottom-left-radius: 3px; padding: 10px; background-color: #ffffff; - height: 30px; + + .progress { + margin-bottom: 0px; + } + } + +} + +.progress { + height: 20px; + overflow: hidden; + background-color: #f5f5f5; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); + + .progress-bar-green { + background-color: #00a65a !important; + background-image: none !important; } + .progress-bar-red { + background-color: #f56954 !important; + background-image: none !important; + } } diff --git a/reports/test_report.html b/reports/test_report.html index f3bde9b..2fa46c5 100644 --- a/reports/test_report.html +++ b/reports/test_report.html @@ -90,6 +90,17 @@

    Feature: Admin permissions

    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    @@ -106,6 +117,17 @@

    Feature: Main

    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    @@ -122,6 +144,17 @@

    Feature: Main

    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    @@ -138,6 +171,17 @@

    Feature: Pages

    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    diff --git a/src/Classes/Feature.php b/src/Classes/Feature.php index f2c2120..3495768 100644 --- a/src/Classes/Feature.php +++ b/src/Classes/Feature.php @@ -165,4 +165,19 @@ public function getPassedClass() } return "failed"; } + + public function getPercentPassed() + { + return ($this->getPassedScenarios() / ($this->getTotalAmountOfScenarios())) * 100; + } + + public function getPercentFailed() + { + return ($this->getPassedScenarios() / ($this->getTotalAmountOfScenarios())) * 100; + } + + public function getTotalAmountOfScenarios() + { + return $this->getPassedScenarios() + $this->getFailedScenarios(); + } } diff --git a/templates/index.html.twig b/templates/index.html.twig index 9fa4696..27fcbcc 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -94,6 +94,17 @@ {{ tag }} {% endfor %}
    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    From edc8cb4698b525e5c12e956d9a902e2b665335bf Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Thu, 8 Jan 2015 13:57:02 +0100 Subject: [PATCH 12/55] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 06ccc35..fa0bc43 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,5 @@ To be done: 3. Add bootstrap as dependency 4. clean up html report 5. ... +6. + From 93c824e3ac21ec2bf4502505463c750b8fe32c56 Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Thu, 8 Jan 2015 13:57:56 +0100 Subject: [PATCH 13/55] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa0bc43..d2beea1 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ To be done: 4. clean up html report 5. ... 6. - + From 05afe73aca8d41f7829a230f2fc68f6737a0203b Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Thu, 8 Jan 2015 14:25:50 +0100 Subject: [PATCH 14/55] Creating detail view. --- assets/css/style.css | 1 + assets/css/style.less | 2 ++ reports/test_report.html | 40 ++++++++++++++++++++++++++++++++------- templates/index.html.twig | 28 ++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 8 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index 50727ea..36d50ce 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -1,3 +1,4 @@ +@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700); body { background-color: #f9f9f9; font-family: 'Source Sans Pro', sans-serif; diff --git a/assets/css/style.less b/assets/css/style.less index 0e4f0c1..4426ad2 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -1,3 +1,5 @@ +@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700); + body { background-color: #f9f9f9; font-family: 'Source Sans Pro', sans-serif; diff --git a/reports/test_report.html b/reports/test_report.html index 2fa46c5..22848ea 100644 --- a/reports/test_report.html +++ b/reports/test_report.html @@ -4,7 +4,7 @@ - Bootstrap 101 Template + Behat Tests @@ -61,16 +61,22 @@
    - 2 scenarios failed of 3 + 3 scenarios failed of 4 scenarios
    - 4 steps failed of 7 + 5 steps failed of 8
    +
    +
    + All + Passed + Failed +
    @@ -147,11 +153,11 @@

    Feature: Main

    + style="width: 33.333333333333%"> 40% Complete (success)
    + style="width: 33.333333333333%"> 40% Complete (success)
    @@ -214,7 +220,7 @@

    Feature: Pages

    var scenarioData = [ { - value: 2, + value: 3, color: "#F7464A", highlight: "#FF5A5E", label: "Failed" @@ -229,7 +235,7 @@

    Feature: Pages

    var stepData = [ { - value: 4, + value: 5, color: "#F7464A", highlight: "#FF5A5E", label: "Failed" @@ -251,5 +257,25 @@

    Feature: Pages

    new Chart(stepChart).Doughnut(stepData); }; + diff --git a/templates/index.html.twig b/templates/index.html.twig index 27fcbcc..b75082b 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -4,7 +4,7 @@ - Bootstrap 101 Template + Behat Tests @@ -73,6 +73,12 @@
    +
    + All + Passed + Failed +
    +
    {% for suite in suites %}
    @@ -176,5 +182,25 @@ new Chart(stepChart).Doughnut(stepData); }; + From 26f485c3cca9612db72c90e9cc50ece5bba77b6a Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Thu, 8 Jan 2015 14:28:21 +0100 Subject: [PATCH 15/55] Refactoring. --- src/BehatHTMLFormatter.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index 7daa3cd..9efb4d9 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -98,6 +98,7 @@ function __construct($name) $this->name = $name; } + // /** * Returns an array of event names this subscriber wants to listen to. * @@ -172,7 +173,9 @@ public function getParameter($name) { return $this->parameters[$name]; } + // + // public function onBeforeExercise(BeforeExerciseCompleted $event) { } @@ -309,7 +312,9 @@ public function onAfterStepTested(AfterStepTested $event) $this->currentScenario->addStep($step); } + // + // public function createReport() { $templatePath = dirname(__FILE__) . '/../templates'; @@ -340,4 +345,5 @@ public function printText($text) { file_put_contents('php://stdout', $text); } + // } From 5ba56f5393fcdf6878d1be816a8da72ff46cd16c Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Thu, 8 Jan 2015 15:01:30 +0100 Subject: [PATCH 16/55] Added detail view. --- reports/test_report.html | 249 ++++++++++++++++++++++++------------- src/BehatHTMLFormatter.php | 2 + src/Classes/Feature.php | 2 +- templates/index.html.twig | 78 +++++++----- 4 files changed, 216 insertions(+), 115 deletions(-) diff --git a/reports/test_report.html b/reports/test_report.html index 22848ea..af91f54 100644 --- a/reports/test_report.html +++ b/reports/test_report.html @@ -54,7 +54,7 @@
    - 1 features failed of 4 + 2 features failed of 4 features
    @@ -83,113 +83,183 @@

    Suite: Default

    -
    -
    -
    -

    Feature: Admin permissions

    -
    -
    -

    In order to perform admin tasks
    +

    +
    +
    +
    +

    Feature: Admin permissions

    +
    +
    +

    In order to perform admin tasks
    As an administrator
    I need to have permissions on everything

    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    - 40% Complete (success) -
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to acces the footer
    +

    +
    +
    +
    +

    Feature: Main

    +
    +
    +

    In order to acces the footer
    As a visitor
    I should see a footer

    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    - 40% Complete (success) -
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to confirm the website basics are configured right
    +

    +
    +
    +
    +

    Feature: Main

    +
    +
    +

    In order to confirm the website basics are configured right
    As a visitor
    I see some basic things and be able to access the website

    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    - 40% Complete (success) -
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    -
    -
    -
    -

    Feature: Pages

    -
    -
    -

    In order to use the website
    +

    +
    +
    +
    +

    Feature: Pages

    +
    +
    +

    In order to use the website
    As a visitor
    All pages should be accesible

    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    - 40% Complete (success) -
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    @@ -205,13 +275,13 @@

    Feature: Pages

    diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index 9efb4d9..0bdc832 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -274,8 +274,10 @@ public function onAfterOutlineTested(AfterOutlineTested $event) if ($scenarioPassed) { $this->passedScenarios[] = $this->currentScenario; + $this->currentFeature->addPassedScenario(); } else { $this->failedScenarios[] = $this->currentScenario; + $this->currentFeature->addFailedScenario(); } $this->currentScenario->setPassed($event->getTestResult()->isPassed()); diff --git a/src/Classes/Feature.php b/src/Classes/Feature.php index 3495768..28d6532 100644 --- a/src/Classes/Feature.php +++ b/src/Classes/Feature.php @@ -173,7 +173,7 @@ public function getPercentPassed() public function getPercentFailed() { - return ($this->getPassedScenarios() / ($this->getTotalAmountOfScenarios())) * 100; + return ($this->getFailedScenarios() / ($this->getTotalAmountOfScenarios())) * 100; } public function getTotalAmountOfScenarios() diff --git a/templates/index.html.twig b/templates/index.html.twig index b75082b..e9b1972 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -86,33 +86,48 @@
    {% for feature in suite.features %} -
    -
    -
    -

    Feature: {{ feature.name }}

    -
    -
    -

    {{ feature.description|raw|nl2br }}

    -
    -
    -
    - {% for tag in feature.tags %} - {{ tag }} - {% endfor %} +
    +
    +
    +
    +

    Feature: {{ feature.name }}

    -
    - -
    - 40% Complete (success) +
    +

    {{ feature.description|raw|nl2br }}

    +
    +
    +
    + {% for tag in feature.tags %} + {{ tag }} + {% endfor %}
    -
    - 40% Complete (success) +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    {% endfor %}
    @@ -185,20 +200,27 @@ From 1c7ebb6a98aa20b08629bef659325ff627a9a362 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Thu, 8 Jan 2015 16:39:36 +0100 Subject: [PATCH 17/55] Created Detail page. --- assets/css/style.css | 9 + assets/css/style.less | 14 + reports/test_report.html | 599 ++++++++++++++++++++++++++++--------- src/BehatHTMLFormatter.php | 6 + src/Classes/Feature.php | 24 ++ templates/index.html.twig | 144 ++++++--- 6 files changed, 616 insertions(+), 180 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index 36d50ce..a92d24d 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -83,3 +83,12 @@ body { background-color: #f56954 !important; background-image: none !important; } +#scenario-overview { + display: none; +} +#scenario-overview .feature { + display: none; +} +#scenario-overview .feature.selected { + display: block; +} diff --git a/assets/css/style.less b/assets/css/style.less index 4426ad2..629f553 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -100,3 +100,17 @@ body { background-image: none !important; } } + +#feature-overview { +} + +#scenario-overview { + display: none; + + .feature { + display: none; + &.selected { + display: block; + } + } +} diff --git a/reports/test_report.html b/reports/test_report.html index af91f54..34498b1 100644 --- a/reports/test_report.html +++ b/reports/test_report.html @@ -54,21 +54,21 @@
    - 2 features failed of 4 + 4 features failed of 8 features
    - 3 scenarios failed of 4 + 5 scenarios failed of 7 scenarios
    - 5 steps failed of 8 + 9 steps failed of 15
    @@ -78,13 +78,13 @@ Failed
    -
    -
    -

    Suite: Default

    +
    +
    +
    +

    Suite: Generic

    -
    -
    -
    +
    +

    Feature: Admin permissions

    @@ -97,55 +97,21 @@

    Feature: Admin permissions

    -
    +
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    -
    - 40% Complete (success) -
    -
    -
    +
    - -
    -
    -
    +

    Feature: Main

    @@ -158,25 +124,105 @@

    Feature: Main

    -
    +
    +
    +
    +
    +
    +
    +

    Feature: Main

    +
    +
    +

    In order to confirm the website basics are configured right
    +As a visitor
    +I see some basic things and be able to access the website

    +
    +
    +
    +
    +
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    -
    - 40% Complete (success) +
    +
    +
    +
    +
    +
    +

    Feature: Pages

    +
    +
    +

    In order to use the website
    +As a visitor
    +All pages should be accesible

    +
    +
    +
    +
    +
    +
    +
    -
    +
    +
    +
    +
    +
    +

    Suite: Project

    + +
    +
    +
    +
    +

    Feature: Admin permissions

    +
    +
    +

    In order to perform admin tasks
    +As an administrator
    +I need to have permissions on everything

    +
    +
    +
    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    +
    - -
    -
    -
    +
    +
    +
    +

    Feature: Main

    +
    +
    +

    In order to acces the footer
    +As a visitor
    +I should see a footer

    +
    +
    +
    +
    +
    +
    +
    +

    Feature: Main

    @@ -189,49 +235,21 @@

    Feature: Main

    -
    +
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    -
    - 40% Complete (success) -
    -
    -
    +
    - -
    -
    -
    +

    Feature: Pages

    @@ -244,28 +262,321 @@

    Feature: Pages

    -
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Feature: Admin permissions

    +
    +
    +

    In order to perform admin tasks
    +As an administrator
    +I need to have permissions on everything

    +
    +
    +
    +
    +
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    +
    +
    +
    +
    +

    Scenario: As an administrator I can add a node

    + api + javascript +
    + Given I am logged in as a user with the "administrator" role +
    +
    + When I am on the homepage +
    +
    + Then I should see the text Logout +
    +
    + Given I am logged in as a user with the "administrator" role +
    +
    + When I am on the homepage +
    +
    + Then I should see the text Login +
    +
    + Given I am logged in as a user with the "administrator" role +
    +
    + When I am on the homepage +
    +
    + Then I should see the text User +
    +
    +
    +
    +
    +
    +
    +

    Feature: Main

    +
    +
    +

    In order to acces the footer
    +As a visitor
    +I should see a footer

    +
    +
    +
    +
    +
    +
    +
    +
    -
    - 40% Complete (success) +
    +
    +
    +
    +
    +

    Feature: Main

    +
    +
    +

    In order to confirm the website basics are configured right
    +As a visitor
    +I see some basic things and be able to access the website

    +
    +
    +
    +
    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    +
    +
    +
    +
    +
    +

    Scenario: Check the homepage

    + api +
    + Given I am on the homepage +
    +
    + Then I should get a "200" HTTP response +
    +

    Scenario: Check the 404 page

    + api +
    + Given I am at "/404" +
    +
    + Then I should get a "404" HTTP response +
    +

    Scenario: Check the 500 page

    + api +
    + Given I am at "/500" +
    +
    + Then I should get a "500" HTTP response +
    +
    +
    +
    +
    +
    +
    +

    Feature: Pages

    +
    +
    +

    In order to use the website
    +As a visitor
    +All pages should be accesible

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Feature: Admin permissions

    +
    +
    +

    In order to perform admin tasks
    +As an administrator
    +I need to have permissions on everything

    +
    +
    +
    +
    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success)
    +
    +
    +
    +
    +

    Scenario: As an administrator I can add a node

    + api + javascript +
    + Given I am logged in as a user with the "administrator" role +
    +
    + When I am on the homepage +
    +
    + Then I should see the text Logout +
    +
    + Given I am logged in as a user with the "administrator" role +
    +
    + When I am on the homepage
    +
    + Then I should see the text Login +
    +
    + Given I am logged in as a user with the "administrator" role +
    +
    + When I am on the homepage +
    +
    + Then I should see the text User +
    +
    +
    +
    +
    +
    +
    +

    Feature: Main

    +
    +
    +

    In order to acces the footer
    +As a visitor
    +I should see a footer

    - +
    +
    +
    +
    +
    +
    +
    +
    +

    Feature: Main

    +
    +
    +

    In order to confirm the website basics are configured right
    +As a visitor
    +I see some basic things and be able to access the website

    +
    +
    +
    +
    +
    + +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    -
    -
    -
    -
    +
    +
    +
    +
    +

    Scenario: Check the homepage

    + api +
    + Given I am on the homepage +
    +
    + Then I should get a "200" HTTP response +
    +

    Scenario: Check the 404 page

    + api +
    + Given I am at "/404" +
    +
    + Then I should get a "404" HTTP response +
    +
    +
    +
    +
    +
    +
    +

    Feature: Pages

    +
    +
    +

    In order to use the website
    +As a visitor
    +All pages should be accesible

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    @@ -275,13 +586,13 @@

    Feature: Pages

    diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index 0bdc832..ef5c85d 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -48,6 +48,10 @@ class BehatHTMLFormatter implements Formatter */ private $currentSuite; + /** + * @var int + */ + private $featureCounter = 1; /** * @var Feature */ @@ -202,6 +206,8 @@ public function onAfterSuiteTested(AfterSuiteTested $event) public function onBeforeFeatureTested(BeforeFeatureTested $event) { $feature = new Feature(); + $feature->setId($this->featureCounter); + $this->featureCounter++; $feature->setName($event->getFeature()->getTitle()); $feature->setDescription($event->getFeature()->getDescription()); $feature->setTags($event->getFeature()->getTags()); diff --git a/src/Classes/Feature.php b/src/Classes/Feature.php index 28d6532..da03488 100644 --- a/src/Classes/Feature.php +++ b/src/Classes/Feature.php @@ -11,6 +11,8 @@ class Feature { + // + private $id; private $name; private $description; private $tags; @@ -22,7 +24,9 @@ class Feature * @var Scenario[] */ private $scenarios; + // + // /** * @return mixed */ @@ -150,6 +154,25 @@ public function addPassedScenario($number = 1) $this->passedScenarios++; } + /** + * @return mixed + */ + public function getId() + { + return $this->id; + } + + /** + * @param mixed $id + */ + public function setId($id) + { + $this->id = $id; + } + + // + + // public function allPassed() { if ($this->failedScenarios == 0) { @@ -180,4 +203,5 @@ public function getTotalAmountOfScenarios() { return $this->getPassedScenarios() + $this->getFailedScenarios(); } + // } diff --git a/templates/index.html.twig b/templates/index.html.twig index e9b1972..4f8392f 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -79,15 +79,15 @@ Failed
    - {% for suite in suites %} -
    -
    -

    Suite: {{ suite.name }}

    - -
    - {% for feature in suite.features %} -
    -
    +
    + {% for suite in suites %} +
    +
    +

    Suite: {{ suite.name }}

    + +
    + {% for feature in suite.features %} +

    Feature: {{ feature.name }}

    @@ -101,40 +101,80 @@ {{ tag }} {% endfor %}
    -
    + {% if feature.getTotalAmountOfScenarios > 0 %} +
    -
    - 40% Complete (success) -
    -
    - 40% Complete (success) +
    + 40% Complete (success) +
    +
    + 40% Complete (success) +
    -
    + {% endif %}
    - +
    +
    +
    + {% endfor %} +
    +
    + {% for suite in suites %} + {% for feature in suite.features %} +
    +
    +
    +
    +

    Feature: {{ feature.name }}

    +
    +
    +

    {{ feature.description|raw|nl2br }}

    +
    +
    +
    + {% for tag in feature.tags %} {{ tag }} {% endfor %} - {% for step in scenario.steps %} -
    - {{ step.keyword }} {{ step.text }} +
    + {% if feature.getTotalAmountOfScenarios > 0 %} +
    + +
    + 40% Complete (success)
    - {% endfor %} - {% endfor %} +
    + 40% Complete (success) +
    +
    + {% endif %}
    - {% endfor %} +
    +
    + {% for scenario in feature.scenarios %} +

    Scenario: {{ scenario.name }}

    + {% for tag in scenario.tags %} + {{ tag }} + {% endfor %} + {% for step in scenario.steps %} +
    + {{ step.keyword }} {{ step.text }} +
    + {% endfor %} + {% endfor %} +
    -
    -
    -
    - {% endfor %} + {% endfor %} + {% endfor %} +
    @@ -198,29 +238,45 @@ }; From 299d46a0c6a3d421e3486567bb253fa498da4820 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Fri, 9 Jan 2015 12:01:09 +0100 Subject: [PATCH 18/55] Refactored detail view. --- assets/css/callout.css | 56 ++++++ assets/css/callout.less | 56 ++++++ assets/css/style.css | 70 +++++++- assets/css/style.less | 29 +++- reports/test_report.html | 354 ++++++++++++++++++++++++++------------ src/Classes/Feature.php | 6 + src/Classes/Scenario.php | 20 +++ templates/index.html.twig | 45 +++-- 8 files changed, 515 insertions(+), 121 deletions(-) create mode 100644 assets/css/callout.css create mode 100644 assets/css/callout.less diff --git a/assets/css/callout.css b/assets/css/callout.css new file mode 100644 index 0000000..7a1a2f7 --- /dev/null +++ b/assets/css/callout.css @@ -0,0 +1,56 @@ +.bs-callout { + padding: 20px; + margin: 20px 0; + border: 1px solid #eee; + border-left-width: 5px; + border-radius: 3px; +} +.bs-callout h4 { + margin-top: 0; + margin-bottom: 5px; +} +.bs-callout p:last-child { + margin-bottom: 0; +} +.bs-callout code { + border-radius: 3px; +} +.bs-callout + .bs-callout { + margin-top: -5px; +} +.bs-callout-default { + border-left-color: #777; +} +.bs-callout-default h4 { + color: #777; +} +.bs-callout-primary { + border-left-color: #428bca; +} +.bs-callout-primary h4 { + color: #428bca; +} +.bs-callout-success { + border-left-color: #5cb85c; +} +.bs-callout-success h4 { + color: #5cb85c; +} +.bs-callout-danger { + border-left-color: #d9534f; +} +.bs-callout-danger h4 { + color: #d9534f; +} +.bs-callout-warning { + border-left-color: #f0ad4e; +} +.bs-callout-warning h4 { + color: #f0ad4e; +} +.bs-callout-info { + border-left-color: #5bc0de; +} +.bs-callout-info h4 { + color: #5bc0de; +} diff --git a/assets/css/callout.less b/assets/css/callout.less new file mode 100644 index 0000000..4235399 --- /dev/null +++ b/assets/css/callout.less @@ -0,0 +1,56 @@ +.bs-callout { + padding: 20px; + margin: 20px 0; + border: 1px solid #eee; + border-left-width: 5px; + border-radius: 3px; +} +.bs-callout h4 { + margin-top: 0; + margin-bottom: 5px; +} +.bs-callout p:last-child { + margin-bottom: 0; +} +.bs-callout code { + border-radius: 3px; +} +.bs-callout+.bs-callout { + margin-top: -5px; +} +.bs-callout-default { + border-left-color: #777; +} +.bs-callout-default h4 { + color: #777; +} +.bs-callout-primary { + border-left-color: #428bca; +} +.bs-callout-primary h4 { + color: #428bca; +} +.bs-callout-success { + border-left-color: #5cb85c; +} +.bs-callout-success h4 { + color: #5cb85c; +} +.bs-callout-danger { + border-left-color: #d9534f; +} +.bs-callout-danger h4 { + color: #d9534f; +} +.bs-callout-warning { + border-left-color: #f0ad4e; +} +.bs-callout-warning h4 { + color: #f0ad4e; +} +.bs-callout-info { + border-left-color: #5bc0de; +} +.bs-callout-info h4 { + color: #5bc0de; +} diff --git a/assets/css/style.css b/assets/css/style.css index a92d24d..8436a27 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -1,4 +1,60 @@ @import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700); +.bs-callout { + padding: 20px; + margin: 20px 0; + border: 1px solid #eee; + border-left-width: 5px; + border-radius: 3px; +} +.bs-callout h4 { + margin-top: 0; + margin-bottom: 5px; +} +.bs-callout p:last-child { + margin-bottom: 0; +} +.bs-callout code { + border-radius: 3px; +} +.bs-callout + .bs-callout { + margin-top: -5px; +} +.bs-callout-default { + border-left-color: #777; +} +.bs-callout-default h4 { + color: #777; +} +.bs-callout-primary { + border-left-color: #428bca; +} +.bs-callout-primary h4 { + color: #428bca; +} +.bs-callout-success { + border-left-color: #5cb85c; +} +.bs-callout-success h4 { + color: #5cb85c; +} +.bs-callout-danger { + border-left-color: #d9534f; +} +.bs-callout-danger h4 { + color: #d9534f; +} +.bs-callout-warning { + border-left-color: #f0ad4e; +} +.bs-callout-warning h4 { + color: #f0ad4e; +} +.bs-callout-info { + border-left-color: #5bc0de; +} +.bs-callout-info h4 { + color: #5bc0de; +} body { background-color: #f9f9f9; font-family: 'Source Sans Pro', sans-serif; @@ -20,7 +76,7 @@ body { background-color: #00a65a; } .card.failed .header { - background-color: #F56956; + background-color: #f56956; } .card .header { color: #fff; @@ -76,7 +132,7 @@ body { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } .progress .progress-bar-green { - background-color: #00a65a !important; + background-color: #f56956 !important; background-image: none !important; } .progress .progress-bar-red { @@ -92,3 +148,13 @@ body { #scenario-overview .feature.selected { display: block; } +#scenario-overview .feature .details .panel.passed > .panel-heading { + color: white; + background-color: #00a65a; + background-image: none; +} +#scenario-overview .feature .details .panel.failed > .panel-heading { + color: white; + background-color: #f56956; + background-image: none; +} diff --git a/assets/css/style.less b/assets/css/style.less index 629f553..f620138 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -1,4 +1,8 @@ @import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700); +@import "callout.less"; + +@color-failed: #F56956; +@color-passed: #00a65a; body { background-color: #f9f9f9; @@ -21,13 +25,13 @@ body { &.passed { .header { - background-color: #00a65a; + background-color: @color-passed; } } &.failed { .header { - background-color: #F56956; + background-color: @color-failed; } } @@ -91,7 +95,7 @@ body { box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); .progress-bar-green { - background-color: #00a65a !important; + background-color: @color-failed !important; background-image: none !important; } @@ -112,5 +116,24 @@ body { &.selected { display: block; } + + .details { + .panel { + &.passed { + > .panel-heading { + color: white; + background-color: @color-passed; + background-image: none; + } + } + &.failed { + > .panel-heading { + color: white; + background-color: @color-failed; + background-image: none; + } + } + } + } } } diff --git a/reports/test_report.html b/reports/test_report.html index 34498b1..24f0471 100644 --- a/reports/test_report.html +++ b/reports/test_report.html @@ -270,7 +270,7 @@

    Feature: Pages

    -
    +
    @@ -299,38 +299,58 @@

    Feature: Admin permissions

    -
    -

    Scenario: As an administrator I can add a node

    - api - javascript -
    - Given I am logged in as a user with the "administrator" role -
    -
    - When I am on the homepage -
    -
    - Then I should see the text Logout -
    -
    - Given I am logged in as a user with the "administrator" role -
    -
    - When I am on the homepage -
    -
    - Then I should see the text Login -
    -
    - Given I am logged in as a user with the "administrator" role -
    -
    - When I am on the homepage -
    -
    - Then I should see the text User +
    +
    + +
    +
      +
    • + Given I am logged in as a user with the "administrator" role +
      • +
    • + When I am on the homepage +
      • +
    • + Then I should see the text Logout +
      • +
    • + Given I am logged in as a user with the "administrator" role +
      • +
    • + When I am on the homepage +
      • +
    • + Then I should see the text Login +
      • +
    • + Given I am logged in as a user with the "administrator" role +
      • +
    • + When I am on the homepage +
      • +
    • + Then I should see the text User +
      • +
    -
    +
    +
    @@ -349,7 +369,7 @@

    Feature: Main

    -
    +
    @@ -380,32 +400,92 @@

    Feature: Main

    -
    -

    Scenario: Check the homepage

    - api -
    - Given I am on the homepage -
    -
    - Then I should get a "200" HTTP response -
    -

    Scenario: Check the 404 page

    - api -
    - Given I am at "/404" -
    -
    - Then I should get a "404" HTTP response +
    +
    + +
    +
      +
    • + Given I am on the homepage +
      • +
    • + Then I should get a "200" HTTP response +
      • +
    -

    Scenario: Check the 500 page

    - api -
    - Given I am at "/500" +
    +
    + +
    +
      +
    • + Given I am at "/404" +
      • +
    • + Then I should get a "404" HTTP response +
      • +
    -
    - Then I should get a "500" HTTP response +
    +
    + +
    +
      +
    • + Given I am at "/500" +
      • +
    • + Then I should get a "500" HTTP response +
      • +
    -
    +
    +
    @@ -424,7 +504,7 @@

    Feature: Pages

    -
    +
    @@ -455,38 +535,58 @@

    Feature: Admin permissions

    -
    -

    Scenario: As an administrator I can add a node

    - api - javascript -
    - Given I am logged in as a user with the "administrator" role -
    -
    - When I am on the homepage -
    -
    - Then I should see the text Logout -
    -
    - Given I am logged in as a user with the "administrator" role -
    -
    - When I am on the homepage -
    -
    - Then I should see the text Login -
    -
    - Given I am logged in as a user with the "administrator" role -
    -
    - When I am on the homepage -
    -
    - Then I should see the text User +
    +
    + +
    +
      +
    • + Given I am logged in as a user with the "administrator" role +
      • +
    • + When I am on the homepage +
      • +
    • + Then I should see the text Logout +
      • +
    • + Given I am logged in as a user with the "administrator" role +
      • +
    • + When I am on the homepage +
      • +
    • + Then I should see the text Login +
      • +
    • + Given I am logged in as a user with the "administrator" role +
      • +
    • + When I am on the homepage +
      • +
    • + Then I should see the text User +
      • +
    -
    +
    +
    @@ -505,7 +605,7 @@

    Feature: Main

    -
    +
    @@ -536,24 +636,64 @@

    Feature: Main

    -
    -

    Scenario: Check the homepage

    - api -
    - Given I am on the homepage -
    -
    - Then I should get a "200" HTTP response -
    -

    Scenario: Check the 404 page

    - api -
    - Given I am at "/404" +
    +
    + +
    +
      +
    • + Given I am on the homepage +
      • +
    • + Then I should get a "200" HTTP response +
      • +
    -
    - Then I should get a "404" HTTP response +
    +
    + +
    +
      +
    • + Given I am at "/404" +
      • +
    • + Then I should get a "404" HTTP response +
      • +
    -
    +
    +
    @@ -572,7 +712,7 @@

    Feature: Pages

    -
    +
    @@ -652,6 +792,8 @@

    Feature: Pages

    $("#scenario-overview .feature[data-id='" + featureId + "']").show(); } $(function () { + $('.collapse').collapse(); + $('.filters').click() { showOverview(); diff --git a/src/Classes/Feature.php b/src/Classes/Feature.php index da03488..54c608e 100644 --- a/src/Classes/Feature.php +++ b/src/Classes/Feature.php @@ -19,6 +19,7 @@ class Feature private $file; private $failedScenarios = 0; private $passedScenarios = 0; + private $scenarioCounter = 1; /** * @var Scenario[] @@ -107,8 +108,13 @@ public function setScenarios($scenarios) $this->scenarios = $scenarios; } + /** + * @param $scenario Scenario + */ public function addScenario($scenario) { + $scenario->setId($this->scenarioCounter); + $this->scenarioCounter++; $this->scenarios[] = $scenario; } diff --git a/src/Classes/Scenario.php b/src/Classes/Scenario.php index 82047e1..35cb071 100644 --- a/src/Classes/Scenario.php +++ b/src/Classes/Scenario.php @@ -11,6 +11,10 @@ class Scenario { + /** + * @var int + */ + private $id; private $name; private $line; private $tags; @@ -112,4 +116,20 @@ public function addStep($step) { $this->steps[] = $step; } + + /** + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * @param int $id + */ + public function setId($id) + { + $this->id = $id; + } } diff --git a/templates/index.html.twig b/templates/index.html.twig index 4f8392f..ab30505 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -124,7 +124,7 @@
    {% endfor %}
    -
    +
    {% for suite in suites %} {% for feature in suite.features %}
    @@ -158,17 +158,40 @@
    -
    +
    {% for scenario in feature.scenarios %} -

    Scenario: {{ scenario.name }}

    - {% for tag in scenario.tags %} - {{ tag }} - {% endfor %} - {% for step in scenario.steps %} -
    - {{ step.keyword }} {{ step.text }} +
    + - {% endfor %} +
    +
      + {% for step in scenario.steps %} +
    • + {{ step.keyword }} {{ step.text }} +
      • + {#
      #} + {#{{ step.keyword }} {{ step.text }}#} + {#
      #} + {% endfor %} +
    +
    +
    {% endfor %}
    @@ -251,6 +274,8 @@ $("#scenario-overview .feature[data-id='" + featureId + "']").show(); } $(function () { + $('.collapse').collapse(); + $('.filters').click() { showOverview(); From 282ae459b18a7da82989a99f171994fca564c924 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Fri, 9 Jan 2015 12:02:56 +0100 Subject: [PATCH 19/55] Fixed stylesheet passed bar color. --- assets/css/style.css | 2 +- assets/css/style.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index 8436a27..cb10216 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -132,7 +132,7 @@ body { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } .progress .progress-bar-green { - background-color: #f56956 !important; + background-color: #00a65a !important; background-image: none !important; } .progress .progress-bar-red { diff --git a/assets/css/style.less b/assets/css/style.less index f620138..f4e4090 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -95,7 +95,7 @@ body { box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); .progress-bar-green { - background-color: @color-failed !important; + background-color: @color-passed !important; background-image: none !important; } From 204623c1bd2517642c1ee85b6021e9f012889103 Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Fri, 9 Jan 2015 13:42:20 +0100 Subject: [PATCH 20/55] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d2beea1..4bb7ad2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ BehatHtmlFormatterPlugin ======================== +Suggestions are more than welcome !!! + This is a behat plugin to generate HTML reports Add this to your behat.yml file From 78647869010ca9d4b9e061d1566387f0e18d81ba Mon Sep 17 00:00:00 2001 From: David Raison Date: Sat, 10 Jan 2015 16:35:39 +0100 Subject: [PATCH 21/55] Add support for an output parameter to influence where the report html file will be written --- README.md | 10 +++-- src/BehatHTMLFormatter.php | 57 +++++++++++++++++++++++------ src/BehatHTMLFormatterExtension.php | 7 +++- 3 files changed, 58 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4bb7ad2..dd52bd7 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,24 @@ BehatHtmlFormatterPlugin ======================== -Suggestions are more than welcome !!! +Suggestions are more than welcome ! -This is a behat plugin to generate HTML reports +This is a behat 3 extension to generate HTML reports from your test results. -Add this to your behat.yml file +Add this to your behat.yml file: 
     formatters:
     html: true
+    output: build/html/behat
   extensions:
     emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension:
         name: html
    +The *output* parameter is relative to %paths.base% and, when omitted, will default to that same path. + + To be done: ======================== diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index ef5c85d..c03c2f9 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -1,4 +1,6 @@ - /** * @var array */ private $parameters; + /** * @var */ private $name; + /** + * @param $output where to save the generated report file + */ + private $output; + + + /** + * @param $base_path Behat base path + */ + private $base_path; + /** * @var Array */ @@ -92,17 +105,17 @@ class BehatHTMLFormatter implements Formatter * @var Step[] */ private $passedSteps; - // /** * @param string $name formatter name */ - function __construct($name) + function __construct($name, $base_path, $output) { $this->name = $name; + $this->base_path = $base_path; + $this->output = $this->setOutputPath($output); } - // /** * Returns an array of event names this subscriber wants to listen to. * @@ -177,9 +190,27 @@ public function getParameter($name) { return $this->parameters[$name]; } - // - // + /** + * Verify that the specified output path exists or can be created. + * + * @param String $path Output path relative to %paths.base% + */ + public function setOutputPath($path) + { + $outpath = realpath($this->base_path . DIRECTORY_SEPARATOR . $path); + if (!file_exists($outpath)) { + if (!mkdir($outpath, 0755, true)) + throw new \Exception( + sprintf( + 'Output path %s does not exist and could not be created!', + $outpath + ) + ); + } + return $outpath; + } + public function onBeforeExercise(BeforeExerciseCompleted $event) { } @@ -320,13 +351,16 @@ public function onAfterStepTested(AfterStepTested $event) $this->currentScenario->addStep($step); } - // - - // + /** + * Generate the final html output file from the tests results + * and save it to the location specified in $output + * + * @return void + */ public function createReport() { $templatePath = dirname(__FILE__) . '/../templates'; - $reportPath = dirname(__FILE__) . '/../reports'; + $reportPath = $this->output; $loader = new Twig_Loader_Filesystem($templatePath); $twig = new Twig_Environment($loader, array()); @@ -353,5 +387,4 @@ public function printText($text) { file_put_contents('php://stdout', $text); } - // } diff --git a/src/BehatHTMLFormatterExtension.php b/src/BehatHTMLFormatterExtension.php index a79c296..adc6d4f 100644 --- a/src/BehatHTMLFormatterExtension.php +++ b/src/BehatHTMLFormatterExtension.php @@ -1,4 +1,6 @@ -children()->scalarNode("name")->defaultValue("emusehtml"); + $builder->children()->scalarNode('output')->defaultValue('.'); } /** @@ -63,6 +66,8 @@ public function load(ContainerBuilder $container, array $config) { $definition = new Definition("emuse\\BehatHTMLFormatter\\BehatHTMLFormatter"); $definition->addArgument($config['name']); + $definition->addArgument('%paths.base%'); + $definition->addArgument($config['output']); $container->setDefinition("html.formatter", $definition) ->addTag("output.formatter"); } From 3f6e31abe2a31fb4403399f0906e7af5d837ff53 Mon Sep 17 00:00:00 2001 From: David Raison Date: Sat, 10 Jan 2015 17:06:58 +0100 Subject: [PATCH 22/55] Use BadOutputPathException, test that output is a directory --- src/BehatHTMLFormatter.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index c03c2f9..a1fefcf 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -17,6 +17,7 @@ use Behat\Testwork\EventDispatcher\Event\BeforeSuiteTested; use Behat\Testwork\Output\Formatter; use Behat\Testwork\Output\Printer\OutputPrinter; +use Behat\Testwork\Output\Exception\BadOutputPathException; use emuse\BehatHTMLFormatter\Classes\Feature; use emuse\BehatHTMLFormatter\Classes\Scenario; use emuse\BehatHTMLFormatter\Classes\Step; @@ -195,18 +196,26 @@ public function getParameter($name) * Verify that the specified output path exists or can be created. * * @param String $path Output path relative to %paths.base% + * + * @return String The full path to the output directory */ public function setOutputPath($path) { $outpath = realpath($this->base_path . DIRECTORY_SEPARATOR . $path); if (!file_exists($outpath)) { if (!mkdir($outpath, 0755, true)) - throw new \Exception( + throw new BadOutputPathException( sprintf( 'Output path %s does not exist and could not be created!', $outpath ) ); + } else { + if (!is_dir($outpath)) { + throw new BadOutputPathException( + 'The argument to "output" is expected to the a directory, file given!' + ); + } } return $outpath; } From 9d5304930c318fe7621b2e40202692906f102606 Mon Sep 17 00:00:00 2001 From: David Raison Date: Sat, 10 Jan 2015 17:11:37 +0100 Subject: [PATCH 23/55] Allow to retrieve outputh path from formatter service, use variable names similar to default OutputPrinter --- src/BehatHTMLFormatter.php | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index a1fefcf..fe743cb 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -42,10 +42,9 @@ class BehatHTMLFormatter implements Formatter private $name; /** - * @param $output where to save the generated report file + * @param $outputPath where to save the generated report file */ - private $output; - + private $outputPath; /** * @param $base_path Behat base path @@ -114,7 +113,7 @@ function __construct($name, $base_path, $output) { $this->name = $name; $this->base_path = $base_path; - $this->output = $this->setOutputPath($output); + $this->setOutputPath($output); } /** @@ -193,11 +192,11 @@ public function getParameter($name) } /** - * Verify that the specified output path exists or can be created. + * Verify that the specified output path exists or can be created, + * then sets the output path. * * @param String $path Output path relative to %paths.base% * - * @return String The full path to the output directory */ public function setOutputPath($path) { @@ -217,7 +216,17 @@ public function setOutputPath($path) ); } } - return $outpath; + $this->outputPath = $outpath; + } + + /** + * Returns output path + * + * @return String output path + */ + public function getOutputPath() + { + return $this->outputPath; } public function onBeforeExercise(BeforeExerciseCompleted $event) @@ -369,7 +378,7 @@ public function onAfterStepTested(AfterStepTested $event) public function createReport() { $templatePath = dirname(__FILE__) . '/../templates'; - $reportPath = $this->output; + $reportPath = $this->outputPath; $loader = new Twig_Loader_Filesystem($templatePath); $twig = new Twig_Environment($loader, array()); From 0e8c56097637ae62b94c4363b55a9fb3e37458af Mon Sep 17 00:00:00 2001 From: David Raison Date: Sat, 10 Jan 2015 17:13:42 +0100 Subject: [PATCH 24/55] Fixed usage of BadOutputPathException --- src/BehatHTMLFormatter.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index fe743cb..e290cf0 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -207,12 +207,17 @@ public function setOutputPath($path) sprintf( 'Output path %s does not exist and could not be created!', $outpath - ) + ), + $outpath ); } else { if (!is_dir($outpath)) { throw new BadOutputPathException( - 'The argument to "output" is expected to the a directory, file given!' + sprintf( + 'The argument to `output` is expected to the a directory, but got %s!', + $outpath + ), + $outpath ); } } From 039296a489f46ceea72d1494b23d95f08b14f1af Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Sat, 10 Jan 2015 17:39:39 +0100 Subject: [PATCH 25/55] Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4bb7ad2..f38274b 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ formatters: name: html +The HTML will be generated at {$PROJECTROOT}/vendor/emuse/behat-html-formatter/reports/test_report.html. until the --out parameter is supported + To be done: ======================== @@ -22,6 +24,7 @@ To be done: 2. Add parameters for behat.yml file 3. Add bootstrap as dependency 4. clean up html report -5. ... -6. +5. + +========================= From e1189c46f743b0ffab63fdda7c747518cb1a6cc2 Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Sat, 10 Jan 2015 17:39:58 +0100 Subject: [PATCH 26/55] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f38274b..e75948a 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ To be done: 2. Add parameters for behat.yml file 3. Add bootstrap as dependency 4. clean up html report -5. +5. Add out parameter ========================= From 02cf30c51003c6a6134a87300fba4300001b903e Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Sat, 10 Jan 2015 17:54:25 +0100 Subject: [PATCH 27/55] Small refactor. --- src/BehatHTMLFormatter.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/BehatHTMLFormatter.php b/src/BehatHTMLFormatter.php index e290cf0..6f15fd2 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/BehatHTMLFormatter.php @@ -31,6 +31,7 @@ */ class BehatHTMLFormatter implements Formatter { + // /** * @var array */ @@ -75,7 +76,6 @@ class BehatHTMLFormatter implements Formatter */ private $currentScenario; - /** * @var Scenario[] */ @@ -105,6 +105,7 @@ class BehatHTMLFormatter implements Formatter * @var Step[] */ private $passedSteps; + // /** * @param string $name formatter name @@ -116,6 +117,7 @@ function __construct($name, $base_path, $output) $this->setOutputPath($output); } + // /** * Returns an array of event names this subscriber wants to listen to. * @@ -233,7 +235,9 @@ public function getOutputPath() { return $this->outputPath; } + // + // public function onBeforeExercise(BeforeExerciseCompleted $event) { } @@ -373,6 +377,7 @@ public function onAfterStepTested(AfterStepTested $event) $this->currentScenario->addStep($step); } + // /** * Generate the final html output file from the tests results From e370bf764d3365a8d9a379739c1eb36ebe040183 Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Sat, 10 Jan 2015 17:55:00 +0100 Subject: [PATCH 28/55] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 5aad1fa..4344982 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,6 @@ formatters: name: html - -The HTML will be generated at {$PROJECTROOT}/vendor/emuse/behat-html-formatter/reports/test_report.html. until the --out parameter is supported - The *output* parameter is relative to %paths.base% and, when omitted, will default to that same path. To be done: From fcedea033d2066beb94124318dd76f57b7bce868 Mon Sep 17 00:00:00 2001 From: David Raison Date: Sat, 10 Jan 2015 16:35:39 +0100 Subject: [PATCH 29/55] Add support for an output parameter to influence where the report html file will be written --- README.md | 12 +- src/BehatHTMLFormatterExtension.php | 7 +- src/{ => Formatter}/BehatHTMLFormatter.php | 40 ++--- src/Printer/FileOutputPrinter.php | 163 +++++++++++++++++++++ 4 files changed, 199 insertions(+), 23 deletions(-) rename src/{ => Formatter}/BehatHTMLFormatter.php (93%) create mode 100644 src/Printer/FileOutputPrinter.php diff --git a/README.md b/README.md index 4bb7ad2..2438571 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,24 @@ BehatHtmlFormatterPlugin ======================== -Suggestions are more than welcome !!! +Suggestions are more than welcome ! -This is a behat plugin to generate HTML reports +This is a behat 3 extension to generate HTML reports from your test results. -Add this to your behat.yml file +Add this to your behat.yml file: 
     formatters:
-    html: true
+    html:
+        output_path: build/html/behat
   extensions:
     emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension:
         name: html
    +The *output_path* parameter is relative to %paths.base% and, when omitted, will default to that same path. + + To be done: ======================== diff --git a/src/BehatHTMLFormatterExtension.php b/src/BehatHTMLFormatterExtension.php index a79c296..8d0d9aa 100644 --- a/src/BehatHTMLFormatterExtension.php +++ b/src/BehatHTMLFormatterExtension.php @@ -1,4 +1,6 @@ -addArgument($config['name']); + $definition->addArgument('%paths.base%'); $container->setDefinition("html.formatter", $definition) ->addTag("output.formatter"); } diff --git a/src/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php similarity index 93% rename from src/BehatHTMLFormatter.php rename to src/Formatter/BehatHTMLFormatter.php index ef5c85d..eefc4e5 100644 --- a/src/BehatHTMLFormatter.php +++ b/src/Formatter/BehatHTMLFormatter.php @@ -1,4 +1,6 @@ - /** * @var array */ private $parameters; + /** * @var */ private $name; + /** + * Printer used by this Formatter + * @param $printer OutputPrinter + */ + private $printer; + /** * @var Array */ @@ -92,17 +100,16 @@ class BehatHTMLFormatter implements Formatter * @var Step[] */ private $passedSteps; - // /** * @param string $name formatter name */ - function __construct($name) + function __construct($name, $base_path) { $this->name = $name; + $this->printer = new FileOutputPrinter($base_path); } - // /** * Returns an array of event names this subscriber wants to listen to. * @@ -152,7 +159,7 @@ public function getDescription() */ public function getOutputPrinter() { - return new ConsoleOutputPrinter(); + return $this->printer; } /** @@ -177,9 +184,8 @@ public function getParameter($name) { return $this->parameters[$name]; } - // - // + public function onBeforeExercise(BeforeExerciseCompleted $event) { } @@ -320,13 +326,15 @@ public function onAfterStepTested(AfterStepTested $event) $this->currentScenario->addStep($step); } - // - - // + /** + * Generate the final html output file from the tests results + * and save it to the location specified in $output + * + * @return void + */ public function createReport() { - $templatePath = dirname(__FILE__) . '/../templates'; - $reportPath = dirname(__FILE__) . '/../reports'; + $templatePath = dirname(__FILE__) . '/../../templates'; $loader = new Twig_Loader_Filesystem($templatePath); $twig = new Twig_Environment($loader, array()); @@ -342,8 +350,7 @@ public function createReport() ) ); - $file = $reportPath . '/test_report.html'; - file_put_contents($file, $test); + $this->printer->write($test); } /** @@ -353,5 +360,4 @@ public function printText($text) { file_put_contents('php://stdout', $text); } - // } diff --git a/src/Printer/FileOutputPrinter.php b/src/Printer/FileOutputPrinter.php new file mode 100644 index 0000000..0650d5f --- /dev/null +++ b/src/Printer/FileOutputPrinter.php @@ -0,0 +1,163 @@ + + */ + +namespace emuse\BehatHTMLFormatter\Printer; + +use Behat\Testwork\Output\Printer\OutputPrinter as PrinterInterface; +use Behat\Testwork\Output\Exception\BadOutputPathException; + + +class FileOutputPrinter implements PrinterInterface +{ + + /** + * @param $outputPath where to save the generated report file + */ + private $outputPath; + + /** + * @param $base_path Behat base path + */ + private $base_path; + + + public function __construct($base_path) + { + $this->base_path = $base_path; + } + + /** + * Verify that the specified output path exists or can be created, + * then sets the output path. + * + * @param String $path Output path relative to %paths.base% + * + */ + public function setOutputPath($path) + { + $outpath = $this->base_path . DIRECTORY_SEPARATOR . $path; + if (!file_exists($outpath)) { + if (!mkdir($outpath, 0755, true)) + throw new BadOutputPathException( + sprintf( + 'Output path %s does not exist and could not be created!', + $outpath + ), + $outpath + ); + } else { + if (!is_dir(realpath($outpath))) { + throw new BadOutputPathException( + sprintf( + 'The argument to `output` is expected to the a directory, but got %s!', + $outpath + ), + $outpath + ); + } + } + $this->outputPath = $outpath; + } + + /** + * Returns output path + * + * @return String output path + */ + public function getOutputPath() + { + return $this->outputPath; + } + + /** + * Sets output styles. + * + * @param array $styles + */ + public function setOutputStyles(array $styles) + { + + } + + /** + * Returns output styles. + * + * @return array + */ + public function getOutputStyles() + { + + } + + /** + * Forces output to be decorated. + * + * @param Boolean $decorated + */ + public function setOutputDecorated($decorated) + { + + } + + /** + * Returns output decoration status. + * + * @return null|Boolean + */ + public function isOutputDecorated() + { + return true; + } + + /** + * Sets output verbosity level. + * + * @param integer $level + */ + public function setOutputVerbosity($level) + { + + } + + /** + * Returns output verbosity level. + * + * @return integer + */ + public function getOutputVerbosity() + { + + } + + /** + * Writes message(s) to output console. + * + * @param string|array $messages message or array of messages + */ + public function write($messages) + { + $file = $this->outputPath . DIRECTORY_SEPARATOR . 'test_report.html'; + file_put_contents($file, $messages); + } + + /** + * Writes newlined message(s) to output console. + * + * @param string|array $messages message or array of messages + */ + public function writeln($messages = '') + { + + } + + /** + * Clear output console, so on next write formatter will need to init (create) it again. + */ + public function flush() + { + + } +} From 6253d4cc3f01b1ab2996d9eb74ca6e09c2e34152 Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Sat, 10 Jan 2015 18:44:21 +0100 Subject: [PATCH 30/55] Fixed merge. --- README.md | 16 ------ src/BehatHTMLFormatterExtension.php | 12 ++--- src/Formatter/BehatHTMLFormatter.php | 78 ++++++++++++---------------- 3 files changed, 38 insertions(+), 68 deletions(-) diff --git a/README.md b/README.md index 75be60b..4c69970 100644 --- a/README.md +++ b/README.md @@ -9,30 +9,14 @@ Add this to your behat.yml file: 
     formatters:
-<<<<<<< HEAD
-    html: true
-    output: build/html/behat
-=======
     html:
         output_path: build/html/behat
->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868
   extensions:
     emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension:
         name: html
    -<<<<<<< HEAD -<<<<<<< HEAD - -The HTML will be generated at {$PROJECTROOT}/vendor/emuse/behat-html-formatter/reports/test_report.html. until the --out parameter is supported - -======= ->>>>>>> e370bf764d3365a8d9a379739c1eb36ebe040183 The *output* parameter is relative to %paths.base% and, when omitted, will default to that same path. -======= -The *output_path* parameter is relative to %paths.base% and, when omitted, will default to that same path. - ->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868 To be done: ======================== diff --git a/src/BehatHTMLFormatterExtension.php b/src/BehatHTMLFormatterExtension.php index f1adb30..830d444 100644 --- a/src/BehatHTMLFormatterExtension.php +++ b/src/BehatHTMLFormatterExtension.php @@ -21,7 +21,9 @@ class BehatHTMLFormatterExtension implements ExtensionInterface * * @api */ - public function process(ContainerBuilder $container) {} + public function process(ContainerBuilder $container) + { + } /** * Returns the extension config key. @@ -43,7 +45,9 @@ public function getConfigKey() * * @param ExtensionManager $extensionManager */ - public function initialize(ExtensionManager $extensionManager) {} + public function initialize(ExtensionManager $extensionManager) + { + } /** * Setups configuration for the extension. @@ -67,10 +71,6 @@ public function load(ContainerBuilder $container, array $config) $definition = new Definition("emuse\\BehatHTMLFormatter\\Formatter\\BehatHTMLFormatter"); $definition->addArgument($config['name']); $definition->addArgument('%paths.base%'); -<<<<<<< HEAD - $definition->addArgument($config['output']); -======= ->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868 $container->setDefinition("html.formatter", $definition) ->addTag("output.formatter"); } diff --git a/src/Formatter/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php index c8e9a15..88b47b5 100644 --- a/src/Formatter/BehatHTMLFormatter.php +++ b/src/Formatter/BehatHTMLFormatter.php @@ -1,10 +1,6 @@ >>>>>> fcedea033d2066beb94124318dd76f57b7bce868:src/Formatter/BehatHTMLFormatter.php use Behat\Behat\EventDispatcher\Event\AfterOutlineTested; use Behat\Behat\EventDispatcher\Event\AfterScenarioTested; @@ -13,18 +9,14 @@ use Behat\Behat\EventDispatcher\Event\AfterFeatureTested; use Behat\Behat\EventDispatcher\Event\BeforeOutlineTested; use Behat\Behat\EventDispatcher\Event\BeforeScenarioTested; -use Behat\Behat\Output\Printer\ConsoleOutputPrinter; use Behat\Behat\Tester\Result\ExecutedStepResult; use Behat\Testwork\EventDispatcher\Event\AfterExerciseCompleted; use Behat\Testwork\EventDispatcher\Event\AfterSuiteTested; use Behat\Testwork\EventDispatcher\Event\BeforeExerciseCompleted; use Behat\Testwork\EventDispatcher\Event\BeforeSuiteTested; +use Behat\Testwork\Output\Exception\BadOutputPathException; use Behat\Testwork\Output\Formatter; -<<<<<<< HEAD:src/BehatHTMLFormatter.php use Behat\Testwork\Output\Printer\OutputPrinter; -use Behat\Testwork\Output\Exception\BadOutputPathException; -======= ->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868:src/Formatter/BehatHTMLFormatter.php use emuse\BehatHTMLFormatter\Classes\Feature; use emuse\BehatHTMLFormatter\Classes\Scenario; use emuse\BehatHTMLFormatter\Classes\Step; @@ -39,32 +31,32 @@ */ class BehatHTMLFormatter implements Formatter { + + // /** * @var array */ private $parameters; - /** * @var */ private $name; /** -<<<<<<< HEAD:src/BehatHTMLFormatter.php - * @param $outputPath where to save the generated report file + * @param String $outputPath where to save the generated report file */ private $outputPath; /** - * @param $base_path Behat base path + * @param String $base_path Behat base path */ private $base_path; -======= + + /** * Printer used by this Formatter * @param $printer OutputPrinter */ private $printer; ->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868:src/Formatter/BehatHTMLFormatter.php /** * @var Array @@ -119,27 +111,19 @@ class BehatHTMLFormatter implements Formatter * @var Step[] */ private $passedSteps; + // + // /** - * @param string $name formatter name + * @param $name + * @param $base_path */ -<<<<<<< HEAD:src/BehatHTMLFormatter.php - function __construct($name, $base_path, $output) - { - $this->name = $name; - $this->base_path = $base_path; - $this->setOutputPath($output); - } - - // -======= function __construct($name, $base_path) { $this->name = $name; $this->printer = new FileOutputPrinter($base_path); } ->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868:src/Formatter/BehatHTMLFormatter.php /** * Returns an array of event names this subscriber wants to listen to. * @@ -214,27 +198,26 @@ public function getParameter($name) { return $this->parameters[$name]; } -<<<<<<< HEAD:src/BehatHTMLFormatter.php /** * Verify that the specified output path exists or can be created, * then sets the output path. * * @param String $path Output path relative to %paths.base% - * + * @throws BadOutputPathException */ public function setOutputPath($path) { $outpath = realpath($this->base_path . DIRECTORY_SEPARATOR . $path); if (!file_exists($outpath)) { if (!mkdir($outpath, 0755, true)) - throw new BadOutputPathException( - sprintf( - 'Output path %s does not exist and could not be created!', + throw new BadOutputPathException( + sprintf( + 'Output path %s does not exist and could not be created!', + $outpath + ), $outpath - ), - $outpath - ); + ); } else { if (!is_dir($outpath)) { throw new BadOutputPathException( @@ -258,26 +241,37 @@ public function getOutputPath() { return $this->outputPath; } - // -======= ->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868:src/Formatter/BehatHTMLFormatter.php + // + // + /** + * @param BeforeExerciseCompleted $event + */ public function onBeforeExercise(BeforeExerciseCompleted $event) { } + /** + * @param AfterExerciseCompleted $event + */ public function onAfterExercise(AfterExerciseCompleted $event) { $this->createReport(); } + /** + * @param BeforeSuiteTested $event + */ public function onBeforeSuiteTested(BeforeSuiteTested $event) { $this->currentSuite = new Suite(); $this->currentSuite->setName($event->getSuite()->getName()); } + /** + * @param AfterSuiteTested $event + */ public function onAfterSuiteTested(AfterSuiteTested $event) { $this->suites[] = $this->currentSuite; @@ -402,10 +396,7 @@ public function onAfterStepTested(AfterStepTested $event) $this->currentScenario->addStep($step); } -<<<<<<< HEAD:src/BehatHTMLFormatter.php // -======= ->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868:src/Formatter/BehatHTMLFormatter.php /** * Generate the final html output file from the tests results @@ -415,12 +406,7 @@ public function onAfterStepTested(AfterStepTested $event) */ public function createReport() { -<<<<<<< HEAD:src/BehatHTMLFormatter.php - $templatePath = dirname(__FILE__) . '/../templates'; - $reportPath = $this->outputPath; -======= $templatePath = dirname(__FILE__) . '/../../templates'; ->>>>>>> fcedea033d2066beb94124318dd76f57b7bce868:src/Formatter/BehatHTMLFormatter.php $loader = new Twig_Loader_Filesystem($templatePath); $twig = new Twig_Environment($loader, array()); From 5f8ebe52b9568ceffba5ef46a08aeec5bef6b2dd Mon Sep 17 00:00:00 2001 From: Neal Vanmeert Date: Mon, 12 Jan 2015 09:54:20 +0100 Subject: [PATCH 31/55] Fixed output_path concatenation. --- reports/test_report.html | 827 ------------------------------ src/Printer/FileOutputPrinter.php | 16 +- templates/index.html.twig | 4 +- 3 files changed, 10 insertions(+), 837 deletions(-) delete mode 100644 reports/test_report.html diff --git a/reports/test_report.html b/reports/test_report.html deleted file mode 100644 index 24f0471..0000000 --- a/reports/test_report.html +++ /dev/null @@ -1,827 +0,0 @@ - - - - - - - Behat Tests - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    - -
    - 4 features failed of 8 - features -
    -
    -
    - -
    - 5 scenarios failed of 7 - scenarios -
    -
    -
    - -
    - 9 steps failed of 15 -
    -
    -
    -
    - All - Passed - Failed -
    -
    -
    -
    -
    -

    Suite: Generic

    - -
    -
    -
    -
    -

    Feature: Admin permissions

    -
    -
    -

    In order to perform admin tasks
    -As an administrator
    -I need to have permissions on everything

    -
    -
    -
    -
    -
    - -
    - 40% Complete (success) -
    -
    - 40% Complete (success) -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to acces the footer
    -As a visitor
    -I should see a footer

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to confirm the website basics are configured right
    -As a visitor
    -I see some basic things and be able to access the website

    -
    -
    -
    -
    -
    - -
    - 40% Complete (success) -
    -
    - 40% Complete (success) -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Pages

    -
    -
    -

    In order to use the website
    -As a visitor
    -All pages should be accesible

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Suite: Project

    - -
    -
    -
    -
    -

    Feature: Admin permissions

    -
    -
    -

    In order to perform admin tasks
    -As an administrator
    -I need to have permissions on everything

    -
    -
    -
    -
    -
    - -
    - 40% Complete (success) -
    -
    - 40% Complete (success) -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to acces the footer
    -As a visitor
    -I should see a footer

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to confirm the website basics are configured right
    -As a visitor
    -I see some basic things and be able to access the website

    -
    -
    -
    -
    -
    - -
    - 40% Complete (success) -
    -
    - 40% Complete (success) -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Pages

    -
    -
    -

    In order to use the website
    -As a visitor
    -All pages should be accesible

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Admin permissions

    -
    -
    -

    In order to perform admin tasks
    -As an administrator
    -I need to have permissions on everything

    -
    -
    -
    -
    -
    - -
    - 40% Complete (success) -
    -
    - 40% Complete (success) -
    -
    -
    -
    -
    -
    -
    - -
    -
      -
    • - Given I am logged in as a user with the "administrator" role -
      • -
    • - When I am on the homepage -
      • -
    • - Then I should see the text Logout -
      • -
    • - Given I am logged in as a user with the "administrator" role -
      • -
    • - When I am on the homepage -
      • -
    • - Then I should see the text Login -
      • -
    • - Given I am logged in as a user with the "administrator" role -
      • -
    • - When I am on the homepage -
      • -
    • - Then I should see the text User -
      • -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to acces the footer
    -As a visitor
    -I should see a footer

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to confirm the website basics are configured right
    -As a visitor
    -I see some basic things and be able to access the website

    -
    -
    -
    -
    -
    - -
    - 40% Complete (success) -
    -
    - 40% Complete (success) -
    -
    -
    -
    -
    -
    -
    - -
    -
      -
    • - Given I am on the homepage -
      • -
    • - Then I should get a "200" HTTP response -
      • -
    -
    -
    -
    - -
    -
      -
    • - Given I am at "/404" -
      • -
    • - Then I should get a "404" HTTP response -
      • -
    -
    -
    -
    - -
    -
      -
    • - Given I am at "/500" -
      • -
    • - Then I should get a "500" HTTP response -
      • -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Pages

    -
    -
    -

    In order to use the website
    -As a visitor
    -All pages should be accesible

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Admin permissions

    -
    -
    -

    In order to perform admin tasks
    -As an administrator
    -I need to have permissions on everything

    -
    -
    -
    -
    -
    - -
    - 40% Complete (success) -
    -
    - 40% Complete (success) -
    -
    -
    -
    -
    -
    -
    - -
    -
      -
    • - Given I am logged in as a user with the "administrator" role -
      • -
    • - When I am on the homepage -
      • -
    • - Then I should see the text Logout -
      • -
    • - Given I am logged in as a user with the "administrator" role -
      • -
    • - When I am on the homepage -
      • -
    • - Then I should see the text Login -
      • -
    • - Given I am logged in as a user with the "administrator" role -
      • -
    • - When I am on the homepage -
      • -
    • - Then I should see the text User -
      • -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to acces the footer
    -As a visitor
    -I should see a footer

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Main

    -
    -
    -

    In order to confirm the website basics are configured right
    -As a visitor
    -I see some basic things and be able to access the website

    -
    -
    -
    -
    -
    - -
    - 40% Complete (success) -
    -
    - 40% Complete (success) -
    -
    -
    -
    -
    -
    -
    - -
    -
      -
    • - Given I am on the homepage -
      • -
    • - Then I should get a "200" HTTP response -
      • -
    -
    -
    -
    - -
    -
      -
    • - Given I am at "/404" -
      • -
    • - Then I should get a "404" HTTP response -
      • -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    Feature: Pages

    -
    -
    -

    In order to use the website
    -As a visitor
    -All pages should be accesible

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - - - diff --git a/src/Printer/FileOutputPrinter.php b/src/Printer/FileOutputPrinter.php index 0650d5f..f7961dc 100644 --- a/src/Printer/FileOutputPrinter.php +++ b/src/Printer/FileOutputPrinter.php @@ -38,16 +38,16 @@ public function __construct($base_path) */ public function setOutputPath($path) { - $outpath = $this->base_path . DIRECTORY_SEPARATOR . $path; + $outpath = $path; if (!file_exists($outpath)) { if (!mkdir($outpath, 0755, true)) - throw new BadOutputPathException( - sprintf( - 'Output path %s does not exist and could not be created!', + throw new BadOutputPathException( + sprintf( + 'Output path %s does not exist and could not be created!', + $outpath + ), $outpath - ), - $outpath - ); + ); } else { if (!is_dir(realpath($outpath))) { throw new BadOutputPathException( @@ -139,7 +139,7 @@ public function getOutputVerbosity() */ public function write($messages) { - $file = $this->outputPath . DIRECTORY_SEPARATOR . 'test_report.html'; + $file = $this->outputPath . DIRECTORY_SEPARATOR . 'report.html'; file_put_contents($file, $messages); } diff --git a/templates/index.html.twig b/templates/index.html.twig index ab30505..7a450f0 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -14,7 +14,7 @@ - + @@ -23,7 +23,7 @@ - + From 3e372584755b81bfcd6e0611eb644ccb7cda4efe Mon Sep 17 00:00:00 2001 From: dutchiexl Date: Mon, 12 Jan 2015 09:56:11 +0100 Subject: [PATCH 32/55] Update README.md Fixed absolute path in output --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c69970..07ec137 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Add this to your behat.yml file: 
     formatters:
     html:
-        output_path: build/html/behat
+        output_path: %paths.base%/build/html/behat
   extensions:
     emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension:
         name: html

From f63e17368cffc1195fa0afa63ff81839eab64cf8 Mon Sep 17 00:00:00 2001
From: lmrafael 
Date: Wed, 25 Feb 2015 19:24:01 -0300
Subject: [PATCH 33/55] Improvements on steps colors and error messages

Modified to support Steps colours as on the default behat formatter and print the error message (if any) along with the failing step.
---
 src/Classes/Step.php                 | 45 ++++++++++++++++++++++++----
 src/Formatter/BehatHTMLFormatter.php |  2 +-
 templates/index.html.twig            |  6 +++-
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/Classes/Step.php b/src/Classes/Step.php
index 2b908f4..43fe625 100644
--- a/src/Classes/Step.php
+++ b/src/Classes/Step.php
@@ -8,6 +8,7 @@
 
 namespace emuse\BehatHTMLFormatter\Classes;
 
+use Behat\Testwork\Tester\Result\TestResult;
 
 class Step
 {
@@ -16,7 +17,7 @@ class Step
     private $arguments;
     private $line;
     private $result;
-    private $passed;
+    private $resultCode;
     private $exception;
     private $definition;
 
@@ -135,16 +136,48 @@ public function setDefinition($definition)
     /**
      * @return mixed
      */
-    public function getPassed()
+    public function getResultCode()
     {
-        return $this->passed;
+        return $this->resultCode;
     }
 
     /**
-     * @param mixed $passed
+     * @param mixed $resultCode
      */
-    public function setPassed($passed)
+    public function setResultCode($resultCode)
     {
-        $this->passed = $passed;
+        $this->resultCode = $resultCode;
+    }
+    
+     /**
+     * @return bool
+     */
+    public function isPassed()
+    {
+        return $this->resultCode == TestResult::PASSED;
+    }
+    
+     /**
+     * @return bool
+     */
+    public function isSkipped()
+    {
+        return $this->resultCode == TestResult::SKIPPED;
+    }
+    
+     /**
+     * @return bool
+     */
+    public function isPending()
+    {
+        return $this->resultCode == TestResult::PENDING;
+    }
+    
+     /**
+     * @return bool
+     */
+    public function isFailed()
+    {
+        return $this->resultCode == TestResult::FAILED;
     }
 }
diff --git a/src/Formatter/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php
index 88b47b5..da98f34 100644
--- a/src/Formatter/BehatHTMLFormatter.php
+++ b/src/Formatter/BehatHTMLFormatter.php
@@ -381,7 +381,7 @@ public function onAfterStepTested(AfterStepTested $event)
         $step->setLine($event->getStep()->getLine());
         $step->setArguments($event->getStep()->getArguments());
         $step->setResult($result);
-        $step->setPassed($result->isPassed());
+        $step->setResultCode($result->getResultCode());
 
         if ($result instanceof ExecutedStepResult) {
             $step->setDefinition($result->getStepDefinition());
diff --git a/templates/index.html.twig b/templates/index.html.twig
index 7a450f0..0f2ca5a 100644
--- a/templates/index.html.twig
+++ b/templates/index.html.twig
@@ -182,8 +182,12 @@
                                      aria-labelledby="headingOne">
                                     
      
                                         {% for step in scenario.steps %}
-                                            
    • 
+                                            
    • 
                                                 {{ step.keyword }} {{ step.text }}
+                                                {% if step.exception is not null %}
+                                                    
      
+                                                
      ({{ step.exception }})
      
+                                            {% endif %}
                                             
      • 
                                             {#
      #}
                                             {#{{ step.keyword }} {{ step.text }}#}

From a81accca504cb076a63c54a1dfc6bc7e39db0344 Mon Sep 17 00:00:00 2001
From: lmrafael 
Date: Mon, 2 Mar 2015 18:13:11 -0300
Subject: [PATCH 34/55] Further improvements on steps colours and error
 messages

For some reason, unimplemented steps return the status as UNDEFINED. Fixed the isPending() on the Step to cover it.

Fixed the step status code ref to the correct one (StepResult)

Improved exception readability (IMO).
---
 src/Classes/Step.php      | 10 +++++-----
 templates/index.html.twig |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Classes/Step.php b/src/Classes/Step.php
index 43fe625..6c41c05 100644
--- a/src/Classes/Step.php
+++ b/src/Classes/Step.php
@@ -8,7 +8,7 @@
 
 namespace emuse\BehatHTMLFormatter\Classes;
 
-use Behat\Testwork\Tester\Result\TestResult;
+use Behat\Behat\Tester\Result\StepResult;
 
 class Step
 {
@@ -154,7 +154,7 @@ public function setResultCode($resultCode)
      */
     public function isPassed()
     {
-        return $this->resultCode == TestResult::PASSED;
+        return $this->resultCode == StepResult::PASSED;
     }
     
      /**
@@ -162,7 +162,7 @@ public function isPassed()
      */
     public function isSkipped()
     {
-        return $this->resultCode == TestResult::SKIPPED;
+        return $this->resultCode == StepResult::SKIPPED;
     }
     
      /**
@@ -170,7 +170,7 @@ public function isSkipped()
      */
     public function isPending()
     {
-        return $this->resultCode == TestResult::PENDING;
+        return ($this->resultCode == StepResult::PENDING || $this->resultCode == StepResult::UNDEFINED);
     }
     
      /**
@@ -178,6 +178,6 @@ public function isPending()
      */
     public function isFailed()
     {
-        return $this->resultCode == TestResult::FAILED;
+        return $this->resultCode == StepResult::FAILED;
     }
 }
diff --git a/templates/index.html.twig b/templates/index.html.twig
index 0f2ca5a..bab467e 100644
--- a/templates/index.html.twig
+++ b/templates/index.html.twig
@@ -186,7 +186,7 @@
                                                 {{ step.keyword }} {{ step.text }}
                                                 {% if step.exception is not null %}
                                                     
      
-                                                
      ({{ step.exception }})
      
+                                                
      ({{ step.exception }})
      
                                             {% endif %}
                                             
                                             {#
      #}

From 792cc43131384056c5f4ced4b9de602e372d3778 Mon Sep 17 00:00:00 2001
From: Neal Vanmeert 
Date: Tue, 3 Mar 2015 14:30:50 +0100
Subject: [PATCH 35/55] Added asset folder copying to report folder.

---
 src/Printer/FileOutputPrinter.php | 310 ++++++++++++++++--------------
 1 file changed, 166 insertions(+), 144 deletions(-)

diff --git a/src/Printer/FileOutputPrinter.php b/src/Printer/FileOutputPrinter.php
index f7961dc..eca6ed2 100644
--- a/src/Printer/FileOutputPrinter.php
+++ b/src/Printer/FileOutputPrinter.php
@@ -6,158 +6,180 @@
 
 namespace emuse\BehatHTMLFormatter\Printer;
 
-use Behat\Testwork\Output\Printer\OutputPrinter as PrinterInterface;
 use Behat\Testwork\Output\Exception\BadOutputPathException;
+use Behat\Testwork\Output\Printer\OutputPrinter as PrinterInterface;
 
 
-class FileOutputPrinter implements PrinterInterface
-{
-
-    /**
-     * @param  $outputPath where to save the generated report file
-     */
-    private $outputPath;
-
-    /**
-     * @param  $base_path Behat base path
-     */
-    private $base_path;
-
-
-    public function __construct($base_path)
-    {
-        $this->base_path = $base_path;
-    }
-
-    /**
-     * Verify that the specified output path exists or can be created,
-     * then sets the output path.
-     *
-     * @param String $path Output path relative to %paths.base%
-     *
-     */
-    public function setOutputPath($path)
-    {
-        $outpath = $path;
-        if (!file_exists($outpath)) {
-            if (!mkdir($outpath, 0755, true))
-                throw new BadOutputPathException(
-                    sprintf(
-                        'Output path %s does not exist and could not be created!',
-                        $outpath
-                    ),
-                    $outpath
-                );
-        } else {
-            if (!is_dir(realpath($outpath))) {
-                throw new BadOutputPathException(
-                    sprintf(
-                        'The argument to `output` is expected to the a directory, but got %s!',
-                        $outpath
-                    ),
-                    $outpath
-                );
-            }
-        }
-        $this->outputPath = $outpath;
-    }
-
-    /**
-     * Returns output path
-     *
-     * @return String output path
-     */
-    public function getOutputPath()
-    {
-        return $this->outputPath;
-    }
-
-    /**
-     * Sets output styles.
-     *
-     * @param array $styles
-     */
-    public function setOutputStyles(array $styles)
-    {
-
-    }
-
-    /**
-     * Returns output styles.
-     *
-     * @return array
-     */
-    public function getOutputStyles()
-    {
-
-    }
-
-    /**
-     * Forces output to be decorated.
-     *
-     * @param Boolean $decorated
-     */
-    public function setOutputDecorated($decorated)
-    {
-
-    }
-
-    /**
-     * Returns output decoration status.
-     *
-     * @return null|Boolean
-     */
-    public function isOutputDecorated()
-    {
-        return true;
-    }
-
-    /**
-     * Sets output verbosity level.
-     *
-     * @param integer $level
-     */
-    public function setOutputVerbosity($level)
-    {
-
+class FileOutputPrinter implements PrinterInterface {
+
+  /**
+   * @param  $outputPath where to save the generated report file
+   */
+  private $outputPath;
+
+  /**
+   * @param  $base_path Behat base path
+   */
+  private $base_path;
+
+
+  public function __construct($base_path) {
+    $this->base_path = $base_path;
+  }
+
+  /**
+   * Verify that the specified output path exists or can be created,
+   * then sets the output path.
+   *
+   * @param String $path Output path relative to %paths.base%
+   *
+   */
+  public function setOutputPath($path) {
+    $outpath = $path;
+    if (!file_exists($outpath)) {
+      if (!mkdir($outpath, 0755, TRUE)) {
+        throw new BadOutputPathException(
+          sprintf(
+            'Output path %s does not exist and could not be created!',
+            $outpath
+          ),
+          $outpath
+        );
+      }
     }
-
-    /**
-     * Returns output verbosity level.
-     *
-     * @return integer
-     */
-    public function getOutputVerbosity()
-    {
-
+    else {
+      if (!is_dir(realpath($outpath))) {
+        throw new BadOutputPathException(
+          sprintf(
+            'The argument to `output` is expected to the a directory, but got %s!',
+            $outpath
+          ),
+          $outpath
+        );
+      }
     }
-
-    /**
-     * Writes message(s) to output console.
-     *
-     * @param string|array $messages message or array of messages
-     */
-    public function write($messages)
-    {
-        $file = $this->outputPath . DIRECTORY_SEPARATOR . 'report.html';
-        file_put_contents($file, $messages);
+    $this->outputPath = $outpath;
+  }
+
+  /**
+   * Returns output path
+   *
+   * @return String output path
+   */
+  public function getOutputPath() {
+    return $this->outputPath;
+  }
+
+  /**
+   * Sets output styles.
+   *
+   * @param array $styles
+   */
+  public function setOutputStyles(array $styles) {
+
+  }
+
+  /**
+   * Returns output styles.
+   *
+   * @return array
+   */
+  public function getOutputStyles() {
+
+  }
+
+  /**
+   * Forces output to be decorated.
+   *
+   * @param Boolean $decorated
+   */
+  public function setOutputDecorated($decorated) {
+
+  }
+
+  /**
+   * Returns output decoration status.
+   *
+   * @return null|Boolean
+   */
+  public function isOutputDecorated() {
+    return TRUE;
+  }
+
+  /**
+   * Sets output verbosity level.
+   *
+   * @param integer $level
+   */
+  public function setOutputVerbosity($level) {
+
+  }
+
+  /**
+   * Returns output verbosity level.
+   *
+   * @return integer
+   */
+  public function getOutputVerbosity() {
+
+  }
+
+  /**
+   * Writes message(s) to output console.
+   *
+   * @param string|array $messages message or array of messages
+   */
+  public function write($messages) {
+    $file = $this->outputPath . DIRECTORY_SEPARATOR . 'report.html';
+    file_put_contents($file, $messages);
+    $this->copyAssets();
+  }
+
+  /**
+   * Copies the assets folder to the report destination.
+   */
+  public function copyAssets() {
+    // If the assets folder doesn' exist in the output path, copy it
+    $source = realpath(dirname(__FILE__));
+    $assets_source = realpath($source . "/../../assets");
+    $destination = $this->outputPath . DIRECTORY_SEPARATOR . 'assets';
+    $this->recurse_copy($assets_source, $destination);
+  }
+
+  /**
+   * Recursivly copy a path.
+   * @param $src
+   * @param $dst
+   */
+  private function recurse_copy($src, $dst) {
+    $dir = opendir($src);
+    @mkdir($dst);
+    while (FALSE !== ($file = readdir($dir))) {
+      if (($file != '.') && ($file != '..')) {
+        if (is_dir($src . '/' . $file)) {
+          $this->recurse_copy($src . '/' . $file, $dst . '/' . $file);
+        }
+        else {
+          copy($src . '/' . $file, $dst . '/' . $file);
+        }
+      }
     }
+    closedir($dir);
+  }
 
-    /**
-     * Writes newlined message(s) to output console.
-     *
-     * @param string|array $messages message or array of messages
-     */
-    public function writeln($messages = '')
-    {
+  /**
+   * Writes newlined message(s) to output console.
+   *
+   * @param string|array $messages message or array of messages
+   */
+  public function writeln($messages = '') {
 
-    }
+  }
 
-    /**
-     * Clear output console, so on next write formatter will need to init (create) it again.
-     */
-    public function flush()
-    {
+  /**
+   * Clear output console, so on next write formatter will need to init (create) it again.
+   */
+  public function flush() {
 
-    }
+  }
 }

From 67b01629b102596a311623023fd36874d99ff1b9 Mon Sep 17 00:00:00 2001
From: DaSayan 
Date: Fri, 6 Mar 2015 13:46:37 +0100
Subject: [PATCH 36/55] First base output without Twig

---
 src/Formatter/BehatHTMLFormatter.php | 88 +++++++++++++++++++++++++++-
 1 file changed, 87 insertions(+), 1 deletion(-)

diff --git a/src/Formatter/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php
index 88b47b5..5538bd5 100644
--- a/src/Formatter/BehatHTMLFormatter.php
+++ b/src/Formatter/BehatHTMLFormatter.php
@@ -406,6 +406,10 @@ public function onAfterStepTested(AfterStepTested $event)
      */
     public function createReport()
     {
+    
+    
+
+    /*
         $templatePath = dirname(__FILE__) . '/../../templates';
         $loader = new Twig_Loader_Filesystem($templatePath);
         $twig = new Twig_Environment($loader, array());
@@ -421,8 +425,90 @@ public function createReport()
                 'passedFeatures' => $this->passedFeatures,
             )
         );
-
+        
         $this->printer->write($test);
+       */ 
+        
+        //global
+        $print = count($this->failedFeatures) . ' features failed of ' . (count($this->failedFeatures) + count($this->passedFeatures)) . '
      ' ;
+        $print .= count($this->failedScenarios) . ' scenarios failed of ' . (count($this->failedScenarios) + count($this->passedScenarios)) . '
      ' ;
+        $print .= count($this->failedSteps) . ' steps failed of ' . (count($this->failedSteps) + count($this->passedSteps)) . '
      ' ;
+        
+        $print .= '
      VUE GLOBALE
      ' ;
+        
+        foreach($this->suites as $suite) {
+            $print .= 'Suite : ' . $suite->getName() . '

      ';
+            
+            foreach($suite->getFeatures() as $feature) {
+                $print .= 'Feature ID : ' . $feature->getId() . '
      ';
+                $print .= 'Feature result : ' . $feature->getPassedClass() . '
      ';
+                $print .= 'Feature name : ' . $feature->getName() . '
      ';
+                $print .= 'Feature description : ' . $feature->getDescription() . '
      ';
+                foreach($feature->getTags() as $tag) {
+                    $print .= $tag ;
+                }
+                if (count($feature->getTags() > 0)) {
+                    $print .= '
      ' ;
+                }
+                if ($feature->getTotalAmountOfScenarios() > 0 ) {
+                    $print .= 'Features passed :' . $feature->getPercentPassed() . '
      ' ;
+                    $print .= 'Features failed :' . $feature->getPercentFailed() . '
      ' ;
+                }
+                $print .= '
      ' ;
+
+            }
+        }
+        
+        $print .= '
      VUE DETAILLEE
      ' ;
+        
+        foreach($this->suites as $suite) {    
+            foreach($suite->getFeatures() as $feature) {
+                $print .= 'Feature ID : ' . $feature->getId() . '
      ';
+                $print .= 'Feature result : ' . $feature->getPassedClass() . '
      ';
+                $print .= 'Feature name : ' . $feature->getName() . '
      ';
+                $print .= 'Feature description : ' . $feature->getDescription() . '
      ';
+                foreach($feature->getTags() as $tag) {
+                    $print .= $tag ;
+                }                
+                if (count($feature->getTags()) > 0) {
+                    $print .= '
      ' ;
+                }                
+                if ($feature->getTotalAmountOfScenarios() > 0 ) {
+                    $print .= 'Features passed :' . $feature->getPercentPassed() . '
      ' ;
+                    $print .= 'Features failed :' . $feature->getPercentFailed() . '
      ' ;
+                }
+                $print .= '
      ' ;
+                foreach($feature->getScenarios() as $scenario) {
+                    if ($scenario->isPassed()) {
+                        $print .= 'passed' ;
+                    } else {
+                        $print .= 'failed' ;
+                    }
+                    $print .= '
      ' ;
+                    $print .= 'Scenario ID : ' . $scenario->getId() . '
      ';
+                    $print .= 'Scenario Name : ' . $scenario->getName() . '
      ';
+                    foreach($scenario->getTags() as $tag) {
+                        $print .= $tag ;
+                    }      
+                    if (count($scenario->getTags()) > 0) {
+                        $print .= '
      ' ;
+                    }     
+                    foreach($scenario->getSteps() as $step) {
+                        if ($step->getPassed()) {
+                            $print .= 'success' ;
+                        } else {
+                            $print .= 'danger' ;
+                        }
+                        $print .= '
      ' ;
+                        $print .= $step->getKeyWord() . ' - ' . $step->getText() ;
+                    }
+                }
+            }                
+        }
+
+        $this->printer->write($print);
+        $this->printer->writeln('toto');
+        
     }
 
     /**

From 5ed119b6e0adc65d4228d918d84bc083ae0f4e57 Mon Sep 17 00:00:00 2001
From: DaSayan 
Date: Fri, 6 Mar 2015 13:47:00 +0100
Subject: [PATCH 37/55] WriteIn function OK

---
 src/Printer/FileOutputPrinter.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Printer/FileOutputPrinter.php b/src/Printer/FileOutputPrinter.php
index f7961dc..3bb7391 100644
--- a/src/Printer/FileOutputPrinter.php
+++ b/src/Printer/FileOutputPrinter.php
@@ -137,11 +137,13 @@ public function getOutputVerbosity()
      *
      * @param string|array $messages message or array of messages
      */
-    public function write($messages)
+    public function write($messages = '')
     {
         $file = $this->outputPath . DIRECTORY_SEPARATOR . 'report.html';
         file_put_contents($file, $messages);
     }
+    
+    
 
     /**
      * Writes newlined message(s) to output console.
@@ -150,7 +152,8 @@ public function write($messages)
      */
     public function writeln($messages = '')
     {
-
+        $file = $this->outputPath . DIRECTORY_SEPARATOR . 'report.html';
+        file_put_contents($file, $messages, FILE_APPEND);
     }
 
     /**

From 417685fa8d9772d41bdec292988814cd48ef03a6 Mon Sep 17 00:00:00 2001
From: DaSayan 
Date: Fri, 6 Mar 2015 14:21:58 +0100
Subject: [PATCH 38/55] POC : writing report during tests, not at the ending

---
 src/Formatter/BehatHTMLFormatter.php | 158 ++++++++++-----------------
 src/Printer/FileOutputPrinter.php    |  12 ++
 2 files changed, 72 insertions(+), 98 deletions(-)

diff --git a/src/Formatter/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php
index 5538bd5..7a46923 100644
--- a/src/Formatter/BehatHTMLFormatter.php
+++ b/src/Formatter/BehatHTMLFormatter.php
@@ -250,6 +250,8 @@ public function getOutputPath()
      */
     public function onBeforeExercise(BeforeExerciseCompleted $event)
     {
+        //creating report file
+        $this->printer->write() ;
     }
 
     /**
@@ -267,6 +269,9 @@ public function onBeforeSuiteTested(BeforeSuiteTested $event)
     {
         $this->currentSuite = new Suite();
         $this->currentSuite->setName($event->getSuite()->getName());
+        
+        $print = 'Suite : ' . $event->getSuite()->getName() . '

      ' ;
+        $this->printer->writeln($print);
     }
 
     /**
@@ -289,7 +294,19 @@ public function onBeforeFeatureTested(BeforeFeatureTested $event)
         $feature->setDescription($event->getFeature()->getDescription());
         $feature->setTags($event->getFeature()->getTags());
         $feature->setFile($event->getFeature()->getFile());
-        $this->currentFeature = $feature;
+        $this->currentFeature = $feature;    
+        
+        $print = 'Feature ID : ' . $this->currentFeature->getId() . '
      ';
+        $print .= 'Feature name : ' . $this->currentFeature->getName() . '
      ';
+        $print .= 'Feature description : ' . $this->currentFeature->getDescription() . '
      ';
+        foreach($this->currentFeature->getTags() as $tag) {
+            $print .= $tag ;
+        }                
+        if (count($this->currentFeature->getTags()) > 0) {
+            $print .= '
      ' ;
+        } 
+        
+        $this->printer->writeln($print);
     }
 
     /**
@@ -303,6 +320,16 @@ public function onAfterFeatureTested(AfterFeatureTested $event)
         } else {
             $this->failedFeatures[] = $this->currentFeature;
         }
+                      
+        
+        $print = 'Feature result : ' . $this->currentFeature->getPassedClass() . '
      ';
+        if ($this->currentFeature->getTotalAmountOfScenarios() > 0 ) {
+            $print .= 'Features passed :' . $this->currentFeature->getPercentPassed() . '
      ' ;
+            $print .= 'Features failed :' . $this->currentFeature->getPercentFailed() . '
      ' ;
+        }
+        $print .= '
      ' ;   
+        
+        $this->printer->writeln($print);
     }
 
     /**
@@ -315,6 +342,17 @@ public function onBeforeScenarioTested(BeforeScenarioTested $event)
         $scenario->setTags($event->getScenario()->getTags());
         $scenario->setLine($event->getScenario()->getLine());
         $this->currentScenario = $scenario;
+        
+        $print = 'Scenario ID : ' . $scenario->getId() . '
      ';
+        $print .= 'Scenario Name : ' . $scenario->getName() . '
      ';
+        foreach($scenario->getTags() as $tag) {
+            $print .= $tag ;
+        }      
+        if (count($scenario->getTags()) > 0) {
+            $print .= '
      ' ;
+        }   
+
+        $this->printer->writeln($print);
     }
 
     /**
@@ -334,6 +372,14 @@ public function onAfterScenarioTested(AfterScenarioTested $event)
 
         $this->currentScenario->setPassed($event->getTestResult()->isPassed());
         $this->currentFeature->addScenario($this->currentScenario);
+        
+        if ($this->currentScenario->isPassed()) {
+            $print = 'passed' ;
+        } else {
+            $print = 'failed' ;
+        }
+        
+        $this->printer->writeln($print);
     }
 
     /**
@@ -395,6 +441,17 @@ public function onAfterStepTested(AfterStepTested $event)
         }
 
         $this->currentScenario->addStep($step);
+        
+        
+        if ($step->getPassed()) {
+            $print = 'success' ;
+        } else {
+            $print = 'danger' ;
+        }
+        $print .= '
      ' ;
+        $print .= $step->getKeyWord() . ' - ' . $step->getText() ;
+        
+        $this->printer->writeln($print);
     }
     //
 
@@ -406,109 +463,14 @@ public function onAfterStepTested(AfterStepTested $event)
      */
     public function createReport()
     {
-    
-    
-
-    /*
-        $templatePath = dirname(__FILE__) . '/../../templates';
-        $loader = new Twig_Loader_Filesystem($templatePath);
-        $twig = new Twig_Environment($loader, array());
-
-        $test = $twig->render('index.html.twig',
-            array(
-                'suites' => $this->suites,
-                'failedScenarios' => $this->failedScenarios,
-                'passedScenarios' => $this->passedScenarios,
-                'failedSteps' => $this->failedSteps,
-                'passedSteps' => $this->passedSteps,
-                'failedFeatures' => $this->failedFeatures,
-                'passedFeatures' => $this->passedFeatures,
-            )
-        );
-        
-        $this->printer->write($test);
-       */ 
-        
+
         //global
         $print = count($this->failedFeatures) . ' features failed of ' . (count($this->failedFeatures) + count($this->passedFeatures)) . '
      ' ;
         $print .= count($this->failedScenarios) . ' scenarios failed of ' . (count($this->failedScenarios) + count($this->passedScenarios)) . '
      ' ;
         $print .= count($this->failedSteps) . ' steps failed of ' . (count($this->failedSteps) + count($this->passedSteps)) . '
      ' ;
         
-        $print .= '
      VUE GLOBALE
      ' ;
-        
-        foreach($this->suites as $suite) {
-            $print .= 'Suite : ' . $suite->getName() . '

      ';
-            
-            foreach($suite->getFeatures() as $feature) {
-                $print .= 'Feature ID : ' . $feature->getId() . '
      ';
-                $print .= 'Feature result : ' . $feature->getPassedClass() . '
      ';
-                $print .= 'Feature name : ' . $feature->getName() . '
      ';
-                $print .= 'Feature description : ' . $feature->getDescription() . '
      ';
-                foreach($feature->getTags() as $tag) {
-                    $print .= $tag ;
-                }
-                if (count($feature->getTags() > 0)) {
-                    $print .= '
      ' ;
-                }
-                if ($feature->getTotalAmountOfScenarios() > 0 ) {
-                    $print .= 'Features passed :' . $feature->getPercentPassed() . '
      ' ;
-                    $print .= 'Features failed :' . $feature->getPercentFailed() . '
      ' ;
-                }
-                $print .= '
      ' ;
+        $this->printer->writeBeginning($print) ;
 
-            }
-        }
-        
-        $print .= '
      VUE DETAILLEE
      ' ;
-        
-        foreach($this->suites as $suite) {    
-            foreach($suite->getFeatures() as $feature) {
-                $print .= 'Feature ID : ' . $feature->getId() . '
      ';
-                $print .= 'Feature result : ' . $feature->getPassedClass() . '
      ';
-                $print .= 'Feature name : ' . $feature->getName() . '
      ';
-                $print .= 'Feature description : ' . $feature->getDescription() . '
      ';
-                foreach($feature->getTags() as $tag) {
-                    $print .= $tag ;
-                }                
-                if (count($feature->getTags()) > 0) {
-                    $print .= '
      ' ;
-                }                
-                if ($feature->getTotalAmountOfScenarios() > 0 ) {
-                    $print .= 'Features passed :' . $feature->getPercentPassed() . '
      ' ;
-                    $print .= 'Features failed :' . $feature->getPercentFailed() . '
      ' ;
-                }
-                $print .= '
      ' ;
-                foreach($feature->getScenarios() as $scenario) {
-                    if ($scenario->isPassed()) {
-                        $print .= 'passed' ;
-                    } else {
-                        $print .= 'failed' ;
-                    }
-                    $print .= '
      ' ;
-                    $print .= 'Scenario ID : ' . $scenario->getId() . '
      ';
-                    $print .= 'Scenario Name : ' . $scenario->getName() . '
      ';
-                    foreach($scenario->getTags() as $tag) {
-                        $print .= $tag ;
-                    }      
-                    if (count($scenario->getTags()) > 0) {
-                        $print .= '
      ' ;
-                    }     
-                    foreach($scenario->getSteps() as $step) {
-                        if ($step->getPassed()) {
-                            $print .= 'success' ;
-                        } else {
-                            $print .= 'danger' ;
-                        }
-                        $print .= '
      ' ;
-                        $print .= $step->getKeyWord() . ' - ' . $step->getText() ;
-                    }
-                }
-            }                
-        }
-
-        $this->printer->write($print);
-        $this->printer->writeln('toto');
-        
     }
 
     /**
diff --git a/src/Printer/FileOutputPrinter.php b/src/Printer/FileOutputPrinter.php
index 3bb7391..8e835c2 100644
--- a/src/Printer/FileOutputPrinter.php
+++ b/src/Printer/FileOutputPrinter.php
@@ -155,6 +155,18 @@ public function writeln($messages = '')
         $file = $this->outputPath . DIRECTORY_SEPARATOR . 'report.html';
         file_put_contents($file, $messages, FILE_APPEND);
     }
+    
+    /**
+     * Writes  message(s) at start of the output console.
+     *
+     * @param string|array $messages message or array of messages
+     */
+    public function writeBeginning($messages = '') {
+        $file = $this->outputPath . DIRECTORY_SEPARATOR . 'report.html';
+        $fileContents = file_get_contents($file);
+        file_put_contents($file, $messages . $fileContents);
+
+    }
 
     /**
      * Clear output console, so on next write formatter will need to init (create) it again.

From cc2e3578deea1b997cb49d22dfe71cc8d1095964 Mon Sep 17 00:00:00 2001
From: DaSayan 
Date: Tue, 10 Mar 2015 10:31:07 +0100
Subject: [PATCH 39/55] Integration of Behat2 HTML report format (a little
 dirty)

---
 src/Classes/Step.php                 |  12 +-
 src/Formatter/BehatHTMLFormatter.php | 720 ++++++++++++++++++++++++---
 2 files changed, 658 insertions(+), 74 deletions(-)

diff --git a/src/Classes/Step.php b/src/Classes/Step.php
index 2b908f4..b343771 100644
--- a/src/Classes/Step.php
+++ b/src/Classes/Step.php
@@ -16,7 +16,7 @@ class Step
     private $arguments;
     private $line;
     private $result;
-    private $passed;
+    private $status;
     private $exception;
     private $definition;
 
@@ -135,16 +135,16 @@ public function setDefinition($definition)
     /**
      * @return mixed
      */
-    public function getPassed()
+    public function getStatus()
     {
-        return $this->passed;
+        return $this->status;
     }
 
     /**
-     * @param mixed $passed
+     * @param mixed $status
      */
-    public function setPassed($passed)
+    public function setStatus($status)
     {
-        $this->passed = $passed;
+        $this->status = $status;
     }
 }
diff --git a/src/Formatter/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php
index 7a46923..b987b82 100644
--- a/src/Formatter/BehatHTMLFormatter.php
+++ b/src/Formatter/BehatHTMLFormatter.php
@@ -22,8 +22,7 @@
 use emuse\BehatHTMLFormatter\Classes\Step;
 use emuse\BehatHTMLFormatter\Classes\Suite;
 use emuse\BehatHTMLFormatter\Printer\FileOutputPrinter;
-use Twig_Environment;
-use Twig_Loader_Filesystem;
+
 
 /**
  * Class BehatHTMLFormatter
@@ -111,6 +110,16 @@ class BehatHTMLFormatter implements Formatter
      * @var Step[]
      */
     private $passedSteps;
+    
+    /**
+     * @var Step[]
+     */
+    private $pendingSteps;
+    
+    /**
+     * @var Step[]
+     */
+    private $skippedSteps;
     //
 
     //
@@ -250,8 +259,17 @@ public function getOutputPath()
      */
     public function onBeforeExercise(BeforeExerciseCompleted $event)
     {
-        //creating report file
-        $this->printer->write() ;
+        //creating report file with CSS at head
+        $print = "
+        
+        
+            
+            Behat Test Suite " . $this->getCSS() . "
+        
+        
+        
      " ;
+        
+        $this->printer->write($print) ;
     }
 
     /**
@@ -259,7 +277,98 @@ public function onBeforeExercise(BeforeExerciseCompleted $event)
      */
     public function onAfterExercise(AfterExerciseCompleted $event)
     {
-        $this->createReport();
+        //--> features results
+        $strFeatPassed = '' ;
+        if (count($this->passedFeatures) > 0) {
+            $strFeatPassed = ' '.count($this->passedFeatures).' success';
+        }      
+        
+        $strFeatFailed = '' ;    
+        $sumRes = 'passed' ;        
+        if (count($this->failedFeatures) > 0) {
+            $strFeatFailed = ' '.count($this->failedFeatures).' fail';
+            $sumRes = 'failed' ;
+        } 
+        
+        //--> scenarios results
+        $strScePassed = '' ;
+        if (count($this->passedScenarios) > 0) {
+            $strScePassed = ' '.count($this->passedScenarios).' success';
+        }             
+        
+        $strSceFailed = '' ;
+        if (count($this->failedScenarios) > 0) {
+            $strSceFailed = ' '.count($this->failedScenarios).' fail';
+        } 
+        
+        //--> steps results
+        $strStepsPassed = '' ;
+        if (count($this->passedSteps) > 0) {
+            $strStepsPassed = ' '.count($this->passedSteps).' success';
+        }             
+        
+        $strStepsPending = '' ;
+        if (count($this->pendingSteps) > 0) {
+            $strStepsPending = ' '.count($this->pendingSteps).' pending';
+        } 
+
+        $strStepsSkipped = '' ;
+        if (count($this->skippedSteps) > 0) {
+            $strStepsSkipped = ' '.count($this->skippedSteps).' skipped';
+        } 
+        
+        $strStepsFailed = '' ;
+        if (count($this->failedSteps) > 0) {
+            $strStepsFailed = ' '.count($this->failedSteps).' fail';
+        } 
+        
+        
+        //totals
+        $featTotal = (count($this->failedFeatures) + count($this->passedFeatures));
+        $sceTotal = (count($this->failedScenarios) + count($this->passedScenarios)) ;
+        $stepsTotal = (count($this->failedSteps) + count($this->passedSteps) + count($this->skippedSteps) + count($this->pendingSteps)) ;
+
+        //list of pending steps to display
+        $strPendingList = '' ;
+        if (count($this->pendingSteps) > 0) {
+            foreach($this->pendingSteps as $pendingStep) {
+                $strPendingList .= '
+                    
    • ' . $pendingStep->getKeyword() . ' ' . $pendingStep->getText() . '
      • ' ;
+            }
+                $strPendingList = '
+            
      Pending steps : 
+                
        ' . $strPendingList . '
+                
      
+            
      ';
+        }
+
+        
+        $print = '
+        
      
+            
      
+                
      
+                    '.$featTotal.' features ('.$strFeatPassed.$strFeatFailed.' )
+                
                  
+                
      
+                    '.$sceTotal.' scenarios ('.$strScePassed.$strSceFailed.' )
+                
      
+                
      
+                    '.$stepsTotal.' steps ('.$strStepsPassed.$strStepsPending.$strStepsSkipped.$strStepsFailed.' )
+                
      
+                
      
+                XmXX.XXXs
+                
      
+            
      
+            
      
+                [+] all
+                [-] all
+            
      
+        
       ' .$strPendingList. '
+    
      ' . $this->getJS() . '
+
+' ;
+
+    $this->printer->writeln($print) ;
     }
 
     /**
@@ -270,7 +379,8 @@ public function onBeforeSuiteTested(BeforeSuiteTested $event)
         $this->currentSuite = new Suite();
         $this->currentSuite->setName($event->getSuite()->getName());
         
-        $print = 'Suite : ' . $event->getSuite()->getName() . '

      ' ;
+        $print = '
+        
      Suite : ' . $event->getSuite()->getName() . '
      ';
         $this->printer->writeln($print);
     }
 
@@ -296,15 +406,23 @@ public function onBeforeFeatureTested(BeforeFeatureTested $event)
         $feature->setFile($event->getFeature()->getFile());
         $this->currentFeature = $feature;    
         
-        $print = 'Feature ID : ' . $this->currentFeature->getId() . '
      ';
-        $print .= 'Feature name : ' . $this->currentFeature->getName() . '
      ';
-        $print .= 'Feature description : ' . $this->currentFeature->getDescription() . '
      ';
+        //feature head
+        $print = '
+        
      
+            
      
+                 Feature: 
+                ' . $this->currentFeature->getName() . '
+            
      
+            
      ' . $this->currentFeature->getDescription() . '
      
+            
        ' ;
         foreach($this->currentFeature->getTags() as $tag) {
-            $print .= $tag ;
-        }                
-        if (count($this->currentFeature->getTags()) > 0) {
-            $print .= '
        ' ;
-        } 
+            $print .= '
+                
      • @' . $tag .'
        • ' ;
+        }      
+        $print .= '
+            
      ' ;
+        
+        //TODO path is missing (?)
         
         $this->printer->writeln($print);
     }
@@ -321,13 +439,20 @@ public function onAfterFeatureTested(AfterFeatureTested $event)
             $this->failedFeatures[] = $this->currentFeature;
         }
                       
-        
-        $print = 'Feature result : ' . $this->currentFeature->getPassedClass() . '
      ';
-        if ($this->currentFeature->getTotalAmountOfScenarios() > 0 ) {
-            $print .= 'Features passed :' . $this->currentFeature->getPercentPassed() . '
      ' ;
-            $print .= 'Features failed :' . $this->currentFeature->getPercentFailed() . '
      ' ;
+        //list of results
+        $print = '
+            
      Feature has ' . $this->currentFeature->getPassedClass() ;
+
+        //percent only if failed scenarios
+        if ($this->currentFeature->getTotalAmountOfScenarios() > 0 && $this->currentFeature->getPassedClass() === 'failed') {
+            $print .= '
+                Scenarios passed : ' . round($this->currentFeature->getPercentPassed(), 2) . '%, 
+                Scenarios failed : ' . round($this->currentFeature->getPercentFailed(), 2) . '%' ;
         }
-        $print .= '
      ' ;   
+
+        $print .= '
+            
      
+        
      ';   
         
         $this->printer->writeln($print);
     }
@@ -342,15 +467,26 @@ public function onBeforeScenarioTested(BeforeScenarioTested $event)
         $scenario->setTags($event->getScenario()->getTags());
         $scenario->setLine($event->getScenario()->getLine());
         $this->currentScenario = $scenario;
-        
-        $print = 'Scenario ID : ' . $scenario->getId() . '
      ';
-        $print .= 'Scenario Name : ' . $scenario->getName() . '
      ';
+
+        //scenario head
+        $print = '
+            
      
+                
        ' ;
         foreach($scenario->getTags() as $tag) {
-            $print .= $tag ;
-        }      
-        if (count($scenario->getTags()) > 0) {
-            $print .= '
        ' ;
-        }   
+            $print .= '
+                    
      • @' . $tag .'
        • ';
+        }         
+        $print .= '
+                
      ';        
+        
+        $print .= '
+                
      
+                    ' . $scenario->getId() . ' Scenario: 
+                    ' . $scenario->getName() . '
+                
      
+                
        ' ;
+        
+        //TODO path is missing
 
         $this->printer->writeln($print);
     }
@@ -373,11 +509,9 @@ public function onAfterScenarioTested(AfterScenarioTested $event)
         $this->currentScenario->setPassed($event->getTestResult()->isPassed());
         $this->currentFeature->addScenario($this->currentScenario);
         
-        if ($this->currentScenario->isPassed()) {
-            $print = 'passed' ;
-        } else {
-            $print = 'failed' ;
-        }
+        $print = '
+                
      
+            
      ';
         
         $this->printer->writeln($print);
     }
@@ -427,57 +561,507 @@ public function onAfterStepTested(AfterStepTested $event)
         $step->setLine($event->getStep()->getLine());
         $step->setArguments($event->getStep()->getArguments());
         $step->setResult($result);
-        $step->setPassed($result->isPassed());
-
-        if ($result instanceof ExecutedStepResult) {
+        
+        //What is the result of this step ?
+        if (is_a($result, 'Behat\Behat\Tester\Result\UndefinedStepResult')) {
+            //pending step -> no definition to load
+            $step->setStatus('pending') ;
+            $this->pendingSteps[] = $step;
+            
+        } else if (is_a($result, 'Behat\Behat\Tester\Result\SkippedStepResult')){
+            //skipped step
             $step->setDefinition($result->getStepDefinition());
-            $exception = $result->getException();
-            if ($exception) {
-                $step->setException($exception->getMessage());
-                $this->failedSteps[] = $step;
-            } else {
-                $this->passedSteps[] = $step;
-            }
+            $step->setStatus('skipped') ;
+            $this->skippedSteps[] = $step;
+        } else {
+            //failed or passed
+            if ($result instanceof ExecutedStepResult) {
+                $step->setDefinition($result->getStepDefinition());
+                $exception = $result->getException();
+                if ($exception) {
+                    $step->setException($exception->getMessage());
+                    $step->setStatus('failed') ;
+                    $this->failedSteps[] = $step;
+                } else {
+                    $step->setStatus('passed') ;
+                    $this->passedSteps[] = $step;
+                }
+            }         
         }
 
         $this->currentScenario->addStep($step);
         
-        
-        if ($step->getPassed()) {
-            $print = 'success' ;
-        } else {
-            $print = 'danger' ;
+        //path displayed only if available (it's not available in undefined steps)
+        $strPath = '' ;
+        if ($step->getDefinition() !== NULL ) {
+            $strPath = $step->getDefinition()->getPath() ;
+        } 
+
+        $print = '
+                    
    • 
+                        
      
+                            ' . $step->getKeyWord() . ' 
+                            ' . $step->getText() . ' 
+                            ' . $strPath . '
+                        
      ' ;
+        if (!empty($step->getException())) {
+            $print .= '
+                        
      ' . $step->getException() . '
      ' ;
         }
-        $print .= '
      ' ;
-        $print .= $step->getKeyWord() . ' - ' . $step->getText() ;
+        $print .=  '
+                    
      • ';
         
         $this->printer->writeln($print);
     }
-    //      
 
     /**
-     * Generate the final html output file from the tests results
-     * and save it to the location specified in $output
-     *
-     * @return void
+     * @param $text
      */
-    public function createReport()
+    public function printText($text)
     {
+        file_put_contents('php://stdout', $text);
+    }
+    
+    
+    /**
+     * WIP : to include a selected CSS file
+     *
+     * @param $file
+     */
+    public function getCSS($file = '') {
+    
+        return "
 
-        //global
-        $print = count($this->failedFeatures) . ' features failed of ' . (count($this->failedFeatures) + count($this->passedFeatures)) . '
      ' ;
-        $print .= count($this->failedScenarios) . ' scenarios failed of ' . (count($this->failedScenarios) + count($this->passedScenarios)) . '
      ' ;
-        $print .= count($this->failedSteps) . ' steps failed of ' . (count($this->failedSteps) + count($this->passedSteps)) . '
      ' ;
-        
-        $this->printer->writeBeginning($print) ;
+            " ;
+    
+    }
+    
     /**
-     * @param $text
-     */
-    public function printText($text)
-    {
-        file_put_contents('php://stdout', $text);
+     * WIP : to include a selected JS file
+     *
+     * @param $file
+     */    
+    public function getJS($file = '') {
+    
+        return "
+        " ;
+    
     }
 }

From 59dd6f21bff9639015d5ca0f4ee9167d3432ac25 Mon Sep 17 00:00:00 2001
From: DaSayan 
Date: Tue, 10 Mar 2015 10:38:59 +0100
Subject: [PATCH 40/55] Update of composer.json

---
 composer.json | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index b804ff2..7e10d89 100644
--- a/composer.json
+++ b/composer.json
@@ -1,23 +1,22 @@
 {
-    "name": "emuse/behat-html-formatter",
-    "description": "This will create a html formatter for Behat.",
+    "name": "dasayan/behat-html-formatter",
+    "description": "Fork of the dutchiexl HTML report for behat",
     "authors": [
         {
-            "name": "Neal Vanmeert",
-            "email": "neal@emuse.be"
+            "name": "DaSayan",
+            "email": "glennwall@free.fr"
         }
     ],
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.0",
-        "twig/twig":"~1.0",
         "behat/behat": "~3.0"
     },
     "require-dev": {
     },
     "autoload": {
         "psr-4": {
-            "emuse\\BehatHTMLFormatter\\": "src/"
+            "dasayan\\BehatHTMLFormatter\\": "src/"
         }
     }
 }

From 93acd83d3b972e0685d2d7cc947a6ab6fc92f295 Mon Sep 17 00:00:00 2001
From: DaSayan 
Date: Tue, 10 Mar 2015 10:42:18 +0100
Subject: [PATCH 41/55] Update of README.md and composer.json

---
 README.md     | 16 +++++-----------
 composer.json |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 07ec137..c30ccb9 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,9 @@ BehatHtmlFormatterPlugin
 Suggestions are more than welcome !
 
 This is a behat 3 extension to generate HTML reports from your test results.
+Fork of dutchiexl HTML report for behat.
+
+Actually, it can generate a HTML report with Behat 2 HTML report format 
 
 Add this to your behat.yml file:
 
@@ -12,20 +15,11 @@ formatters:
     html:
         output_path: %paths.base%/build/html/behat
   extensions:
-    emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension:
+    dasayan\BehatHTMLFormatter\BehatHTMLFormatterExtension:
         name: html
    The *output* parameter is relative to %paths.base% and, when omitted, will default to that same path. -To be done: -======================== - -1. Store previous runs -2. Add parameters for behat.yml file -3. Add bootstrap as dependency -4. clean up html report -5. Add out parameter +WIP : There is many to be done ! -========================= - diff --git a/composer.json b/composer.json index 7e10d89..9ff2ff2 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "dasayan/behat-html-formatter", - "description": "Fork of the dutchiexl HTML report for behat", + "description": "Fork of dutchiexl HTML report for behat", "authors": [ { "name": "DaSayan", From 5289012b20402a4e2992233d885c3642bcbd0d8a Mon Sep 17 00:00:00 2001 From: DaSayan Date: Tue, 10 Mar 2015 10:51:00 +0100 Subject: [PATCH 42/55] Revert of composer.json modification --- composer.json | 11 ++++++----- future_composer.json | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 future_composer.json diff --git a/composer.json b/composer.json index 9ff2ff2..b804ff2 100644 --- a/composer.json +++ b/composer.json @@ -1,22 +1,23 @@ { - "name": "dasayan/behat-html-formatter", - "description": "Fork of dutchiexl HTML report for behat", + "name": "emuse/behat-html-formatter", + "description": "This will create a html formatter for Behat.", "authors": [ { - "name": "DaSayan", - "email": "glennwall@free.fr" + "name": "Neal Vanmeert", + "email": "neal@emuse.be" } ], "minimum-stability": "dev", "require": { "php": ">=5.3.0", + "twig/twig":"~1.0", "behat/behat": "~3.0" }, "require-dev": { }, "autoload": { "psr-4": { - "dasayan\\BehatHTMLFormatter\\": "src/" + "emuse\\BehatHTMLFormatter\\": "src/" } } } diff --git a/future_composer.json b/future_composer.json new file mode 100644 index 0000000..9ff2ff2 --- /dev/null +++ b/future_composer.json @@ -0,0 +1,22 @@ +{ + "name": "dasayan/behat-html-formatter", + "description": "Fork of dutchiexl HTML report for behat", + "authors": [ + { + "name": "DaSayan", + "email": "glennwall@free.fr" + } + ], + "minimum-stability": "dev", + "require": { + "php": ">=5.3.0", + "behat/behat": "~3.0" + }, + "require-dev": { + }, + "autoload": { + "psr-4": { + "dasayan\\BehatHTMLFormatter\\": "src/" + } + } +} From ceac0106cb963ead4f3c57e6e1789b1db0fe79d5 Mon Sep 17 00:00:00 2001 From: DaSayan Date: Wed, 11 Mar 2015 11:20:37 +0100 Subject: [PATCH 43/55] Adding Timer and memory usage in report --- src/Formatter/BehatHTMLFormatter.php | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/Formatter/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php index b987b82..05e1f17 100644 --- a/src/Formatter/BehatHTMLFormatter.php +++ b/src/Formatter/BehatHTMLFormatter.php @@ -10,6 +10,8 @@ use Behat\Behat\EventDispatcher\Event\BeforeOutlineTested; use Behat\Behat\EventDispatcher\Event\BeforeScenarioTested; use Behat\Behat\Tester\Result\ExecutedStepResult; +use Behat\Testwork\Counter\Memory; +use Behat\Testwork\Counter\Timer; use Behat\Testwork\EventDispatcher\Event\AfterExerciseCompleted; use Behat\Testwork\EventDispatcher\Event\AfterSuiteTested; use Behat\Testwork\EventDispatcher\Event\BeforeExerciseCompleted; @@ -36,11 +38,23 @@ class BehatHTMLFormatter implements Formatter * @var array */ private $parameters; + /** * @var */ private $name; - + + /** + * @var + */ + private $timer; + + /** + * @var + */ + private $memory; + + /** * @param String $outputPath where to save the generated report file */ @@ -131,6 +145,9 @@ function __construct($name, $base_path) { $this->name = $name; $this->printer = new FileOutputPrinter($base_path); + $this->timer = new Timer(); + $this->memory = new Memory(); + } /** @@ -259,6 +276,9 @@ public function getOutputPath() */ public function onBeforeExercise(BeforeExerciseCompleted $event) { + + $this->timer->start(); + //creating report file with CSS at head $print = " @@ -277,6 +297,9 @@ public function onBeforeExercise(BeforeExerciseCompleted $event) */ public function onAfterExercise(AfterExerciseCompleted $event) { + + $this->timer->stop(); + //--> features results $strFeatPassed = '' ; if (count($this->passedFeatures) > 0) { @@ -356,7 +379,7 @@ public function onAfterExercise(AfterExerciseCompleted $event) '.$stepsTotal.' steps ('.$strStepsPassed.$strStepsPending.$strStepsSkipped.$strStepsFailed.' )

    - XmXX.XXXs + '.$this->timer.' - '.$this->memory.'

    From 31eb2cb170f3a2edc70f9fa0e0cb39d3ae48210e Mon Sep 17 00:00:00 2001 From: DaSayan Date: Thu, 12 Mar 2015 16:49:38 +0100 Subject: [PATCH 44/55] WIP abstraction layer for rendering --- src/BehatHTMLFormatterExtension.php | 2 + src/Formatter/BehatHTMLFormatter.php | 626 ++++----------------------- src/Renderer/BaseRenderer.php | 54 +++ src/Renderer/Behat2Renderer.php | 582 +++++++++++++++++++++++++ 4 files changed, 713 insertions(+), 551 deletions(-) create mode 100644 src/Renderer/BaseRenderer.php create mode 100644 src/Renderer/Behat2Renderer.php diff --git a/src/BehatHTMLFormatterExtension.php b/src/BehatHTMLFormatterExtension.php index 830d444..9e6a627 100644 --- a/src/BehatHTMLFormatterExtension.php +++ b/src/BehatHTMLFormatterExtension.php @@ -57,6 +57,7 @@ public function initialize(ExtensionManager $extensionManager) public function configure(ArrayNodeDefinition $builder) { $builder->children()->scalarNode("name")->defaultValue("emusehtml"); + $builder->children()->scalarNode("renderer")->defaultValue("behat2"); $builder->children()->scalarNode('output')->defaultValue('.'); } @@ -70,6 +71,7 @@ public function load(ContainerBuilder $container, array $config) { $definition = new Definition("emuse\\BehatHTMLFormatter\\Formatter\\BehatHTMLFormatter"); $definition->addArgument($config['name']); + $definition->addArgument($config['renderer']); $definition->addArgument('%paths.base%'); $container->setDefinition("html.formatter", $definition) ->addTag("output.formatter"); diff --git a/src/Formatter/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php index 05e1f17..189d738 100644 --- a/src/Formatter/BehatHTMLFormatter.php +++ b/src/Formatter/BehatHTMLFormatter.php @@ -23,6 +23,7 @@ use emuse\BehatHTMLFormatter\Classes\Scenario; use emuse\BehatHTMLFormatter\Classes\Step; use emuse\BehatHTMLFormatter\Classes\Suite; +use emuse\BehatHTMLFormatter\Renderer\BaseRenderer; use emuse\BehatHTMLFormatter\Printer\FileOutputPrinter; @@ -64,12 +65,18 @@ class BehatHTMLFormatter implements Formatter * @param String $base_path Behat base path */ private $base_path; - + /** * Printer used by this Formatter * @param $printer OutputPrinter */ - private $printer; + private $printer; + + /** + * Renderer used by this Formatter + * @param $renderer BaseRenderer + */ + private $renderer; /** * @var Array @@ -141,9 +148,10 @@ class BehatHTMLFormatter implements Formatter * @param $name * @param $base_path */ - function __construct($name, $base_path) + function __construct($name, $renderer, $base_path) { $this->name = $name; + $this->renderer = new BaseRenderer($renderer, $base_path); $this->printer = new FileOutputPrinter($base_path); $this->timer = new Timer(); $this->memory = new Memory(); @@ -217,7 +225,6 @@ public function setParameter($name, $value) * Returns parameter name. * * @param string $name - * * @return mixed */ public function getParameter($name) @@ -267,6 +274,67 @@ public function getOutputPath() { return $this->outputPath; } + + public function getTimer(){ + return $this->timer; + } + + public function getMemory(){ + return $this->memory; + } + + public function getSuites(){ + return $this->suites; + } + + public function getCurrentSuite(){ + return $this->currentSuite; + } + + public function getFeatureCounter(){ + return $this->featureCounter; + } + + public function getCurrentFeature(){ + return $this->currentFeature; + } + + public function getCurrentScenario(){ + return $this->currentScenario; + } + + public function getFailedScenarios(){ + return $this->failedScenarios; + } + + public function getPassedScenarios(){ + return $this->passedScenarios; + } + + public function getFailedFeatures(){ + return $this->failedFeatures; + } + + public function getPassedFeatures(){ + return $this->passedFeatures; + } + + public function getFailedSteps(){ + return $this->failedSteps; + } + + public function getPassedSteps(){ + return $this->passedSteps; + } + + public function getPendingSteps(){ + return $this->pendingSteps; + } + + public function getSkippedSteps(){ + return $this->skippedSteps; + } + // @@ -276,19 +344,8 @@ public function getOutputPath() */ public function onBeforeExercise(BeforeExerciseCompleted $event) { - $this->timer->start(); - - //creating report file with CSS at head - $print = " - - - - Behat Test Suite " . $this->getCSS() . " - - -
    " ; - + $print = $this->renderer->renderBeforeExercise($this) ; $this->printer->write($print) ; } @@ -299,99 +356,8 @@ public function onAfterExercise(AfterExerciseCompleted $event) { $this->timer->stop(); - - //--> features results - $strFeatPassed = '' ; - if (count($this->passedFeatures) > 0) { - $strFeatPassed = ' '.count($this->passedFeatures).' success'; - } - - $strFeatFailed = '' ; - $sumRes = 'passed' ; - if (count($this->failedFeatures) > 0) { - $strFeatFailed = ' '.count($this->failedFeatures).' fail'; - $sumRes = 'failed' ; - } - - //--> scenarios results - $strScePassed = '' ; - if (count($this->passedScenarios) > 0) { - $strScePassed = ' '.count($this->passedScenarios).' success'; - } - - $strSceFailed = '' ; - if (count($this->failedScenarios) > 0) { - $strSceFailed = ' '.count($this->failedScenarios).' fail'; - } - - //--> steps results - $strStepsPassed = '' ; - if (count($this->passedSteps) > 0) { - $strStepsPassed = ' '.count($this->passedSteps).' success'; - } - - $strStepsPending = '' ; - if (count($this->pendingSteps) > 0) { - $strStepsPending = ' '.count($this->pendingSteps).' pending'; - } - - $strStepsSkipped = '' ; - if (count($this->skippedSteps) > 0) { - $strStepsSkipped = ' '.count($this->skippedSteps).' skipped'; - } - - $strStepsFailed = '' ; - if (count($this->failedSteps) > 0) { - $strStepsFailed = ' '.count($this->failedSteps).' fail'; - } - - - //totals - $featTotal = (count($this->failedFeatures) + count($this->passedFeatures)); - $sceTotal = (count($this->failedScenarios) + count($this->passedScenarios)) ; - $stepsTotal = (count($this->failedSteps) + count($this->passedSteps) + count($this->skippedSteps) + count($this->pendingSteps)) ; - - //list of pending steps to display - $strPendingList = '' ; - if (count($this->pendingSteps) > 0) { - foreach($this->pendingSteps as $pendingStep) { - $strPendingList .= ' -
  • ' . $pendingStep->getKeyword() . ' ' . $pendingStep->getText() . '
    • ' ; - } - $strPendingList = ' -
    Pending steps : -
      ' . $strPendingList . ' -
    -
    '; - } - - - $print = ' -
    -
    -

    - '.$featTotal.' features ('.$strFeatPassed.$strFeatFailed.' ) -

    -

    - '.$sceTotal.' scenarios ('.$strScePassed.$strSceFailed.' ) -

    -

    - '.$stepsTotal.' steps ('.$strStepsPassed.$strStepsPending.$strStepsSkipped.$strStepsFailed.' ) -

    -

    - '.$this->timer.' - '.$this->memory.' -

    -
    -
    - [+] all - [-] all -
    -
    ' .$strPendingList. ' -
    ' . $this->getJS() . ' - -' ; - - $this->printer->writeln($print) ; + $print = $this->renderer->renderAfterExercise($this) ; + $this->printer->writeln($print) ; } /** @@ -645,446 +611,4 @@ public function printText($text) file_put_contents('php://stdout', $text); } - - /** - * WIP : to include a selected CSS file - * - * @param $file - */ - public function getCSS($file = '') { - - return " - - " ; - - } - - /** - * WIP : to include a selected JS file - * - * @param $file - */ - public function getJS($file = '') { - - return " - " ; - - } } diff --git a/src/Renderer/BaseRenderer.php b/src/Renderer/BaseRenderer.php new file mode 100644 index 0000000..02c969d --- /dev/null +++ b/src/Renderer/BaseRenderer.php @@ -0,0 +1,54 @@ + + */ + +namespace emuse\BehatHTMLFormatter\Renderer ; + +use emuse\BehatHTMLFormatter\Renderer\Behat2Renderer ; + +class BaseRenderer +{ + + /** + * @var : Renderer(s) asked by config + */ + private $rendererTab; + + + public function __construct($renderer, $base_path) + { + //Getting the list of the renderers + $this->rendererTab = array() ; + $rendererList = explode(',' , $renderer) ; + foreach($rendererList as $r) { + $className = __NAMESPACE__ . '\\' . $r . 'Renderer' ; + $this->rendererTab[] = new $className() ; + } + } + + + /** + * Renders before an exercice. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeExercise($obj) { + + $print = $this->rendererTab[0]->renderBeforeExercise($obj) ; + return $print ; + } + + /** + * Renders after an exercice. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterExercise($obj) { + $print = $this->rendererTab[0]->renderAfterExercise($obj) ; + return $print ; + } +} diff --git a/src/Renderer/Behat2Renderer.php b/src/Renderer/Behat2Renderer.php new file mode 100644 index 0000000..1c7f457 --- /dev/null +++ b/src/Renderer/Behat2Renderer.php @@ -0,0 +1,582 @@ + + */ + +namespace emuse\BehatHTMLFormatter\Renderer ; + + +class Behat2Renderer +{ + + public function __construct() + { + + } + + + /** + * Renders before an exercice. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeExercise($obj) { + + $print = " + + + + Behat Test Suite " . $this->getCSS() . " + + +
    " ; + + return $print ; + } + + /** + * Renders after an exercice. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterExercise($obj) { + //--> features results + $strFeatPassed = '' ; + if (count($obj->getPassedFeatures()) > 0) { + $strFeatPassed = ' '.count($obj->getPassedFeatures()).' success'; + } + + $strFeatFailed = '' ; + $sumRes = 'passed' ; + if (count($obj->getFailedFeatures()) > 0) { + $strFeatFailed = ' '.count($obj->getFailedFeatures()).' fail'; + $sumRes = 'failed' ; + } + + //--> scenarios results + $strScePassed = '' ; + if (count($obj->getPassedScenarios()) > 0) { + $strScePassed = ' '.count($obj->getPassedScenarios()).' success'; + } + + $strSceFailed = '' ; + if (count($obj->getFailedScenarios()) > 0) { + $strSceFailed = ' '.count($obj->getFailedScenarios()).' fail'; + } + + //--> steps results + $strStepsPassed = '' ; + if (count($obj->getPassedSteps()) > 0) { + $strStepsPassed = ' '.count($obj->getPassedSteps()).' success'; + } + + $strStepsPending = '' ; + if (count($obj->getPendingSteps()) > 0) { + $strStepsPending = ' '.count($obj->getPendingSteps()).' pending'; + } + + $strStepsSkipped = '' ; + if (count($obj->getSkippedSteps()) > 0) { + $strStepsSkipped = ' '.count($obj->getSkippedSteps()).' skipped'; + } + + $strStepsFailed = '' ; + if (count($obj->getFailedSteps()) > 0) { + $strStepsFailed = ' '.count($obj->getFailedSteps()).' fail'; + } + + + //totals + $featTotal = (count($obj->getFailedFeatures()) + count($obj->getPassedFeatures())); + $sceTotal = (count($obj->getFailedScenarios()) + count($obj->getPassedScenarios())) ; + $stepsTotal = (count($obj->getFailedSteps()) + count($obj->getPassedSteps()) + count($obj->getSkippedSteps()) + count($obj->getPendingSteps())) ; + + //list of pending steps to display + $strPendingList = '' ; + if (count($obj->getPendingSteps()) > 0) { + foreach($obj->getPendingSteps() as $pendingStep) { + $strPendingList .= ' +
  • ' . $pendingStep->getKeyword() . ' ' . $pendingStep->getText() . '
    • ' ; + } + $strPendingList = ' +
    Pending steps : +
      ' . $strPendingList . ' +
    +
    '; + } + + + $print = ' +
    +
    +

    + '.$featTotal.' features ('.$strFeatPassed.$strFeatFailed.' ) +

    +

    + '.$sceTotal.' scenarios ('.$strScePassed.$strSceFailed.' ) +

    +

    + '.$stepsTotal.' steps ('.$strStepsPassed.$strStepsPending.$strStepsSkipped.$strStepsFailed.' ) +

    +

    + '.$obj->getTimer().' - '.$obj->getMemory().' +

    +
    +
    + [+] all + [-] all +
    +
    ' .$strPendingList. ' +
    ' . $this->getJS() . ' + +' ; + + return $print ; + + } + + /** + * WIP : to include a selected CSS file + * + * @param $file + */ + public function getCSS($file = '') { + + return " + + " ; + + } + + /** + * WIP : to include a selected JS file + * + * @param $file + */ + public function getJS($file = '') { + + return " + " ; + + } +} From 312485b9b934bf986e79d9913b89c900e8410500 Mon Sep 17 00:00:00 2001 From: DaSayan Date: Thu, 12 Mar 2015 18:42:51 +0100 Subject: [PATCH 45/55] WIP abstraction layer for rendering --- src/Formatter/BehatHTMLFormatter.php | 115 +++++---------- src/Renderer/BaseRenderer.php | 110 ++++++++++++++ src/Renderer/Behat2Renderer.php | 206 ++++++++++++++++++++++++++- 3 files changed, 341 insertions(+), 90 deletions(-) diff --git a/src/Formatter/BehatHTMLFormatter.php b/src/Formatter/BehatHTMLFormatter.php index 189d738..a67cf48 100644 --- a/src/Formatter/BehatHTMLFormatter.php +++ b/src/Formatter/BehatHTMLFormatter.php @@ -345,6 +345,7 @@ public function getSkippedSteps(){ public function onBeforeExercise(BeforeExerciseCompleted $event) { $this->timer->start(); + $print = $this->renderer->renderBeforeExercise($this) ; $this->printer->write($print) ; } @@ -356,6 +357,7 @@ public function onAfterExercise(AfterExerciseCompleted $event) { $this->timer->stop(); + $print = $this->renderer->renderAfterExercise($this) ; $this->printer->writeln($print) ; } @@ -368,8 +370,7 @@ public function onBeforeSuiteTested(BeforeSuiteTested $event) $this->currentSuite = new Suite(); $this->currentSuite->setName($event->getSuite()->getName()); - $print = ' -
    Suite : ' . $event->getSuite()->getName() . '
    '; + $print = $this->renderer->renderBeforeSuite($this) ; $this->printer->writeln($print); } @@ -379,6 +380,9 @@ public function onBeforeSuiteTested(BeforeSuiteTested $event) public function onAfterSuiteTested(AfterSuiteTested $event) { $this->suites[] = $this->currentSuite; + + $print = $this->renderer->renderAfterSuite($this) ; + $this->printer->writeln($print); } /** @@ -395,25 +399,8 @@ public function onBeforeFeatureTested(BeforeFeatureTested $event) $feature->setFile($event->getFeature()->getFile()); $this->currentFeature = $feature; - //feature head - $print = ' -
    -

    - Feature: - ' . $this->currentFeature->getName() . ' -

    -

    ' . $this->currentFeature->getDescription() . '

    -
      ' ; - foreach($this->currentFeature->getTags() as $tag) { - $print .= ' -
    • @' . $tag .'
      • ' ; - } - $print .= ' -
    ' ; - - //TODO path is missing (?) - - $this->printer->writeln($print); + $print = $this->renderer->renderBeforeFeature($this) ; + $this->printer->writeln($print); } /** @@ -427,23 +414,9 @@ public function onAfterFeatureTested(AfterFeatureTested $event) } else { $this->failedFeatures[] = $this->currentFeature; } - - //list of results - $print = ' -
    Feature has ' . $this->currentFeature->getPassedClass() ; - - //percent only if failed scenarios - if ($this->currentFeature->getTotalAmountOfScenarios() > 0 && $this->currentFeature->getPassedClass() === 'failed') { - $print .= ' - Scenarios passed : ' . round($this->currentFeature->getPercentPassed(), 2) . '%, - Scenarios failed : ' . round($this->currentFeature->getPercentFailed(), 2) . '%' ; - } - $print .= ' -
    -
    '; - - $this->printer->writeln($print); + $print = $this->renderer->renderAfterFeature($this) ; + $this->printer->writeln($print); } /** @@ -457,26 +430,7 @@ public function onBeforeScenarioTested(BeforeScenarioTested $event) $scenario->setLine($event->getScenario()->getLine()); $this->currentScenario = $scenario; - //scenario head - $print = ' -
    -
      ' ; - foreach($scenario->getTags() as $tag) { - $print .= ' -
    • @' . $tag .'
      • '; - } - $print .= ' -
    '; - - $print .= ' -

    - ' . $scenario->getId() . ' Scenario: - ' . $scenario->getName() . ' -

    -
      ' ; - - //TODO path is missing - + $print = $this->renderer->renderBeforeScenario($this) ; $this->printer->writeln($print); } @@ -498,10 +452,8 @@ public function onAfterScenarioTested(AfterScenarioTested $event) $this->currentScenario->setPassed($event->getTestResult()->isPassed()); $this->currentFeature->addScenario($this->currentScenario); - $print = ' -
    -
    '; - + + $print = $this->renderer->renderAfterScenario($this) ; $this->printer->writeln($print); } @@ -515,6 +467,9 @@ public function onBeforeOutlineTested(BeforeOutlineTested $event) $scenario->setTags($event->getOutline()->getTags()); $scenario->setLine($event->getOutline()->getLine()); $this->currentScenario = $scenario; + + $print = $this->renderer->renderBeforeOutline($this) ; + $this->printer->writeln($print); } /** @@ -534,8 +489,21 @@ public function onAfterOutlineTested(AfterOutlineTested $event) $this->currentScenario->setPassed($event->getTestResult()->isPassed()); $this->currentFeature->addScenario($this->currentScenario); + + $print = $this->renderer->renderAfterOutline($this) ; + $this->printer->writeln($print); } + /** + * @param BeforeStepTested $event + */ + public function onBeforeStepTested(BeforeStepTested $event) + { + $print = $this->renderer->renderBeforeStep($this) ; + $this->printer->writeln($print); + } + + /** * @param AfterStepTested $event */ @@ -576,30 +544,11 @@ public function onAfterStepTested(AfterStepTested $event) $this->passedSteps[] = $step; } } - } - - $this->currentScenario->addStep($step); + } - //path displayed only if available (it's not available in undefined steps) - $strPath = '' ; - if ($step->getDefinition() !== NULL ) { - $strPath = $step->getDefinition()->getPath() ; - } - - $print = ' -
  • -
    - ' . $step->getKeyWord() . ' - ' . $step->getText() . ' - ' . $strPath . ' -
    ' ; - if (!empty($step->getException())) { - $print .= ' - 
    ' . $step->getException() . '
    ' ; - } - $print .= ' -
    • '; + $this->currentScenario->addStep($step); + $print = $this->renderer->renderAfterStep($this) ; $this->printer->writeln($print); } diff --git a/src/Renderer/BaseRenderer.php b/src/Renderer/BaseRenderer.php index 02c969d..2f421f0 100644 --- a/src/Renderer/BaseRenderer.php +++ b/src/Renderer/BaseRenderer.php @@ -51,4 +51,114 @@ public function renderAfterExercise($obj) { $print = $this->rendererTab[0]->renderAfterExercise($obj) ; return $print ; } + + /** + * Renders before a suite. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeSuite($obj) { + $print = $this->rendererTab[0]->renderBeforeSuite($obj) ; + return $print ; + } + + /** + * Renders after a suite. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterSuite($obj) { + $print = $this->rendererTab[0]->renderAfterSuite($obj) ; + return $print ; + } + + /** + * Renders before a feature. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeFeature($obj) { + $print = $this->rendererTab[0]->renderBeforeFeature($obj) ; + return $print ; + } + + /** + * Renders after a feature. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterFeature($obj) { + $print = $this->rendererTab[0]->renderAfterFeature($obj) ; + return $print ; + } + + /** + * Renders before a scenario. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeScenario($obj) { + $print = $this->rendererTab[0]->renderBeforeScenario($obj) ; + return $print ; + } + + /** + * Renders after a scenario. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterScenario($obj) { + $print = $this->rendererTab[0]->renderAfterScenario($obj) ; + return $print ; + } + + /** + * Renders before an outline. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeOutline($obj) { + $print = $this->rendererTab[0]->renderBeforeOutline($obj) ; + return $print ; + } + + /** + * Renders after an outline. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterOutline($obj) { + $print = $this->rendererTab[0]->renderAfterOutline($obj) ; + return $print ; + } + + /** + * Renders before a step. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeStep($obj) { + $print = $this->rendererTab[0]->renderBeforeStep($obj) ; + return $print ; + } + + /** + * Renders after a step. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterStep($obj) { + $print = $this->rendererTab[0]->renderAfterStep($obj) ; + return $print ; + } } diff --git a/src/Renderer/Behat2Renderer.php b/src/Renderer/Behat2Renderer.php index 1c7f457..0ef1e35 100644 --- a/src/Renderer/Behat2Renderer.php +++ b/src/Renderer/Behat2Renderer.php @@ -138,12 +138,204 @@ public function renderAfterExercise($obj) { } + + /** + * Renders before a suite. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeSuite($obj) { + $print = ' +
    Suite : ' . $obj->getCurrentSuite()->getName() . '
    '; + + return $print ; + + } + + /** + * Renders after a suite. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterSuite($obj) { + return '' ; + } + + /** + * Renders before a feature. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeFeature($obj) { + + //feature head + $print = ' +
    +

    + Feature: + ' . $obj->getCurrentFeature()->getName() . ' +

    +

    ' . $obj->getCurrentFeature()->getDescription() . '

    +
      ' ; + foreach($obj->getCurrentFeature()->getTags() as $tag) { + $print .= ' +
    • @' . $tag .'
      • ' ; + } + $print .= ' +
    ' ; + + //TODO path is missing (?) + + return $print ; + } + /** - * WIP : to include a selected CSS file + * Renders after a feature. * - * @param $file + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterFeature($obj) { + //list of results + $print = ' +
    Feature has ' . $obj->getCurrentFeature()->getPassedClass() ; + + //percent only if failed scenarios + if ($obj->getCurrentFeature()->getTotalAmountOfScenarios() > 0 && $obj->getCurrentFeature()->getPassedClass() === 'failed') { + $print .= ' + Scenarios passed : ' . round($obj->getCurrentFeature()->getPercentPassed(), 2) . '%, + Scenarios failed : ' . round($obj->getCurrentFeature()->getPercentFailed(), 2) . '%' ; + } + + $print .= ' +
    +
    '; + + + return $print ; + } + + /** + * Renders before a scenario. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeScenario($obj) { + //scenario head + $print = ' +
    +
      ' ; + foreach($obj->getCurrentScenario()->getTags() as $tag) { + $print .= ' +
    • @' . $tag .'
      • '; + } + $print .= ' +
    '; + + $print .= ' +

    + ' . $obj->getCurrentScenario()->getId() . ' Scenario: + ' . $obj->getCurrentScenario()->getName() . ' +

    +
      ' ; + + //TODO path is missing + + return $print ; + } + + /** + * Renders after a scenario. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterScenario($obj) { + $print = ' +
    +
    '; + + return $print ; + } + + /** + * Renders before an outline. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeOutline($obj) { + return '' ; + } + + /** + * Renders after an outline. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterOutline($obj) { + return '' ; + } + + /** + * Renders before a step. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderBeforeStep($obj) { + + return '' ; + } + + /** + * Renders after a step. + * + * @param object : BehatHTMLFormatter object + * @return string : HTML generated + */ + public function renderAfterStep($obj) { + + $steps = $obj->getCurrentScenario()->getSteps() ; + $step = end($steps) ; //needed because of strict standards + + //path displayed only if available (it's not available in undefined steps) + $strPath = '' ; + if ($step->getDefinition() !== NULL ) { + $strPath = $step->getDefinition()->getPath() ; + } + + $print = ' +
  • +
    + ' . $step->getKeyWord() . ' + ' . $step->getText() . ' + ' . $strPath . ' +
    ' ; + if (!empty($step->getException())) { + $print .= ' + 
    ' . $step->getException() . '
    ' ; + } + $print .= ' +
    • '; + + return $print ; + } + + + + + /** + * To include CSS + * + * @return string : HTML generated */ - public function getCSS($file = '') { + public function getCSS() { return "