Redesigned moudule system
* Top level private APIs (e.g. jasmine.private.whatever) are no longer exposed * jasmineRequire is no longer exposed * core is self-booting * Globals are automatically created in browsers. (They can subsequently be removed by user code if desired.) * Globals are *not* automatically created in Node. An installGlobals function is exported instead. The jasmine package calls installGlobals unless configured not to do so. * In Node, the same instance is returned each time jasmine-core is imported. A reset function is exported. It effectively resets all state by discarding the env and creating a new one. This allows mulitple sequential runs within the same process to be independent of each other, but does not allow multiple concurrent runs. (That probably never worked anyway.) Fixes #2094
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
getJasmineRequireObj().Expector = function(j$) {
|
||||
getJasmineRequireObj().Expector = function(j$, private$) {
|
||||
'use strict';
|
||||
|
||||
function Expector(options) {
|
||||
@@ -7,7 +7,7 @@ getJasmineRequireObj().Expector = function(j$) {
|
||||
};
|
||||
this.actual = options.actual;
|
||||
this.addExpectationResult = options.addExpectationResult || function() {};
|
||||
this.filters = new j$.private.ExpectationFilterChain();
|
||||
this.filters = new private$.ExpectationFilterChain();
|
||||
}
|
||||
|
||||
Expector.prototype.instantiateMatcher = function(
|
||||
@@ -41,7 +41,7 @@ getJasmineRequireObj().Expector = function(j$) {
|
||||
this.matchersUtil,
|
||||
args
|
||||
);
|
||||
} else if (j$.private.isFunction(result.message)) {
|
||||
} else if (private$.isFunction(result.message)) {
|
||||
return result.message();
|
||||
} else {
|
||||
return result.message;
|
||||
|
||||
Reference in New Issue
Block a user