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

Bumping built distribution

Browse Source
This commit is contained in:
Sheel Choksi
2013-11-14 18:16:32 -08:00
parent 7ee5073921
commit 72e9851217
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/console/console.js
View File

@@ -50,10 +50,10 @@ getJasmineRequireObj().ConsoleReporter = function() {
failedSpecs = [], failedSpecs = [],
pendingCount, pendingCount,
ansi = { ansi = {
green: '\033[32m', green: '\x1B[32m',
red: '\033[31m', red: '\x1B[31m',
yellow: '\033[33m', yellow: '\x1B[33m',
none: '\033[0m' none: '\x1B[0m'
}; };
this.jasmineStarted = function() { this.jasmineStarted = function() {

27
lib/jasmine-core/jasmine.js
View File

@@ -97,13 +97,12 @@ getJasmineRequireObj().base = function(j$) {
j$.MAX_PRETTY_PRINT_DEPTH = 40; j$.MAX_PRETTY_PRINT_DEPTH = 40;
j$.DEFAULT_TIMEOUT_INTERVAL = 5000; j$.DEFAULT_TIMEOUT_INTERVAL = 5000;
j$.getGlobal = function() { j$.getGlobal = (function() {
function getGlobal() { var jasmineGlobal = eval.call(null, "this");
return this; return function() {
} return jasmineGlobal;
};
return getGlobal(); })();
};
j$.getEnv = function(options) { j$.getEnv = function(options) {
var env = j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options); var env = j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options);
@@ -238,7 +237,7 @@ getJasmineRequireObj().Spec = function(j$) {
this.exceptionFormatter = attrs.exceptionFormatter || function() {}; this.exceptionFormatter = attrs.exceptionFormatter || function() {};
this.getSpecName = attrs.getSpecName || function() { return ''; }; this.getSpecName = attrs.getSpecName || function() { return ''; };
this.expectationResultFactory = attrs.expectationResultFactory || function() { }; this.expectationResultFactory = attrs.expectationResultFactory || function() { };
this.queueRunner = attrs.queueRunner || function() {}; this.queueRunnerFactory = attrs.queueRunnerFactory || function() {};
this.catchingExceptions = attrs.catchingExceptions || function() { return true; }; this.catchingExceptions = attrs.catchingExceptions || function() { return true; };
this.timer = attrs.timer || {setTimeout: setTimeout, clearTimeout: clearTimeout}; this.timer = attrs.timer || {setTimeout: setTimeout, clearTimeout: clearTimeout};
@@ -288,7 +287,13 @@ getJasmineRequireObj().Spec = function(j$) {
done(); done();
}; };
fn.call(this, callDone); //TODO: do we care about more than 1 arg? try {
fn.call(this, callDone); //TODO: do we care about more than 1 arg?
}
catch (e) {
onException(e);
callDone();
}
}; };
} }
@@ -297,7 +302,7 @@ getJasmineRequireObj().Spec = function(j$) {
thisOne = (this.fn.length) ? timeoutable(this.fn) : this.fn; thisOne = (this.fn.length) ? timeoutable(this.fn) : this.fn;
var allFns = befores.concat(thisOne).concat(afters); var allFns = befores.concat(thisOne).concat(afters);
this.queueRunner({ this.queueRunnerFactory({
fns: allFns, fns: allFns,
onException: onException, onException: onException,
onComplete: complete onComplete: complete
@@ -641,7 +646,7 @@ getJasmineRequireObj().Env = function(j$) {
onStart: specStarted, onStart: specStarted,
description: description, description: description,
expectationResultFactory: expectationResultFactory, expectationResultFactory: expectationResultFactory,
queueRunner: queueRunnerFactory, queueRunnerFactory: queueRunnerFactory,
fn: fn, fn: fn,
timer: {setTimeout: realSetTimeout, clearTimeout: realClearTimeout} timer: {setTimeout: realSetTimeout, clearTimeout: realClearTimeout}
}); });