Merge pull request #57 from dervus/mocha

Port the tests to Mocha. And some of the missed PyYAML tests.

Makefile

@@ -33,12 +33,12 @@ lint:
 
 
 test: lint
-	@if test ! `which vows` ; then \
-		echo "You need 'vows' installed in order to run tests." >&2 ; \
+	@if test ! `which mocha` ; then \
+		echo "You need 'mocha' installed in order to run tests." >&2 ; \
 		echo "  $ make dev-deps" >&2 ; \
 		exit 128 ; \
 		fi
-	NODE_ENV=test vows --spec
+	NODE_ENV=test mocha -R spec
 
 
 doc:

lib/js-yaml.js

@@ -23,6 +23,16 @@ jsyaml.scan = function scan(stream, callback, Loader) {
 };
 
 
+jsyaml.parse = function parse(stream, callback, Loader) {
+  Loader = (Loader || _loader.SafeLoader);
+
+  var loader = new Loader(stream);
+  while (loader.checkEvent()) {
+    callback(loader.getEvent());
+  }
+};
+
+
 jsyaml.compose = function compose(stream, Loader) {
   Loader = (Loader || _loader.SafeLoader);
 

lib/js-yaml/reader.js

@@ -109,6 +109,7 @@ Reader.prototype.checkPrintable = function checkPrintable(data) {
 
 
 module.exports.Reader = Reader;
+module.exports.ReaderError = ReaderError;
 
 
 ////////////////////////////////////////////////////////////////////////////////

package.json

@@ -24,6 +24,6 @@
   "scripts"         : { "test": "make test" },
 
   "dependencies"    : { "argparse": "~ 0.1.3" },
-  "devDependencies" : { "vows": "~ 0.6.0" },
+  "devDependencies" : { "mocha": ">= 1.7.4" },
   "engines"         : { "node": ">= 0.6.0" }
 }

test/functional.js

@@ -0,0 +1,14 @@
+'use strict';
+/*global describe */
+
+
+describe('Functional.', function () {
+  require('./functional/reader');
+  require('./functional/mark');
+  require('./functional/tokens');
+  require('./functional/errors');
+  require('./functional/structure');
+  require('./functional/resolver');
+  require('./functional/constructor');
+  require('./functional/canonical');
+});