From ffff044ce6c4dfd2bfa127965c956ba7aba949b7 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 2 Jun 2015 16:31:33 -0400
Subject: [PATCH] Add stack traces to Chai assertion failures

---
 test/content/runtests.js | 15 +++++++++++++++
 test/resource/chai       |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/test/content/runtests.js b/test/content/runtests.js
index 8dd7958f3..02730f98b 100644
--- a/test/content/runtests.js
+++ b/test/content/runtests.js
@@ -117,6 +117,21 @@ function Reporter(runner) {
 	});
 
 	runner.on('fail', function(test, err){
+		// Strip Chai lines from stack trace
+		err.stack = err.stack.replace(/.+zotero-unit\/chai.+\n/g, "");
+		// Strip "From previous event:" block if it's all internals
+		var re = /\s*From previous event:(.|\n)+/;
+		var matches = re.exec(err.stack);
+		if (matches) {
+			err.stack = err.stack.substr(0, matches.index);
+			var previous = matches[0].split(/\n/)
+				.filter(line => line.indexOf('zotero-unit/') == -1).join('\n');
+			if (previous.trim() != "From previous event:") {
+				err.stack += previous;
+			}
+		}
+		err.stack += "\n";
+		
 		failed++;
 		dump("\r" + indent()
 			// Dark red X for errors
diff --git a/test/resource/chai b/test/resource/chai
index d7cafca02..8eab1e5f1 160000
--- a/test/resource/chai
+++ b/test/resource/chai
@@ -1 +1 @@
-Subproject commit d7cafca0232756f767275bb00e66930a7823b027
+Subproject commit 8eab1e5f194e186a020b5abf2cd0e409e53222a2