Merge pull request #43 from kribblo/master

--specs: Fix a TypeError, handle the "requests": [number] example from the docs

Author: marcelduran

lib/specs.js

@@ -125,10 +125,15 @@ function specsRunner(specs, reporter, callback, err, data) {
         path.pop();
         return;
       }
-      if (typeof data[key] === 'object') {
-        traverse(specs[key], data[key]);
+
+      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();
       } else {
-        tests.push(buildTest(path.join('.'), specs[key], data[key], defaults));
+        tests.push(buildTest(path.join('.'), spec, data[key], defaults));
         path.pop();
       }
     });

test/fixtures/specs.json

@@ -14,11 +14,6 @@
         "text": "page load time: {actual} should be less than {expected}",
         "max": 5000
       },
-      "foo": {
-        "bar": {
-          "max": 100
-        }
-      },
       "score_keep-alive": {
         "min": 90
       }

test/specs-test.js

@@ -32,10 +32,10 @@ describe('Example WebPageTest for Specs', function() {
         runs: 3,
         waitResults: '127.0.0.1:8000',
         medianMetric: 'TTFB',
-        specs: '{"defaults":{"suiteName":"WPT test of test (not really an error)"},"median":{"firstView":{"render":300,"TTFB":100,"loadTime":4000}}}',
+        specs: '{"defaults":{"suiteName":"WPT test of test (not really an error)"},"median":{"firstView":{"render":800,"TTFB":600,"loadTime":4000}}}',
         reporter: 'min'
       }, function(err) {
-        assert.equal(err, 2);
+        assert.equal(err, 0);
         done();
       });
       setTimeout(function() {
@@ -49,7 +49,7 @@ describe('Example WebPageTest for Specs', function() {
         specs: path.join(__dirname, './fixtures/specs.json'),
         reporter: 'spec'
       }, function(err) {
-        assert.equal(err, 1);
+        assert.equal(err, 0);
         done();
       });
     });