Merge branch 'master' of github.com:marcelduran/webpagetest-api

Sync

Author: marcelduran

lib/specs.js

@@ -6,13 +6,13 @@
  */
 
 var fs = require('fs'),
-    Mocha = require('mocha'),
-    assert = require('assert');
+  Mocha = require('mocha'),
+  assert = require('assert');
 
 function buildSuite(defaults, tests) {
-  describe(defaults.suiteName || 'WebPageTest', function() {
-    tests.forEach(function(test) {
-      it(test.text, function() {
+  describe(defaults.suiteName || 'WebPageTest', function () {
+    tests.forEach(function (test) {
+      it(test.text, function () {
         if (test.result instanceof Error) {
           return assert.ifError(test.result);
         }
@@ -99,21 +99,24 @@ function buildTest(metric, spec, actual, defaults) {
     .replace('{operation}', operation)
     .replace('{expected}', expected);
 
-  return {text: text, result: result};
+  return {
+    text: text,
+    result: result
+  };
 }
 
 function specsRunner(specs, reporter, callback, err, data) {
   var defaults = {},
-      tests = [],
-      path = [];
+    tests = [],
+    path = [];
 
   // bail if test not complete
   if (!err && (!data || data.statusCode !== 200)) {
     return callback(err, data);
   }
 
   function traverse(specs, data) {
-    Object.keys(specs).forEach(function(key) {
+    Object.keys(specs).forEach(function (key) {
       // bail on default
       if (key === 'defaults' && !path.length) {
         return;
@@ -128,14 +131,37 @@ function specsRunner(specs, reporter, callback, err, data) {
         path.pop();
         return;
       }
-
+      if (Array.isArray(data[key]) && specs[key].find && specs[key].find.length) {
+        specs[key].find.forEach(find => {
+          if (find.key && find.pattern && find.spec) {
+            var arrData = data[key];
+            var filteredData = arrData.find(function (item) {
+              var regex = new RegExp(find.pattern);
+              return regex.test(item[find.key]);
+            });       
+            if (filteredData) {
+              path.push(find.key + "." + filteredData[find.key]);
+              traverse(find.spec, filteredData);
+              path.pop();
+            } else if (find.required) {
+              tests.push({
+                text: path.join('.') + "." + find.key + ".match(" + find.pattern + ")",
+                result: new Error('not found')
+              });
+            }
+          }
+        });
+        path.pop();
+        return;
+      }
       var spec = specs[key];
       if (typeof spec === 'object' && !spec.min && !spec.max) {
         traverse(spec, data[key]);
-      } else if(typeof spec === 'number' && Array.isArray(data[key])) {
-          tests.push(
-            buildTest(path.join('.'), spec, data[key].length, defaults));
-          path.pop();
+        path.pop();
+      } else if (typeof spec === 'number' && Array.isArray(data[key])) {
+        tests.push(
+          buildTest(path.join('.'), spec, data[key].length, defaults));
+        path.pop();
       } else {
         tests.push(buildTest(path.join('.'), spec, data[key], defaults));
         path.pop();
@@ -154,19 +180,24 @@ function specsRunner(specs, reporter, callback, err, data) {
   }
 
   if (err) {
-    tests.push({text: err.message, result: err});
+    tests.push({
+      text: err.message,
+      result: err
+    });
   } else {
     defaults = specs.defaults || {};
     traverse(specs, data.data);
   }
 
   // run mocha suite
-  var mocha = new Mocha({reporter: reporter});
+  var mocha = new Mocha({
+    reporter: reporter
+  });
   mocha.suite.emit('pre-require', global, null, mocha);
   buildSuite(defaults, tests);
-  mocha.run(callback || function(failures) {
+  mocha.run(callback || function (failures) {
     process.exit(failures);
   });
 }
 
-module.exports = specsRunner;
+module.exports = specsRunner;

lib/webpagetest.js

@@ -362,6 +362,9 @@ function runTest(what, options, callback) {
       polling = setTimeout(getTestResults.bind(this, testId,
         resultsOptions, poll.bind(this)), options.pollResults);
     } else {
+      if (!data) {
+        data = {testId: testId};
+      }
       resultsCallback(err, data);
     }
   }