Rebuild main jasmine lib
This commit is contained in:
parent
c1f8151bcb
commit
1fae8f0a31
|
@ -22,6 +22,12 @@ jasmine.unimplementedMethod_ = function() {
|
||||||
*/
|
*/
|
||||||
jasmine.undefined = jasmine.___undefined___;
|
jasmine.undefined = jasmine.___undefined___;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show diagnostic messages in the console if set to true
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
jasmine.VERBOSE = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed.
|
* Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed.
|
||||||
*
|
*
|
||||||
|
@ -2186,7 +2192,9 @@ jasmine.WaitsBlock = function(env, timeout, spec) {
|
||||||
jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block);
|
jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block);
|
||||||
|
|
||||||
jasmine.WaitsBlock.prototype.execute = function (onComplete) {
|
jasmine.WaitsBlock.prototype.execute = function (onComplete) {
|
||||||
this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
|
if (jasmine.VERBOSE) {
|
||||||
|
this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
|
||||||
|
}
|
||||||
this.env.setTimeout(function () {
|
this.env.setTimeout(function () {
|
||||||
onComplete();
|
onComplete();
|
||||||
}, this.timeout);
|
}, this.timeout);
|
||||||
|
@ -2214,7 +2222,9 @@ jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
|
||||||
jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
|
jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
|
||||||
|
|
||||||
jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
|
jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
|
||||||
this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
|
if (jasmine.VERBOSE) {
|
||||||
|
this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
|
||||||
|
}
|
||||||
var latchFunctionResult;
|
var latchFunctionResult;
|
||||||
try {
|
try {
|
||||||
latchFunctionResult = this.latchFunction.apply(this.spec);
|
latchFunctionResult = this.latchFunction.apply(this.spec);
|
||||||
|
@ -2429,7 +2439,7 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) {
|
||||||
|
|
||||||
jasmine.version_= {
|
jasmine.version_= {
|
||||||
"major": 1,
|
"major": 1,
|
||||||
"minor": 0,
|
"minor": 1,
|
||||||
"build": 2,
|
"build": 0,
|
||||||
"revision": 1299565706
|
"revision": 1304737707
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue