From 73ee5fc00836ea2e35746e4451bdcd53a19a6c42 Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Fri, 18 Feb 2011 15:59:32 -0800
Subject: jstd r899 2011-02-18 (post 1.3.1) + fix for jasmine adapter.

---
 lib/jasmine-jstd-adapter/JasmineAdapter.js |   9 ++++++---
 lib/jstestdriver/JsTestDriver.jar          | Bin 3750599 -> 3827324 bytes
 lib/jstestdriver/coverage.jar              | Bin 2230890 -> 2230969 bytes
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/jasmine-jstd-adapter/JasmineAdapter.js b/lib/jasmine-jstd-adapter/JasmineAdapter.js
index fb7306ca..31d2fe75 100644
--- a/lib/jasmine-jstd-adapter/JasmineAdapter.js
+++ b/lib/jasmine-jstd-adapter/JasmineAdapter.js
@@ -44,8 +44,11 @@
             for ( var i = 0; i < resultItems.length; i++) {
               if (!resultItems[i].passed()) {
                 state = resultItems[i].message.match(/AssertionError:/) ? 'error' : 'failed';
-                messages.push(resultItems[i].toString());
-                messages.push(formatStack(resultItems[i].trace.stack));
+                messages.push({
+                  'name' : resultItems[i].matcherName,
+                  'message' : resultItems[i].toString(),
+                  'stack' : formatStack(resultItems[i].trace.stack)
+                });
               }
             }
             onTestDone(
@@ -53,7 +56,7 @@
                 suite.getFullName(), 
                 spec.description, 
                 state, 
-                messages.join('\n'), 
+                jstestdriver.angular.toJson(messages),
                 specLog.join('\n'),
                 end - start));
           },
diff --git a/lib/jstestdriver/JsTestDriver.jar b/lib/jstestdriver/JsTestDriver.jar
index b26e75ca..c8c63e86 100644
Binary files a/lib/jstestdriver/JsTestDriver.jar and b/lib/jstestdriver/JsTestDriver.jar differ
diff --git a/lib/jstestdriver/coverage.jar b/lib/jstestdriver/coverage.jar
index e0785816..fc631437 100644
Binary files a/lib/jstestdriver/coverage.jar and b/lib/jstestdriver/coverage.jar differ
-- 
cgit v1.2.3