Fix tests

lib/rulesChecker.js

@@ -4,7 +4,6 @@ var RulesChecker = function() {
     'use strict';
 
     this.check = function(data, policies) {
-        var deferred = Q.defer();
 
         var results = {};
         var err = null;
@@ -24,7 +23,7 @@ var RulesChecker = function() {
                     if (data.toolsResults[policy.tool].offenders &&
                         data.toolsResults[policy.tool].offenders[metricName] &&
                         data.toolsResults[policy.tool].offenders[metricName].length > 0) {
-                            //rule.offenders = data.toolsResults[policy.tool].offenders[metricName];
+                            rule.offenders = data.toolsResults[policy.tool].offenders[metricName];
                     }
 
                     rule.bad = rule.value > policy.isOkThreshold;
@@ -42,10 +41,7 @@ var RulesChecker = function() {
             }
         }
 
-        data.rules = results;
-        deferred.resolve(data);
-
-        return deferred.promise;
+        return results;
     };
 };
 

lib/runner.js

@@ -6,6 +6,8 @@ var rulesChecker = require('./rulesChecker');
 var Runner = function(params) {
     'use strict';
 
+    var deferred = Q.defer();
+
     // The pivot format
     var data = {
         params: params,
@@ -13,26 +15,28 @@ var Runner = function(params) {
     };
 
     // Execute Phantomas first
-    var run = phantomasWrapper.execute(data);
+    phantomasWrapper.execute(data).then(function(phantomasResults) {
+        data.toolsResults.phantomas = phantomasResults;
 
-    // Other tools go here
+        // Other tools go there
 
 
-    // Read each policy and save the results
-    run.then(function() {
+        // Rules checker
         var policies = require('./metadata/policies.json');
-        return rulesChecker.check(data, policies);
+        data.rules = rulesChecker.check(data, policies);
+
+
+        deferred.resolve(data);
+
+    }).fail(function(err) {
+        console.log('Run failed');
+        console.log(err);
+
+        deferred.reject(err);
     });
 
-    // TODO : error handler
-    /*run.catch(function(err) {
-        console.log('The run failed');
-        console.log(err);
-    });*/
 
-    run.done(data);
-
-    return run;
+    return deferred.promise;
 };
 
 module.exports = Runner;

lib/tools/phantomasWrapper.js

@@ -97,8 +97,9 @@ var PhantomasWrapper = function() {
                 console.log('All ' + triesNumber + ' attemps failed for the test');
                 deferred.reject(err);
             } else {
-                data.toolsResults.phantomas = json;
-                deferred.resolve(data);
+
+                // Success!!!
+                deferred.resolve(json);
             }
         });
 

lib/yellowlabtools.js

@@ -30,7 +30,6 @@ var YellowLabTools = function(url, options) {
         var runner = new Runner(params);
 
         runner.then(function(data) {
-            console.log(data);
             deferred.resolve(data);
         });
     }