diff options
| author | Igor Minar | 2011-02-18 15:59:32 -0800 |
|---|---|---|
| committer | Igor Minar | 2011-03-07 00:07:01 -0800 |
| commit | 73ee5fc00836ea2e35746e4451bdcd53a19a6c42 (patch) | |
| tree | 331835828fd63e085d47ea488b32b89453a09b84 | |
| parent | 4c762bfe5c6421560af9d4388ddc6506421b9c45 (diff) | |
| download | angular.js-73ee5fc00836ea2e35746e4451bdcd53a19a6c42.tar.bz2 | |
jstd r899 2011-02-18 (post 1.3.1) + fix for jasmine adapter.
| -rw-r--r-- | lib/jasmine-jstd-adapter/JasmineAdapter.js | 9 | ||||
| -rw-r--r-- | lib/jstestdriver/JsTestDriver.jar | bin | 3750599 -> 3827324 bytes | |||
| -rw-r--r-- | lib/jstestdriver/coverage.jar | bin | 2230890 -> 2230969 bytes |
3 files changed, 6 insertions, 3 deletions
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 Binary files differindex b26e75ca..c8c63e86 100644 --- a/lib/jstestdriver/JsTestDriver.jar +++ b/lib/jstestdriver/JsTestDriver.jar diff --git a/lib/jstestdriver/coverage.jar b/lib/jstestdriver/coverage.jar Binary files differindex e0785816..fc631437 100644 --- a/lib/jstestdriver/coverage.jar +++ b/lib/jstestdriver/coverage.jar |
