Fixed conflict

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
+sudo: true
 node_js:
   - "0.10"
   - "0.12"
   - "iojs"
   - "4"
+  - "5"

package.json

@@ -10,25 +10,25 @@
   },
   "dependencies": {
     "debounce": "^1.0.0",
-    "deep-equal": "~1.0.0",
+    "deep-equal": "~1.0.1",
     "defined": "~1.0.0",
-    "function-bind": "~1.0.2",
-    "glob": "~5.0.3",
+    "function-bind": "~1.1.0",
+    "glob": "~7.0.0",
     "has": "~1.0.1",
     "inherits": "~2.0.1",
     "minimist": "~1.2.0",
-    "object-inspect": "~1.0.0",
-    "resolve": "~1.1.6",
+    "object-inspect": "~1.1.0",
+    "resolve": "~1.1.7",
     "resumer": "~0.0.0",
-    "string.prototype.trim": "^1.1.1",
-    "through": "~2.3.4"
+    "string.prototype.trim": "~1.1.2",
+    "through": "~2.3.8"
   },
   "devDependencies": {
-    "concat-stream": "~1.4.1",
-    "falafel": "~1.0.1",
-    "js-yaml": "^3.3.1",
+    "concat-stream": "~1.5.1",
+    "falafel": "~1.2.0",
+    "js-yaml": "~3.5.3",
     "tap": "~0.7.1",
-    "tap-parser": "^1.1.6"
+    "tap-parser": "~1.2.2"
   },
   "scripts": {
     "test": "tap test/*.js"

readme.markdown

@@ -261,12 +261,14 @@ Assert that the function call `fn()` throws an exception. `expected`, if present
 
 Assert that the function call `fn()` does not throw an exception.
 
-## t.test(name, cb)
+## t.test(name, [opts], cb)
 
 Create a subtest with a new test handle `st` from `cb(st)` inside the current
 test `t`. `cb(st)` will only fire when `t` finishes. Additional tests queued up
 after `t` will not be run until all subtests finish.
 
+You may pass the same options that [`test()`](#testname-opts-cb) accepts.
+
 ## t.comment(message)
 
 Print a message without breaking the tap output. (Useful when using e.g. `tap-colorize` where output is buffered & `console.log` will print in incorrect order vis-a-vis tap output.)

test/comment.js

@@ -30,7 +30,7 @@ tap.test('no comment', function (assert) {
 
 // Exploratory test, can we call t.comment() passing nothing?
 tap.test('missing argument', function (assert) {
-    assert.plan(2);
+    assert.plan(1);
     var test = tape.createHarness();
     test.createStream();
     test('missing argument', function (t) {
@@ -39,7 +39,6 @@ tap.test('missing argument', function (assert) {
             t.end();
         } catch (err) {
             assert.equal(err.constructor, TypeError);
-            assert.equal(err.message, 'Cannot call method on undefined');
         } finally {
             assert.end();
         }
@@ -48,7 +47,7 @@ tap.test('missing argument', function (assert) {
 
 // Exploratory test, can we call t.comment() passing nothing?
 tap.test('null argument', function (assert) {
-    assert.plan(2);
+    assert.plan(1);
     var test = tape.createHarness();
     test.createStream();
     test('null argument', function (t) {
@@ -57,7 +56,6 @@ tap.test('null argument', function (assert) {
             t.end();
         } catch (err) {
             assert.equal(err.constructor, TypeError);
-            assert.equal(err.message, 'Cannot call method on null');
         } finally {
             assert.end();
         }