jstd 1.3.1+ and jasmine-jstd-adapter upgrade

diff --git a/test/lib/jasmine-jstd-adapter/JasmineAdapter.js b/test/lib/jasmine-jstd-adapter/JasmineAdapter.js
index fb7306c..e1beda4 100644 (file)
--- a/test/lib/jasmine-jstd-adapter/JasmineAdapter.js
+++ b/test/lib/jasmine-jstd-adapter/JasmineAdapter.js
@@ -7,7 +7,7 @@
   var describePath = [];
   rootDescribes.collectMode();
   
-  var jasmineTest = TestCase('Jasmine Adapter Tests');
+  var jasmineTest = TestCase('Jasmine Adapter Tests', null, 'jasmine test case');
   
   var jasminePlugin = {
       name:'jasmine',
@@ -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({
+                       message: resultItems[i].toString(),
+                       name: resultItems[i].trace.name,
+                       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/test/lib/jasmine-jstd-adapter/version.txt b/test/lib/jasmine-jstd-adapter/version.txt
index 96025e7..d297d02 100644 (file)
--- a/test/lib/jasmine-jstd-adapter/version.txt
+++ b/test/lib/jasmine-jstd-adapter/version.txt
@@ -1 +1 @@
-head @ 2010-05-10
+1ade1ad7cad4caadb3a3 @ 2011-03-07

diff --git a/test/lib/jstestdriver/JsTestDriver.jar b/test/lib/jstestdriver/JsTestDriver.jar
index 01541a5..c8c63e8 100644 (file)
Binary files a/test/lib/jstestdriver/JsTestDriver.jar and b/test/lib/jstestdriver/JsTestDriver.jar differ

diff --git a/test/lib/jstestdriver/version.txt b/test/lib/jstestdriver/version.txt
index 7d18c06..060948b 100644 (file)
--- a/test/lib/jstestdriver/version.txt
+++ b/test/lib/jstestdriver/version.txt
@@ -1,2 +1 @@
-trunk @ 2010-11-11
-
+r899 (post 1.3.1) @ 2011-02-18