Merge pull request #36 from octalmage/PHP-185

PHP-185 - Display stats for results.

Author: octalmage

src/js/run.js

@@ -131,22 +131,28 @@ function displayReport( response ) {
 	resetDisplay();
 	var $ = jQuery;
 	var compatible = 1;
+	// Keep track of the number of failed plugins/themes.
+	var failedCount = 0;
 	var errorsRegex = /(\d*) ERRORS?/g;
 	var warningRegex = /(\d*) WARNINGS?/g;
 	var updateVersionRegex = /e: (.*?);/g;
 	var currentVersionRegex = /n: (.*?);/g;
+	// Grab and compile our template.
+	var source = $( '#result-template' ).html();
+	var template = Handlebars.compile( source );
 	$( '#runButton' ).removeClass( 'button-primary-disabled' );
 	$( '.spinner' ).hide();
 	$( '#testResults' ).text( response );
 	$( '#footer' ).show();
 	$( '#runButton' ).val( 'Re-run' );
 	// Separate plugins/themes.
 	var plugins = response.replace( /^\s+|\s+$/g, '' ).split( 'Name: ' );
+	
+	// Remove the first item, it's empty.
+	plugins.shift();
+	
 	// Loop through them.
 	for ( var x in plugins ) {
-		if ( '' === plugins[x].trim() ) {
-			continue;
-		}
 		var updateVersion;
 		var updateAvailable = 0;
 		var passed = 1;
@@ -166,6 +172,7 @@ function displayReport( response ) {
 		if ( parseInt( errors ) > 0 ) {
 			compatible = 0;
 			passed = 0;
+			failedCount++;
 		}
 		// Trim whitespace and newlines from report.
 		log = log.replace( /^\s+|\s+$/g, '' );
@@ -174,8 +181,6 @@ function displayReport( response ) {
 			skipped = 1;
 		}
 		// Use handlebars to build our template.
-		var source = $( '#result-template' ).html();
-		var template = Handlebars.compile( source );
 		var context = {
 			plugin_name: name,
 			warnings: warnings,
@@ -189,10 +194,14 @@ function displayReport( response ) {
 		var html = template( context );
 		$('#standardMode').append( html );
 	}
+
 	// Display global compatibility status.
 	if ( compatible ) {
 		$( '#standardMode' ).prepend( '<h3>Your WordPress install is PHP ' + test_version + ' compatible.</h3>' );
 	} else {
+		// Display scan stats.
+		$( '#standardMode' ).prepend( '<p>' + failedCount + ' out of ' + plugins.length + ' plugins/themes are not compatible.</p>' );
+		
 		$( '#standardMode' ).prepend( '<h3>Your WordPress install is not PHP ' + test_version + ' compatible.</h3>' );
 	}
-}
+}

tests/qunit/test-run.js

@@ -59,6 +59,7 @@ QUnit.test( 'Render test pass', function( assert ) {
 	assert.ok( $('.wpe-results-card').length == 2, 'There are 2 results.' );
 	assert.ok( $('#standardMode').text().includes( 'Your WordPress install is PHP 5.5 compatible.' ), 'Test did pass.' );
 	assert.ok( '#038103' === helpers.rgb2hex( $( ".wpe-results-card" ).eq( 0 ).css( 'border-left-color' ) ), 'First plugin marked as passed.' );
+	assert.ok( ! $( '#standardMode' ).text().includes( '0 out of 2' ), 'No scan stats are shown.' );
 });
 
 QUnit.test( 'Render test fail', function( assert ) {
@@ -79,6 +80,7 @@ QUnit.test( 'Render test fail', function( assert ) {
 	assert.ok( ! $('#runButton').hasClass('button-primary-disabled'), "Run button isn't disabled" );
 	assert.ok( $('.wpe-results-card').length == 7, 'There are 7 results.' );
 	assert.ok( $('#standardMode').text().includes( 'Your WordPress install is not PHP 5.5 compatible.' ), 'Test did not pass.' );
+	assert.ok( $( '#standardMode' ).text().includes( '1 out of 7' ), 'Scan stats are correct' );
 });
 
 QUnit.test( 'Render test skip', function( assert ) {