Merge branch 'next' into ospec-named-suites

ospec/README.md

@@ -278,12 +278,20 @@ ospec will automatically evaluate all `*.js` files in any folder named `/tests`.
 	$ npm test
 ```
 
-#### Installing ospec globally
+#### Direct use from the command line
 
-While it's recommended to install ospec locally to maintain reproducible environments, sometimes it may be deemed appropriate to install it globally. To do so, run this command:
+Ospec doesn't work when installed globally. Using global scripts is generally a bad idea since you can end up with different, incompatible versions of the same package installed locally and globally.
+
+To work around this limitation, you can use [`npm-run`](https://www.npmjs.com/package/npm-run) which enables one to run the binaries of locally installed packages.
 
 ```
-npm install ospec -g
+npm install npm-run -g
+```
+
+Then, from a project that has ospec installed as a (dev) dependency:
+
+```
+npm-run ospec
 ```
 
 ---

ospec/bin/ospec

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+"use strict"
 
 var fs = require("fs")
 var path = require("path")
@@ -10,12 +11,13 @@ function traverseDirectory(pathname, callback) {
 	return new Promise(function(resolve, reject) {
 		fs.lstat(pathname, function(err, stat) {
 			if (err) reject(err)
-			if (stat.isDirectory()) {
+			if (stat && stat.isDirectory()) {
 				fs.readdir(pathname, function(err, pathnames) {
 					if (err) reject(err)
 					var promises = []
 					for (var i = 0; i < pathnames.length; i++) {
 						if (pathnames[i] === "node_modules") continue
+						if (pathnames[i][0] === ".") continue
 						pathnames[i] = path.join(pathname, pathnames[i])
 						promises.push(traverseDirectory(pathnames[i], callback))
 					}
@@ -31,9 +33,9 @@ function traverseDirectory(pathname, callback) {
 	})
 }
 
-traverseDirectory(".", function(pathname, stat, children) {
+traverseDirectory(".", function(pathname) {
 	if (pathname.match(/(?:^|\/)tests\/.*\.js$/)) {
-		require(path.normalize(process.cwd()) + "/" + pathname)
+		require(path.normalize(process.cwd()) + "/" + pathname) // eslint-disable-line global-require
 	}
 })
 .then(o.run)

ospec/ospec.js

@@ -1,13 +1,21 @@
+/* eslint-disable no-bitwise, no-process-exit */
 "use strict"
 
 module.exports = new function init(name) {
-	var spec = {}, subjects = [], results = [], only = null, ctx = spec, start, stack = 0, nextTickish, hasProcess = typeof process === "object", hasOwn = ({}).hasOwnProperty
+	var spec = {}, subjects = [], results, only = null, ctx = spec, start, stack = 0, nextTickish, hasProcess = typeof process === "object", hasOwn = ({}).hasOwnProperty
 
 	if (name != null) spec[name] = ctx = {}
 
 	function o(subject, predicate) {
-		if (predicate === undefined) return new Assert(subject)
-		ctx[unique(subject)] = predicate
+		if (predicate === undefined) {
+			if (results == null) throw new Error("Assertions should not occur outside test definitions")
+			return new Assert(subject)
+		}
+		else if (results == null) {
+			ctx[unique(subject)] = predicate
+		} else {
+			throw new Error("Test definition shouldn't be nested. To group tests use `o.spec()`")
+		}
 	}
 	o.before = hook("__before")
 	o.after = hook("__after")
@@ -20,7 +28,10 @@ module.exports = new function init(name) {
 		predicate()
 		ctx = parent
 	}
-	o.only = function(subject, predicate) {o(subject, only = predicate)}
+	o.only = function(subject, predicate, silent) {
+		if (!silent) console.log(highlight("/!\\ WARNING /!\\ o.only() mode"))
+		o(subject, only = predicate)
+	}
 	o.spy = function(fn) {
 		var spy = function() {
 			spy.this = this
@@ -39,6 +50,7 @@ module.exports = new function init(name) {
 		return spy
 	}
 	o.run = function() {
+		results = []
 		start = new Date
 		test(spec, [], [], report)
 
@@ -112,8 +124,8 @@ module.exports = new function init(name) {
 	}
 	function unique(subject) {
 		if (hasOwn.call(ctx, subject)) {
-			console.warn("A test or a spec named `" + subject + "` was already defined")	
-			while (hasOwn.call(ctx, subject)) subject += '*'
+			console.warn("A test or a spec named `" + subject + "` was already defined")
+			while (hasOwn.call(ctx, subject)) subject += "*"
 		}
 		return subject
 	}

ospec/package.json

@@ -12,5 +12,5 @@
   "bin": {
     "ospec": "./bin/ospec"
   },
-  "repository": "lhorie/mithril.js#rewrite"
+  "repository": "MithrilJS/mithril.js"
 }

ospec/tests/test-ospec.js

@@ -12,7 +12,7 @@ new function(o) {
 		})
 		o.only(".only()", function() {
 			o(2).equals(2)
-		})
+		}, true)
 	})
 
 	o.run()
@@ -20,7 +20,7 @@ new function(o) {
 
 o.spec("ospec", function() {
 	o.spec("sync", function() {
-		var a = 0, b = 0
+		var a = 0, b = 0, illegalAssertionThrows = false
 
 		o.before(function() {a = 1})
 		o.after(function() {a = 0})
@@ -28,7 +28,15 @@ o.spec("ospec", function() {
 		o.beforeEach(function() {b = 1})
 		o.afterEach(function() {b = 0})
 
+		try {o("illegal assertion")} catch (e) {illegalAssertionThrows = true}
+
 		o("assertions", function() {
+			var nestedTestDeclarationThrows = false
+			try {o("illegal nested test", function(){})} catch (e) {nestedTestDeclarationThrows = true}
+
+			o(illegalAssertionThrows).equals(true)
+			o(nestedTestDeclarationThrows).equals(true)
+
 			var spy = o.spy()
 			spy(a)
 
@@ -43,7 +51,7 @@ o.spec("ospec", function() {
 			o(undef1).notDeepEquals(undef2)
 			o(undef1).notDeepEquals({})
 			o({}).notDeepEquals(undef1)
-			
+
 			var sparse1 = [void 1, void 2, void 3]
 			delete sparse1[0]
 			var sparse2 = [void 1, void 2, void 3]
@@ -55,7 +63,7 @@ o.spec("ospec", function() {
 			monkeypatch1.field = 3
 			var monkeypatch2 = [1, 2]
 			monkeypatch2.field = 4
-			
+
 			o(monkeypatch1).notDeepEquals([1, 2])
 			o(monkeypatch1).notDeepEquals(monkeypatch2)