admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bad merge of gvanhove's describe exception fix

Browse Source
This commit is contained in:
Davis W. Frank
2011-04-17 21:44:41 -07:00
parent 61de2268fe
commit b02aa9840a
3 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spec/suites/SpecRunningSpec.js
View File

@@ -1225,6 +1225,9 @@ describe("jasmine spec running", function () {
this.expect(true).toEqual(true);
});
});
throw new Error("fake error");
});
} catch(e) {
}
@@ -1240,14 +1243,16 @@ describe("jasmine spec running", function () {
expect(specs.join('')).toMatch(new RegExp(
'Spec: outer1 inner1 should thingy.' +
'Result: Passed.' +
'Spec: outer1 encountered a declaration exception.' +
'Result: Error: fake error.*' +
'Spec: outer1 inner2 should other thingy.' +
'Result: Passed.' +
'Spec: outer2 should xxx.' +
'Result: Passed.'
));
'Result: Passed.' +
'Spec: outer1 inner1 encountered a declaration exception.' +
'Result: Error: fake error.*' +
'Spec: outer1 inner2 should other thingy.' +
'Result: Passed.' +
'Spec: outer1 encountered a declaration exception.' +
'Result: Error: fake error.*' +
'Spec: outer2 should xxx.' +
'Result: Passed.'
));
});
});