github-migration
/
jasmine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version bump to 0.10.4

This commit is contained in:
Pivotal 2010-06-05 10:44:54 -04:00
parent 5aa306cf66
commit c187adc096
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
example/example_runner.html
View File

@ -3,15 +3,13 @@
<html> <html>
<head> <head>
<title>Jasmine Test Runner</title> <title>Jasmine Test Runner</title>
<link rel="stylesheet" type="text/css" href="../lib/jasmine.css">
<script type="text/javascript" src="../lib/jasmine-0.10.4.js"></script>
<script type="text/javascript" src="../lib/TrivialReporter.js"></script>
<script type="text/javascript" src="../lib/consolex.js"></script>
<script type="text/javascript" src="spec/example_suite.js"></script>
</head> </head>
<script type="text/javascript" src="../lib/jasmine-0.10.3.js"></script>
<script type="text/javascript" src="../lib/TrivialReporter.js"></script>
<script type="text/javascript" src="../lib/consolex.js"></script>
<script type="text/javascript" src="spec/example_suite.js"></script>
<link rel="stylesheet" type="text/css" href="../lib/jasmine.css">
<body> <body>
<script type="text/javascript"> <script type="text/javascript">
var jasmineEnv = jasmine.getEnv(); var jasmineEnv = jasmine.getEnv();
jasmineEnv.reporter = new jasmine.TrivialReporter(); jasmineEnv.reporter = new jasmine.TrivialReporter();

34
lib/jasmine-0.10.3.js → lib/jasmine-0.10.4.js
View File

@ -57,6 +57,10 @@ jasmine.MessageResult = function(text) {
this.trace = new Error(); // todo: test better this.trace = new Error(); // todo: test better
}; };
jasmine.MessageResult.prototype.toString = function() {
return this.text;
};
jasmine.ExpectationResult = function(params) { jasmine.ExpectationResult = function(params) {
this.type = 'ExpectationResult'; this.type = 'ExpectationResult';
this.matcherName = params.matcherName; this.matcherName = params.matcherName;
@ -71,6 +75,10 @@ jasmine.ExpectationResult = function(params) {
this.trace = this.passed_ ? '' : new Error(this.message); this.trace = this.passed_ ? '' : new Error(this.message);
}; };
jasmine.ExpectationResult.prototype.toString = function () {
return this.message;
};
jasmine.ExpectationResult.prototype.passed = function () { jasmine.ExpectationResult.prototype.passed = function () {
return this.passed_; return this.passed_;
}; };
@ -741,10 +749,21 @@ jasmine.Env.prototype.describe = function(description, specDefinitions) {
this.currentSuite = suite; this.currentSuite = suite;
specDefinitions.call(suite); var declarationError = null;
try {
specDefinitions.call(suite);
} catch(e) {
declarationError = e;
}
this.currentSuite = parentSuite; this.currentSuite = parentSuite;
if (declarationError) {
this.it("encountered a declaration exception", function() {
throw declarationError;
});
}
return suite; return suite;
}; };
@ -1777,12 +1796,12 @@ jasmine.Runner.prototype.execute = function() {
jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) { jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) {
beforeEachFunction.typeName = 'beforeEach'; beforeEachFunction.typeName = 'beforeEach';
this.before_.push(beforeEachFunction); this.before_.splice(0,0,beforeEachFunction);
}; };
jasmine.Runner.prototype.afterEach = function(afterEachFunction) { jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
afterEachFunction.typeName = 'afterEach'; afterEachFunction.typeName = 'afterEach';
this.after_.push(afterEachFunction); this.after_.splice(0,0,afterEachFunction);
}; };
@ -2063,12 +2082,12 @@ jasmine.Suite.prototype.finish = function(onComplete) {
jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) { jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) {
beforeEachFunction.typeName = 'beforeEach'; beforeEachFunction.typeName = 'beforeEach';
this.before_.push(beforeEachFunction); this.before_.unshift(beforeEachFunction);
}; };
jasmine.Suite.prototype.afterEach = function(afterEachFunction) { jasmine.Suite.prototype.afterEach = function(afterEachFunction) {
afterEachFunction.typeName = 'afterEach'; afterEachFunction.typeName = 'afterEach';
this.after_.push(afterEachFunction); this.after_.unshift(afterEachFunction);
}; };
jasmine.Suite.prototype.results = function() { jasmine.Suite.prototype.results = function() {
@ -2139,7 +2158,6 @@ jasmine.WaitsForBlock.prototype.execute = function (onComplete) {
name: 'timeout', name: 'timeout',
message: message message: message
}); });
onComplete();
} else { } else {
self.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT; self.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
@ -2326,6 +2344,6 @@ window.clearInterval = function(timeoutKey) {
jasmine.version_= { jasmine.version_= {
"major": 0, "major": 0,
"minor": 10, "minor": 10,
"build": 3, "build": 4,
"revision": 1270162784 "revision": 1275748595
}; };

2
src/version.json
View File

@ -1,5 +1,5 @@
{ {
"major": 0, "major": 0,
"minor": 10, "minor": 10,
"build": 3 "build": 4
} }