Merge pull request #2 from 1enu/busted-proper-fail

Busted fails properly now. Changed file folder.

src/bustez/expect.lua

@@ -0,0 +1,4 @@
+-- The `expect` implementation was made a descendant of luassert so that
+-- tracebacks generated by Busted don't include it.
+
+return require("luassert.bustez.expect")

bustez/expect.lua → src/luassert/bustez/expect.lua

@@ -5,6 +5,17 @@ local luassert = require("luassert")
 local util = require("luassert.util")
 local say = require("say")
 
+-- This is needed to be used for busted to
+-- properly recognize it as fail on reporter(and not as error).
+local fail
+local success, _ = pcall(function()
+	fail = require("busted.core")().fail
+end)
+-- Falls back to normal error in case busted is not used.
+if not success then
+	fail = error
+end
+
 -- list of namespaces
 local namespace = require("luassert.namespaces")
 
@@ -99,7 +110,7 @@ local __state_meta = {
 					message = assertion.negative_message
 				end
 				local err = geterror(message, rawget(self, "failure_message"), arguments)
-				error(err or "assertion failed!", util.errorlevel())
+				fail(err or "assertion failed!", util.errorlevel())
 			end
 
 			if retargs then