Skip to content

Commit 4e186e4

Browse files
committed
jstd 1.3.1+ and jasmine-jstd-adapter upgrade
1 parent af23cca commit 4e186e4

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

test/lib/jasmine-jstd-adapter/JasmineAdapter.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
var describePath = [];
88
rootDescribes.collectMode();
99

10-
var jasmineTest = TestCase('Jasmine Adapter Tests');
10+
var jasmineTest = TestCase('Jasmine Adapter Tests', null, 'jasmine test case');
1111

1212
var jasminePlugin = {
1313
name:'jasmine',
@@ -44,16 +44,19 @@
4444
for ( var i = 0; i < resultItems.length; i++) {
4545
if (!resultItems[i].passed()) {
4646
state = resultItems[i].message.match(/AssertionError:/) ? 'error' : 'failed';
47-
messages.push(resultItems[i].toString());
48-
messages.push(formatStack(resultItems[i].trace.stack));
47+
messages.push({
48+
message: resultItems[i].toString(),
49+
name: resultItems[i].trace.name,
50+
stack: formatStack(resultItems[i].trace.stack)
51+
});
4952
}
5053
}
5154
onTestDone(
5255
new jstestdriver.TestResult(
5356
suite.getFullName(),
5457
spec.description,
5558
state,
56-
messages.join('\n'),
59+
jstestdriver.angular.toJson(messages),
5760
specLog.join('\n'),
5861
end - start));
5962
},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
head @ 2010-05-10
1+
1ade1ad7cad4caadb3a3 @ 2011-03-07
86.3 KB
Binary file not shown.

test/lib/jstestdriver/version.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
trunk @ 2010-11-11
2-
1+
r899 (post 1.3.1) @ 2011-02-18

0 commit comments

Comments
 (0)