diff --git a/lib/jasmine-core/jasmine-html.js b/lib/jasmine-core/jasmine-html.js index 61f389d1..767951a4 100644 --- a/lib/jasmine-core/jasmine-html.js +++ b/lib/jasmine-core/jasmine-html.js @@ -26,7 +26,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. var jasmineRequire = window.jasmineRequire || require('./jasmine.js'); jasmineRequire.html = function(j$) { - j$.ResultsNode = jasmineRequire.ResultsNode(); + j$.private.ResultsNode = jasmineRequire.ResultsNode(); j$.HtmlReporter = jasmineRequire.HtmlReporter(j$); j$.QueryString = jasmineRequire.QueryString(); j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter(); @@ -35,7 +35,7 @@ jasmineRequire.html = function(j$) { jasmineRequire.HtmlReporter = function(j$) { function ResultsStateBuilder() { - this.topResults = new j$.ResultsNode({}, '', null); + this.topResults = new j$.private.ResultsNode({}, '', null); this.currentParent = this.topResults; this.specsExecuted = 0; this.failureCount = 0; @@ -793,7 +793,7 @@ jasmineRequire.HtmlReporter = function(j$) { const el = createElement(type); let children; - if (j$.isArray_(childrenArrayOrVarArgs)) { + if (j$.private.isArray(childrenArrayOrVarArgs)) { children = childrenArrayOrVarArgs; } else { children = []; diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index e952ea2e..3d927b00 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -53,92 +53,79 @@ var getJasmineRequireObj = (function(jasmineGlobal) { } getJasmineRequire().core = function(jRequire) { - const j$ = {}; + const j$ = { private: {} }; jRequire.base(j$, jasmineGlobal); - j$.util = jRequire.util(j$); - j$.errors = jRequire.errors(); - j$.formatErrorMsg = jRequire.formatErrorMsg(); - j$.Any = jRequire.Any(j$); - j$.Anything = jRequire.Anything(j$); - j$.CallTracker = jRequire.CallTracker(j$); - j$.MockDate = jRequire.MockDate(j$); - j$.getClearStack = jRequire.clearStack(j$); - j$.Clock = jRequire.Clock(); - j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$); - j$.Deprecator = jRequire.Deprecator(j$); - j$.Configuration = jRequire.Configuration(j$); - j$.Env = jRequire.Env(j$); - j$.StackTrace = jRequire.StackTrace(j$); - j$.ExceptionFormatter = jRequire.ExceptionFormatter(j$); - j$.ExpectationFilterChain = jRequire.ExpectationFilterChain(); - j$.Expector = jRequire.Expector(j$); - j$.Expectation = jRequire.Expectation(j$); - j$.buildExpectationResult = jRequire.buildExpectationResult(j$); - j$.JsApiReporter = jRequire.JsApiReporter(j$); - j$.makePrettyPrinter = jRequire.makePrettyPrinter(j$); - j$.basicPrettyPrinter_ = j$.makePrettyPrinter(); - j$.MatchersUtil = jRequire.MatchersUtil(j$); - j$.ObjectContaining = jRequire.ObjectContaining(j$); - j$.ArrayContaining = jRequire.ArrayContaining(j$); - j$.ArrayWithExactContents = jRequire.ArrayWithExactContents(j$); - j$.MapContaining = jRequire.MapContaining(j$); - j$.SetContaining = jRequire.SetContaining(j$); - j$.QueueRunner = jRequire.QueueRunner(j$); - j$.NeverSkipPolicy = jRequire.NeverSkipPolicy(j$); - j$.SkipAfterBeforeAllErrorPolicy = jRequire.SkipAfterBeforeAllErrorPolicy( + j$.private.util = jRequire.util(j$); + j$.private.errors = jRequire.errors(); + j$.private.formatErrorMsg = jRequire.formatErrorMsg(j$); + j$.private.Any = jRequire.Any(j$); + j$.private.Anything = jRequire.Anything(j$); + j$.private.CallTracker = jRequire.CallTracker(j$); + j$.private.MockDate = jRequire.MockDate(j$); + j$.private.getClearStack = jRequire.clearStack(j$); + j$.private.Clock = jRequire.Clock(); + j$.private.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$); + j$.private.Deprecator = jRequire.Deprecator(j$); + j$.private.Configuration = jRequire.Configuration(j$); + j$.private.Env = jRequire.Env(j$); + j$.private.StackTrace = jRequire.StackTrace(j$); + j$.private.ExceptionFormatter = jRequire.ExceptionFormatter(j$); + j$.private.ExpectationFilterChain = jRequire.ExpectationFilterChain(); + j$.private.Expector = jRequire.Expector(j$); + j$.private.Expectation = jRequire.Expectation(j$); + j$.private.buildExpectationResult = jRequire.buildExpectationResult(j$); + j$.private.JsApiReporter = jRequire.JsApiReporter(j$); + j$.private.makePrettyPrinter = jRequire.makePrettyPrinter(j$); + j$.private.basicPrettyPrinter = j$.private.makePrettyPrinter(); + j$.private.MatchersUtil = jRequire.MatchersUtil(j$); + j$.private.ObjectContaining = jRequire.ObjectContaining(j$); + j$.private.ArrayContaining = jRequire.ArrayContaining(j$); + j$.private.ArrayWithExactContents = jRequire.ArrayWithExactContents(j$); + j$.private.MapContaining = jRequire.MapContaining(j$); + j$.private.SetContaining = jRequire.SetContaining(j$); + j$.private.QueueRunner = jRequire.QueueRunner(j$); + j$.private.NeverSkipPolicy = jRequire.NeverSkipPolicy(j$); + j$.private.SkipAfterBeforeAllErrorPolicy = jRequire.SkipAfterBeforeAllErrorPolicy( j$ ); - j$.CompleteOnFirstErrorSkipPolicy = jRequire.CompleteOnFirstErrorSkipPolicy( + j$.private.CompleteOnFirstErrorSkipPolicy = jRequire.CompleteOnFirstErrorSkipPolicy( j$ ); - j$.reporterEvents = jRequire.reporterEvents(j$); - j$.ReportDispatcher = jRequire.ReportDispatcher(j$); + j$.private.reporterEvents = jRequire.reporterEvents(j$); + j$.private.ReportDispatcher = jRequire.ReportDispatcher(j$); j$.ParallelReportDispatcher = jRequire.ParallelReportDispatcher(j$); - j$.CurrentRunableTracker = jRequire.CurrentRunableTracker(); - j$.RunableResources = jRequire.RunableResources(j$); - j$.Runner = jRequire.Runner(j$); - j$.Spec = jRequire.Spec(j$); - j$.Spy = jRequire.Spy(j$); - j$.SpyFactory = jRequire.SpyFactory(j$); - j$.SpyRegistry = jRequire.SpyRegistry(j$); - j$.SpyStrategy = jRequire.SpyStrategy(j$); - j$.StringMatching = jRequire.StringMatching(j$); - j$.StringContaining = jRequire.StringContaining(j$); - j$.UserContext = jRequire.UserContext(j$); - j$.Suite = jRequire.Suite(j$); - j$.SuiteBuilder = jRequire.SuiteBuilder(j$); + j$.private.CurrentRunableTracker = jRequire.CurrentRunableTracker(); + j$.private.RunableResources = jRequire.RunableResources(j$); + j$.private.Runner = jRequire.Runner(j$); + j$.private.Spec = jRequire.Spec(j$); + j$.private.Spy = jRequire.Spy(j$); + j$.private.SpyFactory = jRequire.SpyFactory(j$); + j$.private.SpyRegistry = jRequire.SpyRegistry(j$); + j$.private.SpyStrategy = jRequire.SpyStrategy(j$); + j$.private.StringMatching = jRequire.StringMatching(j$); + j$.private.StringContaining = jRequire.StringContaining(j$); + j$.private.UserContext = jRequire.UserContext(j$); + j$.private.Suite = jRequire.Suite(j$); + j$.private.SuiteBuilder = jRequire.SuiteBuilder(j$); j$.Timer = jRequire.Timer(); - j$.TreeProcessor = jRequire.TreeProcessor(j$); - j$.TreeRunner = jRequire.TreeRunner(j$); + j$.private.TreeProcessor = jRequire.TreeProcessor(j$); + j$.private.TreeRunner = jRequire.TreeRunner(j$); j$.version = jRequire.version(); - j$.Order = jRequire.Order(); - j$.DiffBuilder = jRequire.DiffBuilder(j$); - j$.NullDiffBuilder = jRequire.NullDiffBuilder(j$); - j$.ObjectPath = jRequire.ObjectPath(j$); - j$.MismatchTree = jRequire.MismatchTree(j$); + j$.private.Order = jRequire.Order(); + j$.private.DiffBuilder = jRequire.DiffBuilder(j$); + j$.private.NullDiffBuilder = jRequire.NullDiffBuilder(j$); + j$.private.ObjectPath = jRequire.ObjectPath(j$); + j$.private.MismatchTree = jRequire.MismatchTree(j$); + j$.private.GlobalErrors = jRequire.GlobalErrors(j$); + j$.private.Truthy = jRequire.Truthy(j$); + j$.private.Falsy = jRequire.Falsy(j$); + j$.private.Empty = jRequire.Empty(j$); + j$.private.NotEmpty = jRequire.NotEmpty(j$); + j$.private.Is = jRequire.Is(j$); - // zone.js tries to monkey patch GlobalErrors in a way that is either a - // no-op or causes Jasmine to crash, depending on whether it's done before - // or after env creation. Prevent that. - const GlobalErrors = jRequire.GlobalErrors(j$); - Object.defineProperty(j$, 'GlobalErrors', { - enumerable: true, - configurable: false, - get() { - return GlobalErrors; - }, - set() {} - }); - - j$.Truthy = jRequire.Truthy(j$); - j$.Falsy = jRequire.Falsy(j$); - j$.Empty = jRequire.Empty(j$); - j$.NotEmpty = jRequire.NotEmpty(j$); - j$.Is = jRequire.Is(j$); - - j$.matchers = jRequire.requireMatchers(jRequire, j$); - j$.asyncMatchers = jRequire.requireAsyncMatchers(jRequire, j$); + j$.private.matchers = jRequire.requireMatchers(jRequire, j$); + j$.private.asyncMatchers = jRequire.requireAsyncMatchers(jRequire, j$); return j$; }; @@ -240,7 +227,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { return DEFAULT_TIMEOUT_INTERVAL; }, set: function(newValue) { - j$.util.validateTimeout(newValue, 'jasmine.DEFAULT_TIMEOUT_INTERVAL'); + j$.private.util.validateTimeout( + newValue, + 'jasmine.DEFAULT_TIMEOUT_INTERVAL' + ); DEFAULT_TIMEOUT_INTERVAL = newValue; } }); @@ -258,58 +248,61 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @return {Env} */ j$.getEnv = function(options) { - const env = (j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options)); + const env = (j$.private.currentEnv_ = + j$.private.currentEnv_ || new j$.private.Env(options)); //jasmine. singletons in here (setTimeout blah blah). return env; }; - j$.isArray_ = function(value) { - return j$.isA_('Array', value); + j$.private.isArray = function(value) { + return j$.private.isA('Array', value); }; - j$.isObject_ = function(value) { - return value !== undefined && value !== null && j$.isA_('Object', value); - }; - - j$.isString_ = function(value) { - return j$.isA_('String', value); - }; - - j$.isNumber_ = function(value) { - return j$.isA_('Number', value); - }; - - j$.isFunction_ = function(value) { - return j$.isA_('Function', value); - }; - - j$.isAsyncFunction_ = function(value) { - return j$.isA_('AsyncFunction', value); - }; - - j$.isGeneratorFunction_ = function(value) { - return j$.isA_('GeneratorFunction', value); - }; - - j$.isTypedArray_ = function(value) { + j$.private.isObject = function(value) { return ( - j$.isA_('Float32Array', value) || - j$.isA_('Float64Array', value) || - j$.isA_('Int16Array', value) || - j$.isA_('Int32Array', value) || - j$.isA_('Int8Array', value) || - j$.isA_('Uint16Array', value) || - j$.isA_('Uint32Array', value) || - j$.isA_('Uint8Array', value) || - j$.isA_('Uint8ClampedArray', value) + value !== undefined && value !== null && j$.private.isA('Object', value) ); }; - j$.isA_ = function(typeName, value) { - return j$.getType_(value) === '[object ' + typeName + ']'; + j$.private.isString = function(value) { + return j$.private.isA('String', value); }; - j$.isError_ = function(value) { + j$.private.isNumber = function(value) { + return j$.private.isA('Number', value); + }; + + j$.private.isFunction = function(value) { + return j$.private.isA('Function', value); + }; + + j$.private.isAsyncFunction = function(value) { + return j$.private.isA('AsyncFunction', value); + }; + + j$.private.isGeneratorFunction = function(value) { + return j$.private.isA('GeneratorFunction', value); + }; + + j$.private.isTypedArray = function(value) { + return ( + j$.private.isA('Float32Array', value) || + j$.private.isA('Float64Array', value) || + j$.private.isA('Int16Array', value) || + j$.private.isA('Int32Array', value) || + j$.private.isA('Int8Array', value) || + j$.private.isA('Uint16Array', value) || + j$.private.isA('Uint32Array', value) || + j$.private.isA('Uint8Array', value) || + j$.private.isA('Uint8ClampedArray', value) + ); + }; + + j$.private.isA = function(typeName, value) { + return j$.private.getType(value) === '[object ' + typeName + ']'; + }; + + j$.private.isError = function(value) { if (!value) { return false; } @@ -321,15 +314,15 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { return typeof value.stack === 'string' && typeof value.message === 'string'; }; - j$.isAsymmetricEqualityTester_ = function(obj) { - return obj ? j$.isA_('Function', obj.asymmetricMatch) : false; + j$.private.isAsymmetricEqualityTester = function(obj) { + return obj ? j$.private.isA('Function', obj.asymmetricMatch) : false; }; - j$.getType_ = function(value) { + j$.private.getType = function(value) { return Object.prototype.toString.apply(value); }; - j$.isDomNode = function(obj) { + j$.private.isDomNode = function(obj) { // Node is a function, because constructors return typeof jasmineGlobal.Node !== 'undefined' ? obj instanceof jasmineGlobal.Node @@ -340,7 +333,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { // return obj.nodeType > 0; }; - j$.isMap = function(obj) { + j$.private.isMap = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -348,7 +341,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isSet = function(obj) { + j$.private.isSet = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -356,7 +349,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isWeakMap = function(obj) { + j$.private.isWeakMap = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -364,7 +357,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isURL = function(obj) { + j$.private.isURL = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -372,11 +365,11 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isIterable_ = function(value) { + j$.private.isIterable = function(value) { return value && !!value[Symbol.iterator]; }; - j$.isDataView = function(obj) { + j$.private.isDataView = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -384,15 +377,15 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isPromise = function(obj) { + j$.private.isPromise = function(obj) { return !!obj && obj.constructor === jasmineGlobal.Promise; }; - j$.isPromiseLike = function(obj) { - return !!obj && j$.isFunction_(obj.then); + j$.private.isPromiseLike = function(obj) { + return !!obj && j$.private.isFunction(obj.then); }; - j$.fnNameFor = function(func) { + j$.private.fnNameFor = function(func) { if (func.name) { return func.name; } @@ -404,7 +397,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { return matches ? matches[1] : ''; }; - j$.isPending_ = function(promise) { + j$.private.isPending = function(promise) { const sentinel = {}; return Promise.race([promise, Promise.resolve(sentinel)]).then( function(result) { @@ -426,7 +419,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Constructor} clazz - The constructor to check against. */ j$.any = function(clazz) { - return new j$.Any(clazz); + return new j$.private.Any(clazz); }; /** @@ -438,7 +431,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.anything = function() { - return new j$.Anything(); + return new j$.private.Anything(); }; /** @@ -450,7 +443,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.truthy = function() { - return new j$.Truthy(); + return new j$.private.Truthy(); }; /** @@ -463,7 +456,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.falsy = function() { - return new j$.Falsy(); + return new j$.private.Falsy(); }; /** @@ -475,7 +468,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.empty = function() { - return new j$.Empty(); + return new j$.private.Empty(); }; /** @@ -487,7 +480,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Object} sample - The value to compare the actual to. */ j$.is = function(sample) { - return new j$.Is(sample); + return new j$.private.Is(sample); }; /** @@ -499,7 +492,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.notEmpty = function() { - return new j$.NotEmpty(); + return new j$.private.NotEmpty(); }; /** @@ -512,7 +505,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Object} sample - The subset of properties that _must_ be in the actual. */ j$.objectContaining = function(sample) { - return new j$.ObjectContaining(sample); + return new j$.private.ObjectContaining(sample); }; /** @@ -525,7 +518,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {RegExp|String} expected */ j$.stringMatching = function(expected) { - return new j$.StringMatching(expected); + return new j$.private.StringMatching(expected); }; /** @@ -538,7 +531,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {String} expected */ j$.stringContaining = function(expected) { - return new j$.StringContaining(expected); + return new j$.private.StringContaining(expected); }; /** @@ -551,7 +544,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Array} sample */ j$.arrayContaining = function(sample) { - return new j$.ArrayContaining(sample); + return new j$.private.ArrayContaining(sample); }; /** @@ -565,7 +558,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Array} sample */ j$.arrayWithExactContents = function(sample) { - return new j$.ArrayWithExactContents(sample); + return new j$.private.ArrayWithExactContents(sample); }; /** @@ -579,7 +572,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Map} sample - The subset of items that _must_ be in the actual. */ j$.mapContaining = function(sample) { - return new j$.MapContaining(sample); + return new j$.private.MapContaining(sample); }; /** @@ -593,7 +586,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Set} sample - The subset of items that _must_ be in the actual. */ j$.setContaining = function(sample) { - return new j$.SetContaining(sample); + return new j$.private.SetContaining(sample); }; /** @@ -609,8 +602,8 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { return false; } return ( - putativeSpy.and instanceof j$.SpyStrategy && - putativeSpy.calls instanceof j$.CallTracker + putativeSpy.and instanceof j$.private.SpyStrategy && + putativeSpy.calls instanceof j$.private.CallTracker ); }; @@ -715,7 +708,7 @@ getJasmineRequireObj().util = function(j$) { } else if (str === '[object Date]') { return new Date(arg.valueOf()); } else { - return j$.util.clone(arg); + return j$.private.util.clone(arg); } }); }; @@ -737,7 +730,7 @@ getJasmineRequireObj().util = function(j$) { }; function callerFile() { - const trace = new j$.StackTrace(new Error()); + const trace = new j$.private.StackTrace(new Error()); return trace.frames[1].file; } @@ -824,7 +817,7 @@ getJasmineRequireObj().Spec = function(j$) { } addExpectationResult(passed, data, isError) { - const expectationResult = j$.buildExpectationResult(data); + const expectationResult = j$.private.buildExpectationResult(data); if (passed) { this.result.passedExpectations.push(expectationResult); @@ -841,7 +834,7 @@ getJasmineRequireObj().Spec = function(j$) { } if (this.#throwOnExpectationFailure && !isError) { - throw new j$.errors.ExpectationFailed(); + throw new j$.private.errors.ExpectationFailed(); } } } @@ -855,8 +848,8 @@ getJasmineRequireObj().Spec = function(j$) { // Key and value will eventually be cloned during reporting. The error // thrown at that point if they aren't cloneable isn't very helpful. // Throw a better one now. - j$.util.assertStructuredCloneable(key, 'Key'); - j$.util.assertStructuredCloneable(value, 'Value'); + j$.private.util.assertStructuredCloneable(key, 'Key'); + j$.private.util.assertStructuredCloneable(value, 'Value'); this.result.properties = this.result.properties || {}; this.result.properties[key] = value; } @@ -975,7 +968,7 @@ getJasmineRequireObj().Spec = function(j$) { return; } - if (e instanceof j$.errors.ExpectationFailed) { + if (e instanceof j$.private.errors.ExpectationFailed) { return; } @@ -1045,7 +1038,7 @@ getJasmineRequireObj().Spec = function(j$) { deprecation = { message: deprecation }; } this.result.deprecationWarnings.push( - j$.buildExpectationResult(deprecation) + j$.private.buildExpectationResult(deprecation) ); } @@ -1199,18 +1192,18 @@ getJasmineRequireObj().Env = function(j$) { envOptions = envOptions || {}; const self = this; - const GlobalErrors = envOptions.GlobalErrors || j$.GlobalErrors; + const GlobalErrors = envOptions.GlobalErrors || j$.private.GlobalErrors; const global = envOptions.global || j$.getGlobal(); const realSetTimeout = global.setTimeout; const realClearTimeout = global.clearTimeout; - const clearStack = j$.getClearStack(global); - this.clock = new j$.Clock( + const clearStack = j$.private.getClearStack(global); + this.clock = new j$.private.Clock( global, function() { - return new j$.DelayedFunctionScheduler(); + return new j$.private.DelayedFunctionScheduler(); }, - new j$.MockDate(global) + new j$.private.MockDate(global) ); const globalErrors = new GlobalErrors( @@ -1238,7 +1231,7 @@ getJasmineRequireObj().Env = function(j$) { }; })(); - const runableResources = new j$.RunableResources({ + const runableResources = new j$.private.RunableResources({ getCurrentRunableId: function() { const r = runner.currentRunable(); return r ? r.id : null; @@ -1251,7 +1244,7 @@ getJasmineRequireObj().Env = function(j$) { let runner; let parallelLoadingState = null; // 'specs', 'helpers', or null for non-parallel - const config = new j$.Configuration(); + const config = new j$.private.Configuration(); if (!envOptions.suppressLoadErrors) { installGlobalErrors(); @@ -1320,11 +1313,11 @@ getJasmineRequireObj().Env = function(j$) { runableResources.customObjectFormatters().push(formatter); }; - j$.Expectation.addCoreMatchers(j$.matchers); - j$.Expectation.addAsyncCoreMatchers(j$.asyncMatchers); + j$.private.Expectation.addCoreMatchers(j$.private.matchers); + j$.private.Expectation.addAsyncCoreMatchers(j$.private.asyncMatchers); const expectationFactory = function(actual, spec) { - return j$.Expectation.factory({ + return j$.private.Expectation.factory({ matchersUtil: runableResources.makeMatchersUtil(), customMatchers: runableResources.customMatchers(), actual: actual, @@ -1357,7 +1350,7 @@ getJasmineRequireObj().Env = function(j$) { }; const throwUnlessFactory = function(actual, spec) { - return j$.Expectation.factory({ + return j$.private.Expectation.factory({ matchersUtil: runableResources.makeMatchersUtil(), customMatchers: runableResources.customMatchers(), actual: actual, @@ -1366,7 +1359,7 @@ getJasmineRequireObj().Env = function(j$) { }; const throwUnlessAsyncFactory = function(actual, spec) { - return j$.Expectation.asyncFactory({ + return j$.private.Expectation.asyncFactory({ matchersUtil: runableResources.makeMatchersUtil(), customAsyncMatchers: runableResources.customAsyncMatchers(), actual: actual, @@ -1381,7 +1374,7 @@ getJasmineRequireObj().Env = function(j$) { error.matcherName !== undefined && error.passed !== undefined; const result = isExpectationResult ? error - : j$.buildExpectationResult({ + : j$.private.buildExpectationResult({ error, passed: false, matcherName: '', @@ -1442,7 +1435,7 @@ getJasmineRequireObj().Env = function(j$) { } const asyncExpectationFactory = function(actual, spec, runableType) { - return j$.Expectation.asyncFactory({ + return j$.private.Expectation.asyncFactory({ matchersUtil: runableResources.makeMatchersUtil(), customAsyncMatchers: runableResources.customAsyncMatchers(), actual: actual, @@ -1498,10 +1491,10 @@ getJasmineRequireObj().Env = function(j$) { (runner.currentRunable() || topSuite).handleException(e); }; - new j$.QueueRunner(options).execute(); + new j$.private.QueueRunner(options).execute(); } - const suiteBuilder = new j$.SuiteBuilder({ + const suiteBuilder = new j$.private.SuiteBuilder({ env: this, expectationFactory, asyncExpectationFactory, @@ -1509,7 +1502,7 @@ getJasmineRequireObj().Env = function(j$) { runQueue }); topSuite = suiteBuilder.topSuite; - const deprecator = new j$.Deprecator(topSuite); + const deprecator = new j$.private.Deprecator(topSuite); /** * Provides the root suite, through which all suites and specs can be @@ -1529,23 +1522,23 @@ getJasmineRequireObj().Env = function(j$) { * @interface Reporter * @see custom_reporter */ - reportDispatcher = new j$.ReportDispatcher( - j$.reporterEvents, + reportDispatcher = new j$.private.ReportDispatcher( + j$.private.reporterEvents, function(options) { - options.SkipPolicy = j$.NeverSkipPolicy; + options.SkipPolicy = j$.private.NeverSkipPolicy; return runQueue(options); }, recordLateError ); - runner = new j$.Runner({ + runner = new j$.private.Runner({ topSuite, totalSpecsDefined: () => suiteBuilder.totalSpecsDefined, focusedRunables: () => suiteBuilder.focusedRunables, runableResources, reportDispatcher, runQueue, - TreeProcessor: j$.TreeProcessor, + TreeProcessor: j$.private.TreeProcessor, globalErrors, getConfig: () => config }); @@ -1711,7 +1704,7 @@ getJasmineRequireObj().Env = function(j$) { try { const maybePromise = fn(spy); - if (!j$.isPromiseLike(maybePromise)) { + if (!j$.private.isPromiseLike(maybePromise)) { throw new Error( 'The callback to spyOnGlobalErrorsAsync must be an async or promise-returning function' ); @@ -1946,7 +1939,7 @@ getJasmineRequireObj().Env = function(j$) { }; this.pending = function(message) { - let fullMessage = j$.Spec.pendingSpecExceptionMessage; + let fullMessage = j$.private.Spec.pendingSpecExceptionMessage; if (message) { fullMessage += message; } @@ -1965,7 +1958,7 @@ getJasmineRequireObj().Env = function(j$) { message += ': '; if (error.message) { message += error.message; - } else if (j$.isString_(error)) { + } else if (j$.private.isString(error)) { message += error; } else { // pretty print all kind of objects. This includes arrays. @@ -1994,7 +1987,7 @@ getJasmineRequireObj().Env = function(j$) { } function callerCallerFilename() { - const frames = new j$.StackTrace(new Error()).frames; + const frames = new j$.private.StackTrace(new Error()).frames; // frames[3] should always exist except in Jasmine's own tests, which bypass // the global it/describe layer, but don't crash if it doesn't. return frames[3] && frames[3].file; @@ -2173,7 +2166,7 @@ getJasmineRequireObj().Any = function(j$) { }; Any.prototype.jasmineToString = function() { - return ''; + return ''; }; return Any; @@ -2199,10 +2192,10 @@ getJasmineRequireObj().ArrayContaining = function(j$) { } ArrayContaining.prototype.asymmetricMatch = function(other, matchersUtil) { - if (!j$.isArray_(this.sample)) { + if (!j$.private.isArray(this.sample)) { throw new Error( 'You must provide an array to arrayContaining, not ' + - j$.basicPrettyPrinter_(this.sample) + + j$.private.basicPrettyPrinter(this.sample) + '.' ); } @@ -2210,7 +2203,7 @@ getJasmineRequireObj().ArrayContaining = function(j$) { // If the actual parameter is not an array, we can fail immediately, since it couldn't // possibly be an "array containing" anything. However, we also want an empty sample // array to match anything, so we need to double-check we aren't in that case - if (!j$.isArray_(other) && this.sample.length > 0) { + if (!j$.private.isArray(other) && this.sample.length > 0) { return false; } @@ -2239,10 +2232,10 @@ getJasmineRequireObj().ArrayWithExactContents = function(j$) { other, matchersUtil ) { - if (!j$.isArray_(this.sample)) { + if (!j$.private.isArray(this.sample)) { throw new Error( 'You must provide an array to arrayWithExactContents, not ' + - j$.basicPrettyPrinter_(this.sample) + + j$.private.basicPrettyPrinter(this.sample) + '.' ); } @@ -2271,15 +2264,19 @@ getJasmineRequireObj().Empty = function(j$) { function Empty() {} Empty.prototype.asymmetricMatch = function(other) { - if (j$.isString_(other) || j$.isArray_(other) || j$.isTypedArray_(other)) { + if ( + j$.private.isString(other) || + j$.private.isArray(other) || + j$.private.isTypedArray(other) + ) { return other.length === 0; } - if (j$.isMap(other) || j$.isSet(other)) { + if (j$.private.isMap(other) || j$.private.isSet(other)) { return other.size === 0; } - if (j$.isObject_(other)) { + if (j$.private.isObject(other)) { return Object.keys(other).length === 0; } return false; @@ -2326,10 +2323,10 @@ getJasmineRequireObj().Is = function(j$) { getJasmineRequireObj().MapContaining = function(j$) { function MapContaining(sample) { - if (!j$.isMap(sample)) { + if (!j$.private.isMap(sample)) { throw new Error( 'You must provide a map to `mapContaining`, not ' + - j$.basicPrettyPrinter_(sample) + j$.private.basicPrettyPrinter(sample) ); } @@ -2337,7 +2334,7 @@ getJasmineRequireObj().MapContaining = function(j$) { } MapContaining.prototype.asymmetricMatch = function(other, matchersUtil) { - if (!j$.isMap(other)) { + if (!j$.private.isMap(other)) { return false; } @@ -2374,15 +2371,19 @@ getJasmineRequireObj().NotEmpty = function(j$) { function NotEmpty() {} NotEmpty.prototype.asymmetricMatch = function(other) { - if (j$.isString_(other) || j$.isArray_(other) || j$.isTypedArray_(other)) { + if ( + j$.private.isString(other) || + j$.private.isArray(other) || + j$.private.isTypedArray(other) + ) { return other.length !== 0; } - if (j$.isMap(other) || j$.isSet(other)) { + if (j$.private.isMap(other) || j$.private.isSet(other)) { return other.size !== 0; } - if (j$.isObject_(other)) { + if (j$.private.isObject(other)) { return Object.keys(other).length !== 0; } @@ -2438,7 +2439,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) { }; ObjectContaining.prototype.valuesForDiff_ = function(other, pp) { - if (!j$.isObject_(other)) { + if (!j$.private.isObject(other)) { return { self: this.jasmineToString(pp), other: other @@ -2467,10 +2468,10 @@ getJasmineRequireObj().ObjectContaining = function(j$) { getJasmineRequireObj().SetContaining = function(j$) { function SetContaining(sample) { - if (!j$.isSet(sample)) { + if (!j$.private.isSet(sample)) { throw new Error( 'You must provide a set to `setContaining`, not ' + - j$.basicPrettyPrinter_(sample) + j$.private.basicPrettyPrinter(sample) ); } @@ -2478,7 +2479,7 @@ getJasmineRequireObj().SetContaining = function(j$) { } SetContaining.prototype.asymmetricMatch = function(other, matchersUtil) { - if (!j$.isSet(other)) { + if (!j$.private.isSet(other)) { return false; } @@ -2511,7 +2512,7 @@ getJasmineRequireObj().SetContaining = function(j$) { getJasmineRequireObj().StringContaining = function(j$) { function StringContaining(expected) { - if (!j$.isString_(expected)) { + if (!j$.private.isString(expected)) { throw new Error('Expected is not a String'); } @@ -2519,7 +2520,7 @@ getJasmineRequireObj().StringContaining = function(j$) { } StringContaining.prototype.asymmetricMatch = function(other) { - if (!j$.isString_(other)) { + if (!j$.private.isString(other)) { // Arrays, etc. don't match no matter what their indexOf returns. return false; } @@ -2536,7 +2537,7 @@ getJasmineRequireObj().StringContaining = function(j$) { getJasmineRequireObj().StringMatching = function(j$) { function StringMatching(expected) { - if (!j$.isString_(expected) && !j$.isA_('RegExp', expected)) { + if (!j$.private.isString(expected) && !j$.private.isA('RegExp', expected)) { throw new Error('Expected is not a String or a RegExp'); } @@ -2571,7 +2572,7 @@ getJasmineRequireObj().Truthy = function(j$) { //TODO: expectation result may make more sense as a presentation of an expectation. getJasmineRequireObj().buildExpectationResult = function(j$) { function buildExpectationResult(options) { - const exceptionFormatter = new j$.ExceptionFormatter(); + const exceptionFormatter = new j$.private.ExceptionFormatter(); /** * Describes the result of evaluating an expectation @@ -2594,7 +2595,7 @@ getJasmineRequireObj().buildExpectationResult = function(j$) { }; if (!result.passed) { - if (options.error && !j$.isString_(options.error)) { + if (options.error && !j$.private.isString(options.error)) { if ('code' in options.error) { result.code = options.error.code; } @@ -2768,7 +2769,9 @@ getJasmineRequireObj().CallTracker = function(j$) { * @param {Function} [argsCloner] A function to use to clone the arguments. Defaults to a shallow cloning function. * @function */ - this.saveArgumentsByValue = function(argsCloner = j$.util.cloneArgs) { + this.saveArgumentsByValue = function( + argsCloner = j$.private.util.cloneArgs + ) { opts.cloneArgs = true; opts.argsCloner = argsCloner; }; @@ -3759,7 +3762,7 @@ getJasmineRequireObj().Deprecator = function(j$) { ) { options = options || {}; - if (!this.verbose_ && !j$.isError_(deprecation)) { + if (!this.verbose_ && !j$.private.isError(deprecation)) { if (this.toSuppress_.indexOf(deprecation) !== -1) { return; } @@ -3771,7 +3774,7 @@ getJasmineRequireObj().Deprecator = function(j$) { }; Deprecator.prototype.log_ = function(runnable, deprecation, options) { - if (j$.isError_(deprecation)) { + if (j$.private.isError(deprecation)) { // eslint-disable-next-line no-console console.error(deprecation); return; @@ -3800,7 +3803,7 @@ getJasmineRequireObj().Deprecator = function(j$) { }; Deprecator.prototype.stackTrace_ = function() { - const formatter = new j$.ExceptionFormatter(); + const formatter = new j$.private.ExceptionFormatter(); return formatter.stack(new Error()).replace(/^Error\n/m, ''); }; @@ -3809,7 +3812,7 @@ getJasmineRequireObj().Deprecator = function(j$) { runnable = this.topSuite_; } - if (j$.isError_(deprecation)) { + if (j$.private.isError(deprecation)) { runnable.addDeprecationWarning(deprecation); return; } @@ -3854,7 +3857,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) { function ExceptionFormatter(options) { const jasmineFile = - (options && options.jasmineFile) || j$.util.jasmineFile(); + (options && options.jasmineFile) || j$.private.util.jasmineFile(); this.message = function(error) { let message = ''; @@ -3898,7 +3901,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) { lines.pop(); } - const stackTrace = new j$.StackTrace(error); + const stackTrace = new j$.private.StackTrace(error); lines = lines.concat(filterJasmine(stackTrace)); if (messageHandling === 'require') { @@ -3951,7 +3954,9 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) { } if (!empty) { - return 'error properties: ' + j$.basicPrettyPrinter_(result) + '\n'; + return ( + 'error properties: ' + j$.private.basicPrettyPrinter(result) + '\n' + ); } return ''; @@ -3967,7 +3972,7 @@ getJasmineRequireObj().Expectation = function(j$) { * @namespace matchers */ function Expectation(options) { - this.expector = new j$.Expector(options); + this.expector = new j$.private.Expector(options); const customMatchers = options.customMatchers || {}; for (const matcherName in customMatchers) { @@ -4043,7 +4048,7 @@ getJasmineRequireObj().Expectation = function(j$) { * @namespace async-matchers */ function AsyncExpectation(options) { - this.expector = new j$.Expector(options); + this.expector = new j$.private.Expector(options); const customAsyncMatchers = options.customAsyncMatchers || {}; for (const matcherName in customAsyncMatchers) { @@ -4136,7 +4141,7 @@ getJasmineRequireObj().Expectation = function(j$) { function negatedFailureMessage(result, matcherName, args, matchersUtil) { if (result.message) { - if (j$.isFunction_(result.message)) { + if (j$.private.isFunction(result.message)) { return result.message(); } else { return result.message; @@ -4181,7 +4186,7 @@ getJasmineRequireObj().Expectation = function(j$) { return function(actual) { const matcherArgs = arguments; - return j$.isPending_(actual).then(function(isPending) { + return j$.private.isPending(actual).then(function(isPending) { if (isPending) { return { pass: false, @@ -4286,7 +4291,7 @@ getJasmineRequireObj().Expector = function(j$) { }; this.actual = options.actual; this.addExpectationResult = options.addExpectationResult || function() {}; - this.filters = new j$.ExpectationFilterChain(); + this.filters = new j$.private.ExpectationFilterChain(); } Expector.prototype.instantiateMatcher = function( @@ -4320,7 +4325,7 @@ getJasmineRequireObj().Expector = function(j$) { this.matchersUtil, args ); - } else if (j$.isFunction_(result.message)) { + } else if (j$.private.isFunction(result.message)) { return result.message(); } else { return result.message; @@ -4409,7 +4414,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) { if ( global.process && global.process.listeners && - j$.isFunction_(global.process.on) + j$.private.isFunction(global.process.on) ) { this.#adapter = new NodeAdapter(global, dispatch); } else { @@ -4558,7 +4563,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) { const jasmineMessage = 'Unhandled promise rejection: ' + event.reason; let reason; - if (j$.isError_(event.reason)) { + if (j$.private.isError(event.reason)) { reason = event.reason; reason.jasmineMessage = jasmineMessage; } else { @@ -4637,7 +4642,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) { jasmineMessagePrefix = 'Uncaught exception'; } - if (j$.isError_(error)) { + if (j$.private.isError(error)) { error.jasmineMessage = jasmineMessagePrefix + ': ' + error; return error; } else { @@ -4690,7 +4695,7 @@ getJasmineRequireObj().toBePending = function(j$) { return function toBePending() { return { compare: function(actual) { - if (!j$.isPromiseLike(actual)) { + if (!j$.private.isPromiseLike(actual)) { throw new Error( `Expected toBePending to be called on a promise but was on a ${typeof actual}.` ); @@ -4724,7 +4729,7 @@ getJasmineRequireObj().toBeRejected = function(j$) { return function toBeRejected() { return { compare: function(actual) { - if (!j$.isPromiseLike(actual)) { + if (!j$.private.isPromiseLike(actual)) { throw new Error( `Expected toBeRejected to be called on a promise but was on a ${typeof actual}.` ); @@ -4758,7 +4763,7 @@ getJasmineRequireObj().toBeRejectedWith = function(j$) { return function toBeRejectedWith(matchersUtil) { return { compare: function(actualPromise, expectedValue) { - if (!j$.isPromiseLike(actualPromise)) { + if (!j$.private.isPromiseLike(actualPromise)) { throw new Error( `Expected toBeRejectedWith to be called on a promise but was on a ${typeof actualPromise}.` ); @@ -4822,7 +4827,7 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) { return function toBeRejectedWithError(matchersUtil) { return { compare: function(actualPromise, arg1, arg2) { - if (!j$.isPromiseLike(actualPromise)) { + if (!j$.private.isPromiseLike(actualPromise)) { throw new Error( `Expected toBeRejectedWithError to be called on a promise but was on a ${typeof actualPromise}.` ); @@ -4846,14 +4851,14 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) { }; function matchError(actual, expected, matchersUtil) { - if (!j$.isError_(actual)) { + if (!j$.private.isError(actual)) { return fail(expected, 'rejected with ' + matchersUtil.pp(actual)); } if (!(actual instanceof expected.error)) { return fail( expected, - 'rejected with type ' + j$.fnNameFor(actual.constructor) + 'rejected with type ' + j$.private.fnNameFor(actual.constructor) ); } @@ -4913,7 +4918,7 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) { error: error, message: message, printValue: - j$.fnNameFor(error) + + j$.private.fnNameFor(error) + (typeof message === 'undefined' ? '' : ': ' + matchersUtil.pp(message)) }; } @@ -4921,7 +4926,7 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) { function isErrorConstructor(value) { return ( typeof value === 'function' && - (value === Error || j$.isError_(value.prototype)) + (value === Error || j$.private.isError(value.prototype)) ); } }; @@ -4941,7 +4946,7 @@ getJasmineRequireObj().toBeResolved = function(j$) { return function toBeResolved(matchersUtil) { return { compare: function(actual) { - if (!j$.isPromiseLike(actual)) { + if (!j$.private.isPromiseLike(actual)) { throw new Error( `Expected toBeResolved to be called on a promise but was on a ${typeof actual}.` ); @@ -4983,7 +4988,7 @@ getJasmineRequireObj().toBeResolvedTo = function(j$) { return function toBeResolvedTo(matchersUtil) { return { compare: function(actualPromise, expectedValue) { - if (!j$.isPromiseLike(actualPromise)) { + if (!j$.private.isPromiseLike(actualPromise)) { throw new Error( `Expected toBeResolvedTo to be called on a promise but was on a ${typeof actualPromise}.` ); @@ -5036,9 +5041,9 @@ getJasmineRequireObj().DiffBuilder = function(j$) { class DiffBuilder { constructor(config) { this.prettyPrinter_ = - (config || {}).prettyPrinter || j$.makePrettyPrinter(); - this.mismatches_ = new j$.MismatchTree(); - this.path_ = new j$.ObjectPath(); + (config || {}).prettyPrinter || j$.private.makePrettyPrinter(); + this.mismatches_ = new j$.private.MismatchTree(); + this.path_ = new j$.private.ObjectPath(); this.actualRoot_ = undefined; this.expectedRoot_ = undefined; } @@ -5099,8 +5104,8 @@ getJasmineRequireObj().DiffBuilder = function(j$) { const handleAsymmetricExpected = () => { if ( - j$.isAsymmetricEqualityTester_(expected) && - j$.isFunction_(expected.valuesForDiff_) + j$.private.isAsymmetricEqualityTester(expected) && + j$.private.isFunction(expected.valuesForDiff_) ) { const asymmetricResult = expected.valuesForDiff_( actual, @@ -5184,7 +5189,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { return false; } - if (j$.isSet(haystack)) { + if (j$.private.isSet(haystack)) { // Try .has() first. It should be faster in cases where // needle === something in haystack. Fall back to .equals() comparison // if that fails. @@ -5193,7 +5198,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { } } - if (j$.isIterable_(haystack) && !j$.isString_(haystack)) { + if (j$.private.isIterable(haystack) && !j$.private.isString(haystack)) { // Arrays, Sets, etc. for (const candidate of haystack) { if (this.equals(candidate, needle)) { @@ -5209,7 +5214,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { return haystack.indexOf(needle) >= 0; } - if (j$.isNumber_(haystack.length)) { + if (j$.private.isNumber(haystack.length)) { // Objects that are shaped like arrays but aren't iterable for (let i = 0; i < haystack.length; i++) { if (this.equals(haystack[i], needle)) { @@ -5256,7 +5261,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { bStack, diffBuilder ) { - if (j$.isFunction_(b.valuesForDiff_)) { + if (j$.private.isFunction(b.valuesForDiff_)) { const values = b.valuesForDiff_(a, this.pp); this.eq_(values.other, values.self, aStack, bStack, diffBuilder); } else { @@ -5271,8 +5276,8 @@ getJasmineRequireObj().MatchersUtil = function(j$) { bStack, diffBuilder ) { - const asymmetricA = j$.isAsymmetricEqualityTester_(a); - const asymmetricB = j$.isAsymmetricEqualityTester_(b); + const asymmetricA = j$.private.isAsymmetricEqualityTester(a); + const asymmetricB = j$.private.isAsymmetricEqualityTester(b); if (asymmetricA === asymmetricB) { return undefined; @@ -5307,7 +5312,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { * @returns {boolean} True if the values are equal */ MatchersUtil.prototype.equals = function(a, b, diffBuilder) { - diffBuilder = diffBuilder || j$.NullDiffBuilder(); + diffBuilder = diffBuilder || j$.private.NullDiffBuilder(); diffBuilder.setRoots(a, b); return this.eq_(a, b, [], [], diffBuilder); @@ -5422,8 +5427,8 @@ getJasmineRequireObj().MatchersUtil = function(j$) { return false; } - const aIsDomNode = j$.isDomNode(a); - const bIsDomNode = j$.isDomNode(b); + const aIsDomNode = j$.private.isDomNode(a); + const bIsDomNode = j$.private.isDomNode(b); if (aIsDomNode && bIsDomNode) { // At first try to use DOM3 method isEqualNode result = a.isEqualNode(b); @@ -5437,8 +5442,8 @@ getJasmineRequireObj().MatchersUtil = function(j$) { return false; } - const aIsPromise = j$.isPromise(a); - const bIsPromise = j$.isPromise(b); + const aIsPromise = j$.private.isPromise(a); + const bIsPromise = j$.private.isPromise(b); if (aIsPromise && bIsPromise) { return a === b; } @@ -5492,7 +5497,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { if (!result) { return false; } - } else if (j$.isMap(a) && j$.isMap(b)) { + } else if (j$.private.isMap(a) && j$.private.isMap(b)) { if (a.size != b.size) { diffBuilder.recordMismatch(); return false; @@ -5525,9 +5530,15 @@ getJasmineRequireObj().MatchersUtil = function(j$) { // otherwise explicitly look up the mapKey in the other Map since we want keys with unique // obj identity (that are otherwise equal) to not match. if ( - j$.isAsymmetricEqualityTester_(mapKey) || - (j$.isAsymmetricEqualityTester_(cmpKey) && - this.eq_(mapKey, cmpKey, aStack, bStack, j$.NullDiffBuilder())) + j$.private.isAsymmetricEqualityTester(mapKey) || + (j$.private.isAsymmetricEqualityTester(cmpKey) && + this.eq_( + mapKey, + cmpKey, + aStack, + bStack, + j$.private.NullDiffBuilder() + )) ) { mapValueB = b.get(cmpKey); } else { @@ -5538,7 +5549,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { mapValueB, aStack, bStack, - j$.NullDiffBuilder() + j$.private.NullDiffBuilder() ); } } @@ -5547,7 +5558,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { diffBuilder.recordMismatch(); return false; } - } else if (j$.isSet(a) && j$.isSet(b)) { + } else if (j$.private.isSet(a) && j$.private.isSet(b)) { if (a.size != b.size) { diffBuilder.recordMismatch(); return false; @@ -5583,7 +5594,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { otherValue, baseStack, otherStack, - j$.NullDiffBuilder() + j$.private.NullDiffBuilder() ); if (!found && prevStackSize !== baseStack.length) { baseStack.splice(prevStackSize); @@ -5598,7 +5609,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { diffBuilder.recordMismatch(); return false; } - } else if (j$.isURL(a) && j$.isURL(b)) { + } else if (j$.private.isURL(a) && j$.private.isURL(b)) { // URLs have no enumrable properties, so the default object comparison // would consider any two URLs to be equal. return a.toString() === b.toString(); @@ -5636,7 +5647,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { for (const key of aKeys) { // Deep compare each member - if (!j$.util.has(b, key)) { + if (!j$.private.util.has(b, key)) { diffBuilder.recordMismatch( objectKeysAreDifferentFormatter.bind(null, this.pp) ); @@ -5666,7 +5677,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { const allKeys = (function(o) { const keys = []; for (const key in o) { - if (j$.util.has(o, key)) { + if (j$.private.util.has(o, key)) { keys.push(key); } } @@ -5707,7 +5718,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { // and not in objB. function extraKeysAndValues(objA, objB) { return MatchersUtil.keys(objA) - .filter(key => !j$.util.has(objB, key)) + .filter(key => !j$.private.util.has(objB, key)) .map(key => [key, objA[key]]); } @@ -5746,7 +5757,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { 'Expected ' + path + ' to be a kind of ' + - j$.fnNameFor(expected.constructor) + + j$.private.fnNameFor(expected.constructor) + ', but was ' + pp(actual) + '.' @@ -5835,7 +5846,7 @@ getJasmineRequireObj().MismatchTree = function(j$) { */ class MismatchTree { constructor(path) { - this.path = path || new j$.ObjectPath([]); + this.path = path || new j$.private.ObjectPath([]); this.formatter = undefined; this.children = []; this.isMismatch = false; @@ -6182,7 +6193,7 @@ getJasmineRequireObj().toBeGreaterThanOrEqual = function() { }; getJasmineRequireObj().toBeInstanceOf = function(j$) { - const usageError = j$.formatErrorMsg( + const usageError = j$.private.formatErrorMsg( '', 'expect(value).toBeInstanceOf()' ); @@ -6203,16 +6214,16 @@ getJasmineRequireObj().toBeInstanceOf = function(j$) { compare: function(actual, expected) { const actualType = actual && actual.constructor - ? j$.fnNameFor(actual.constructor) + ? j$.private.fnNameFor(actual.constructor) : matchersUtil.pp(actual); const expectedType = expected - ? j$.fnNameFor(expected) + ? j$.private.fnNameFor(expected) : matchersUtil.pp(expected); let expectedMatcher; let pass; try { - expectedMatcher = new j$.Any(expected); + expectedMatcher = new j$.private.Any(expected); pass = expectedMatcher.asymmetricMatch(actual); // eslint-disable-next-line no-unused-vars } catch (error) { @@ -6539,7 +6550,9 @@ getJasmineRequireObj().toEqual = function(j$) { const result = { pass: false }, - diffBuilder = new j$.DiffBuilder({ prettyPrinter: matchersUtil.pp }); + diffBuilder = new j$.private.DiffBuilder({ + prettyPrinter: matchersUtil.pp + }); result.pass = matchersUtil.equals(actual, expected, diffBuilder); @@ -6555,7 +6568,7 @@ getJasmineRequireObj().toEqual = function(j$) { }; getJasmineRequireObj().toHaveBeenCalled = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalled()' ); @@ -6605,7 +6618,7 @@ getJasmineRequireObj().toHaveBeenCalled = function(j$) { }; getJasmineRequireObj().toHaveBeenCalledBefore = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalledBefore()' ); @@ -6701,7 +6714,7 @@ getJasmineRequireObj().toHaveBeenCalledBefore = function(j$) { }; getJasmineRequireObj().toHaveBeenCalledOnceWith = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalledOnceWith(...arguments)' ); @@ -6764,7 +6777,7 @@ getJasmineRequireObj().toHaveBeenCalledOnceWith = function(j$) { function getDiffs() { return actual.calls.allArgs().map(function(argsForCall, callIx) { - const diffBuilder = new j$.DiffBuilder(); + const diffBuilder = new j$.private.DiffBuilder(); matchersUtil.equals(argsForCall, expectedArgs, diffBuilder); return diffBuilder.getMessage(); }); @@ -6810,7 +6823,7 @@ getJasmineRequireObj().toHaveBeenCalledOnceWith = function(j$) { }; getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalledTimes()' ); @@ -6838,7 +6851,7 @@ getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) { const args = Array.prototype.slice.call(arguments, 0), result = { pass: false }; - if (!j$.isNumber_(expected)) { + if (!j$.private.isNumber(expected)) { throw new Error( getErrorMsg( 'The expected times failed is a required argument and must be a number.' @@ -6886,7 +6899,7 @@ getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) { }; getJasmineRequireObj().toHaveBeenCalledWith = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalledWith(...arguments)' ); @@ -6958,7 +6971,7 @@ getJasmineRequireObj().toHaveBeenCalledWith = function(j$) { const diffs = actual.calls .allArgs() .map(function(argsForCall, callIx) { - const diffBuilder = new j$.DiffBuilder(); + const diffBuilder = new j$.private.DiffBuilder(); matchersUtil.equals(argsForCall, expectedArgs, diffBuilder); return ( 'Call ' + @@ -7020,7 +7033,9 @@ getJasmineRequireObj().toHaveClass = function(j$) { function isElement(maybeEl) { return ( - maybeEl && maybeEl.classList && j$.isFunction_(maybeEl.classList.contains) + maybeEl && + maybeEl.classList && + j$.private.isFunction(maybeEl.classList.contains) ); } @@ -7055,7 +7070,9 @@ getJasmineRequireObj().toHaveClasses = function(j$) { function isElement(maybeEl) { return ( - maybeEl && maybeEl.classList && j$.isFunction_(maybeEl.classList.contains) + maybeEl && + maybeEl.classList && + j$.private.isFunction(maybeEl.classList.contains) ); } @@ -7063,7 +7080,7 @@ getJasmineRequireObj().toHaveClasses = function(j$) { }; getJasmineRequireObj().toHaveNoOtherSpyInteractions = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveNoOtherSpyInteractions()' ); @@ -7081,7 +7098,7 @@ getJasmineRequireObj().toHaveNoOtherSpyInteractions = function(j$) { compare: function(actual) { const result = {}; - if (!j$.isObject_(actual)) { + if (!j$.private.isObject(actual)) { throw new Error( getErrorMsg('Expected an object, but got ' + typeof actual + '.') ); @@ -7167,15 +7184,15 @@ getJasmineRequireObj().toHaveSize = function(j$) { }; if ( - j$.isA_('WeakSet', actual) || - j$.isWeakMap(actual) || - j$.isDataView(actual) + j$.private.isA('WeakSet', actual) || + j$.private.isWeakMap(actual) || + j$.private.isDataView(actual) ) { throw new Error('Cannot get size of ' + actual + '.'); } let actualSize; - if (j$.isSet(actual) || j$.isMap(actual)) { + if (j$.private.isSet(actual) || j$.private.isMap(actual)) { actualSize = actual.size; } else if (isLength(actual.length)) { actualSize = actual.length; @@ -7218,7 +7235,7 @@ getJasmineRequireObj().toHaveSize = function(j$) { }; getJasmineRequireObj().toHaveSpyInteractions = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveSpyInteractions()' ); @@ -7237,7 +7254,7 @@ getJasmineRequireObj().toHaveSpyInteractions = function(j$) { compare: function(actual) { const result = {}; - if (!j$.isObject_(actual)) { + if (!j$.private.isObject(actual)) { throw new Error( getErrorMsg('Expected a spy object, but got ' + typeof actual + '.') ); @@ -7297,7 +7314,7 @@ getJasmineRequireObj().toHaveSpyInteractions = function(j$) { }; getJasmineRequireObj().toMatch = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toMatch( || )' ); @@ -7315,7 +7332,10 @@ getJasmineRequireObj().toMatch = function(j$) { function toMatch() { return { compare: function(actual, expected) { - if (!j$.isString_(expected) && !j$.isA_('RegExp', expected)) { + if ( + !j$.private.isString(expected) && + !j$.private.isA('RegExp', expected) + ) { throw new Error(getErrorMsg('Expected is not a String or a RegExp')); } @@ -7332,7 +7352,7 @@ getJasmineRequireObj().toMatch = function(j$) { }; getJasmineRequireObj().toThrow = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect(function() {}).toThrow()' ); @@ -7413,7 +7433,7 @@ getJasmineRequireObj().toThrow = function(j$) { }; getJasmineRequireObj().toThrowError = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect(function() {}).toThrowError(, )' ); @@ -7450,7 +7470,7 @@ getJasmineRequireObj().toThrowError = function(j$) { thrown = e; } - if (!j$.isError_(thrown)) { + if (!j$.private.isError(thrown)) { return fail(function() { return ( 'Expected function to throw an Error, but it threw ' + @@ -7493,7 +7513,7 @@ getJasmineRequireObj().toThrowError = function(j$) { match: function(error) { return pass( 'Expected function not to throw an Error, but it threw ' + - j$.fnNameFor(error) + + j$.private.fnNameFor(error) + '.' ); } @@ -7522,12 +7542,12 @@ getJasmineRequireObj().toThrowError = function(j$) { } const errorTypeDescription = errorType - ? j$.fnNameFor(errorType) + ? j$.private.fnNameFor(errorType) : 'an exception'; function thrownDescription(thrown) { const thrownName = errorType - ? j$.fnNameFor(thrown.constructor) + ? j$.private.fnNameFor(thrown.constructor) : 'an exception'; let thrownMessage = ''; @@ -7593,7 +7613,7 @@ getJasmineRequireObj().toThrowError = function(j$) { const Surrogate = function() {}; Surrogate.prototype = type.prototype; - return j$.isError_(new Surrogate()); + return j$.private.isError(new Surrogate()); } } @@ -7615,7 +7635,7 @@ getJasmineRequireObj().toThrowError = function(j$) { }; getJasmineRequireObj().toThrowMatching = function(j$) { - const usageError = j$.formatErrorMsg( + const usageError = j$.private.formatErrorMsg( '', 'expect(function() {}).toThrowMatching()' ); @@ -7669,7 +7689,7 @@ getJasmineRequireObj().toThrowMatching = function(j$) { function thrownDescription(thrown) { if (thrown && thrown.constructor) { return ( - j$.fnNameFor(thrown.constructor) + + j$.private.fnNameFor(thrown.constructor) + ' with message ' + matchersUtil.pp(thrown.message) ); @@ -7834,11 +7854,12 @@ getJasmineRequireObj().ParallelReportDispatcher = function(j$) { * @param onError {function} Function called when an unhandled exception, unhandled promise rejection, or explicit reporter failure occurs */ function ParallelReportDispatcher(onError, deps = {}) { - const ReportDispatcher = deps.ReportDispatcher || j$.ReportDispatcher; - const QueueRunner = deps.QueueRunner || j$.QueueRunner; - const globalErrors = deps.globalErrors || new j$.GlobalErrors(); + const ReportDispatcher = + deps.ReportDispatcher || j$.private.ReportDispatcher; + const QueueRunner = deps.QueueRunner || j$.private.QueueRunner; + const globalErrors = deps.globalErrors || new j$.private.GlobalErrors(); const dispatcher = new ReportDispatcher( - j$.reporterEvents, + j$.private.reporterEvents, function(queueRunnerOptions) { queueRunnerOptions = { ...queueRunnerOptions, @@ -7902,7 +7923,7 @@ getJasmineRequireObj().ParallelReportDispatcher = function(j$) { } }; - for (const eventName of j$.reporterEvents) { + for (const eventName of j$.private.reporterEvents) { self[eventName] = dispatcher[eventName].bind(dispatcher); } @@ -7940,7 +7961,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { this.emitScalar(''); } else if (value.jasmineToString) { this.emitScalar(value.jasmineToString(this.pp_)); - } else if (j$.isString_(value)) { + } else if (j$.private.isString(value)) { this.emitString(value); } else if (j$.isSpy(value)) { this.emitScalar('spy on ' + value.and.identity); @@ -7954,7 +7975,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } else { this.emitScalar('Function'); } - } else if (j$.isDomNode(value)) { + } else if (j$.private.isDomNode(value)) { if (value.tagName) { this.emitDomElement(value); } else { @@ -7962,16 +7983,16 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } } else if (value instanceof Date) { this.emitScalar('Date(' + value + ')'); - } else if (j$.isSet(value)) { + } else if (j$.private.isSet(value)) { this.emitSet(value); - } else if (j$.isMap(value)) { + } else if (j$.private.isMap(value)) { this.emitMap(value); - } else if (j$.isTypedArray_(value)) { + } else if (j$.private.isTypedArray(value)) { this.emitTypedArray(value); } else if ( value.toString && typeof value === 'object' && - !j$.isArray_(value) && + !j$.private.isArray(value) && hasCustomToString(value) ) { try { @@ -7983,12 +8004,15 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } else if (this.seen.includes(value)) { this.emitScalar( '' ); - } else if (j$.isArray_(value) || j$.isA_('Object', value)) { + } else if ( + j$.private.isArray(value) || + j$.private.isA('Object', value) + ) { this.seen.push(value); - if (j$.isArray_(value)) { + if (j$.private.isArray(value)) { this.emitArray(value); } else { this.emitObject(value); @@ -8011,7 +8035,10 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } iterateObject(obj, fn) { - const objKeys = j$.MatchersUtil.keys(obj, j$.isArray_(obj)); + const objKeys = j$.private.MatchersUtil.keys( + obj, + j$.private.isArray(obj) + ); const length = Math.min(objKeys.length, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH); for (let i = 0; i < length; i++) { @@ -8120,7 +8147,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { const ctor = obj.constructor; const constructorName = typeof ctor === 'function' && obj instanceof ctor - ? j$.fnNameFor(obj.constructor) + ? j$.private.fnNameFor(obj.constructor) : 'null'; this.append(constructorName); @@ -8150,7 +8177,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } emitTypedArray(arr) { - const constructorName = j$.fnNameFor(arr.constructor); + const constructorName = j$.private.fnNameFor(arr.constructor); const limitedArray = Array.prototype.slice.call( arr, 0, @@ -8219,7 +8246,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { // iframe, web worker) try { return ( - j$.isFunction_(value.toString) && + j$.private.isFunction(value.toString) && value.toString !== Object.prototype.toString && value.toString() !== Object.prototype.toString.call(value) ); @@ -8283,7 +8310,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { function StopExecutionError() {} StopExecutionError.prototype = new Error(); - j$.StopExecutionError = StopExecutionError; + j$.private.StopExecutionError = StopExecutionError; function once(fn, onTwice) { let called = false; @@ -8336,7 +8363,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { }; this.onException = attrs.onException || emptyFn; this.onMultipleDone = attrs.onMultipleDone || fallbackOnMultipleDone; - this.userContext = attrs.userContext || new j$.UserContext(); + this.userContext = attrs.userContext || new j$.private.UserContext(); this.timeout = attrs.timeout || { setTimeout: setTimeout, clearTimeout: clearTimeout @@ -8347,7 +8374,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { popListener: emptyFn }; - const SkipPolicy = attrs.SkipPolicy || j$.NeverSkipPolicy; + const SkipPolicy = attrs.SkipPolicy || j$.private.NeverSkipPolicy; this.skipPolicy_ = new SkipPolicy(this.queueableFns); this.errored_ = false; @@ -8470,7 +8497,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { if (queueableFn.fn.length === 0) { maybeThenable = queueableFn.fn.call(this.userContext); - if (maybeThenable && j$.isFunction_(maybeThenable.then)) { + if (maybeThenable && j$.private.isFunction(maybeThenable.then)) { maybeThenable.then( wrapInPromiseResolutionHandler(next), onPromiseRejection @@ -8540,11 +8567,11 @@ getJasmineRequireObj().QueueRunner = function(j$) { }; QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) { - if (retval && j$.isFunction_(retval.then)) { + if (retval && j$.private.isFunction(retval.then)) { // Issue a warning that matches the user's code. // Omit the stack trace because there's almost certainly no user code // on the stack at this point. - if (j$.isAsyncFunction_(fn)) { + if (j$.private.isAsyncFunction(fn)) { this.onException( new Error( 'An asynchronous before/it/after ' + @@ -8568,7 +8595,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { function wrapInPromiseResolutionHandler(fn) { return function(maybeArg) { - if (j$.isError_(maybeArg)) { + if (j$.private.isError(maybeArg)) { fn(maybeArg); } else { fn(); @@ -8673,7 +8700,7 @@ getJasmineRequireObj().ReportDispatcher = function(j$) { return ReportDispatcher; }; -getJasmineRequireObj().reporterEvents = function() { +getJasmineRequireObj().reporterEvents = function(j$) { /** * Used to tell Jasmine what optional or uncommonly implemented features * the reporter supports. If not specified, the defaults described in @@ -9124,7 +9151,7 @@ getJasmineRequireObj().interface = function(jasmine, env) { return env.spyOnAllFunctions(obj, includeNonEnumerable); }, - jsApiReporter: new jasmine.JsApiReporter({ + jsApiReporter: new jasmine.private.JsApiReporter({ timer: new jasmine.Timer() }), @@ -9300,7 +9327,7 @@ getJasmineRequireObj().RunableResources = function(j$) { this.getCurrentRunableId_ = options.getCurrentRunableId; this.globalErrors_ = options.globalErrors; - this.spyFactory = new j$.SpyFactory( + this.spyFactory = new j$.private.SpyFactory( () => { if (this.getCurrentRunableId_()) { return this.customSpyStrategies(); @@ -9312,7 +9339,7 @@ getJasmineRequireObj().RunableResources = function(j$) { () => this.makeMatchersUtil() ); - this.spyRegistry = new j$.SpyRegistry({ + this.spyRegistry = new j$.private.SpyRegistry({ currentSpies: () => this.spies(), createSpy: (name, originalFn) => this.spyFactory.createSpy(name, originalFn) @@ -9343,7 +9370,7 @@ getJasmineRequireObj().RunableResources = function(j$) { ]; for (const k of toClone) { - newRes[k] = j$.util.clone(parentRes[k]); + newRes[k] = j$.private.util.clone(parentRes[k]); } } } @@ -9421,17 +9448,19 @@ getJasmineRequireObj().RunableResources = function(j$) { } makePrettyPrinter() { - return j$.makePrettyPrinter(this.customObjectFormatters()); + return j$.private.makePrettyPrinter(this.customObjectFormatters()); } makeMatchersUtil() { if (this.getCurrentRunableId_()) { - return new j$.MatchersUtil({ + return new j$.private.MatchersUtil({ customTesters: this.customEqualityTesters(), pp: this.makePrettyPrinter() }); } else { - return new j$.MatchersUtil({ pp: j$.basicPrettyPrinter_ }); + return new j$.private.MatchersUtil({ + pp: j$.private.basicPrettyPrinter + }); } } @@ -9475,7 +9504,7 @@ getJasmineRequireObj().Runner = function(j$) { this.#reportDispatcher = options.reportDispatcher; this.#getConfig = options.getConfig; this.#executedBefore = false; - this.#currentRunableTracker = new j$.CurrentRunableTracker(); + this.#currentRunableTracker = new j$.private.CurrentRunableTracker(); } currentSpec() { @@ -9515,9 +9544,9 @@ getJasmineRequireObj().Runner = function(j$) { } } - const order = new j$.Order({ + const order = new j$.private.Order({ random: config.random, - seed: j$.isNumber_(config.seed) ? config.seed + '' : config.seed + seed: j$.private.isNumber(config.seed) ? config.seed + '' : config.seed }); const treeProcessor = new this.#TreeProcessor({ @@ -9559,7 +9588,7 @@ getJasmineRequireObj().Runner = function(j$) { }); this.#currentRunableTracker.pushSuite(this.#topSuite); - const treeRunner = new j$.TreeRunner({ + const treeRunner = new j$.private.TreeRunner({ executionTree: this.#executionTree, globalErrors: this.#globalErrors, runableResources: this.#runableResources, @@ -9729,7 +9758,7 @@ getJasmineRequireObj().Spy = function(j$) { }, matchersUtil ), - callTracker = new j$.CallTracker(); + callTracker = new j$.private.CallTracker(); function makeFunc(length, fn) { switch (length) { @@ -9821,9 +9850,9 @@ getJasmineRequireObj().Spy = function(j$) { } function SpyStrategyDispatcher(strategyArgs, matchersUtil) { - const baseStrategy = new j$.SpyStrategy(strategyArgs); + const baseStrategy = new j$.private.SpyStrategy(strategyArgs); const argsStrategies = new StrategyDict(function() { - return new j$.SpyStrategy(strategyArgs); + return new j$.private.SpyStrategy(strategyArgs); }, matchersUtil); this.and = baseStrategy; @@ -9895,12 +9924,12 @@ getJasmineRequireObj().SpyFactory = function(j$) { getMatchersUtil ) { this.createSpy = function(name, originalFn) { - if (j$.isFunction_(name) && originalFn === undefined) { + if (j$.private.isFunction(name) && originalFn === undefined) { originalFn = name; name = originalFn.name; } - return j$.Spy(name, getMatchersUtil(), { + return j$.private.Spy(name, getMatchersUtil(), { originalFn, customStrategies: getCustomStrategies(), defaultStrategyFn: getDefaultStrategyFn() @@ -9909,7 +9938,7 @@ getJasmineRequireObj().SpyFactory = function(j$) { this.createSpyObj = function(baseName, methodNames, propertyNames) { const baseNameIsCollection = - j$.isObject_(baseName) || j$.isArray_(baseName); + j$.private.isObject(baseName) || j$.private.isArray(baseName); if (baseNameIsCollection) { propertyNames = methodNames; @@ -9955,11 +9984,11 @@ getJasmineRequireObj().SpyFactory = function(j$) { function normalizeKeyValues(object) { const result = []; - if (j$.isArray_(object)) { + if (j$.private.isArray(object)) { for (let i = 0; i < object.length; i++) { result.push([object[i]]); } - } else if (j$.isObject_(object)) { + } else if (j$.private.isObject(object)) { for (const key in object) { if (object.hasOwnProperty(key)) { result.push([key, object[key]]); @@ -9973,11 +10002,11 @@ getJasmineRequireObj().SpyFactory = function(j$) { }; getJasmineRequireObj().SpyRegistry = function(j$) { - const spyOnMsg = j$.formatErrorMsg( + const spyOnMsg = j$.private.formatErrorMsg( '', 'spyOn(, )' ); - const spyOnPropertyMsg = j$.formatErrorMsg( + const spyOnPropertyMsg = j$.private.formatErrorMsg( '', 'spyOnProperty(, , [accessType])' ); @@ -10017,7 +10046,10 @@ getJasmineRequireObj().SpyRegistry = function(j$) { // Spying on mock clock timing fns would prevent the real ones from being // restored. - if (obj[methodName] && obj[methodName][j$.Clock.IsMockClockTimingFn]) { + if ( + obj[methodName] && + obj[methodName][j$.private.Clock.IsMockClockTimingFn] + ) { throw new Error("Mock clock timing functions can't be spied on"); } @@ -10068,7 +10100,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) { // localStorage in Firefox and later Safari versions, have no-op setters. if (obj[methodName] !== spiedMethod) { throw new Error( - j$.formatErrorMsg('')( + j$.private.formatErrorMsg('')( `Can't spy on ${methodName} because assigning to it had no effect` ) ); @@ -10096,7 +10128,10 @@ getJasmineRequireObj().SpyRegistry = function(j$) { throw new Error(getErrorMsg('No property name supplied')); } - const descriptor = j$.util.getPropertyDescriptor(obj, propertyName); + const descriptor = j$.private.util.getPropertyDescriptor( + obj, + propertyName + ); if (!descriptor) { throw new Error(getErrorMsg(propertyName + ' property does not exist')); @@ -10131,7 +10166,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) { } } - const originalDescriptor = j$.util.clone(descriptor); + const originalDescriptor = j$.private.util.clone(descriptor); const spy = createSpy(propertyName, descriptor[accessType]); let restoreStrategy; @@ -10268,7 +10303,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) { const cs = options.customStrategies || {}; for (const k in cs) { - if (j$.util.has(cs, k) && !this[k]) { + if (j$.private.util.has(cs, k) && !this[k]) { this[k] = createCustomPlan(cs[k]); } } @@ -10306,7 +10341,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) { return function() { const plan = factory.apply(null, arguments); - if (!j$.isFunction_(plan)) { + if (!j$.private.isFunction(plan)) { throw new Error('Spy strategy must return a function'); } @@ -10378,7 +10413,9 @@ getJasmineRequireObj().SpyStrategy = function(j$) { * @param {Error|Object|String} something Thing to throw */ SpyStrategy.prototype.throwError = function(something) { - const error = j$.isString_(something) ? new Error(something) : something; + const error = j$.private.isString(something) + ? new Error(something) + : something; this.plan = function() { throw error; }; @@ -10395,9 +10432,9 @@ getJasmineRequireObj().SpyStrategy = function(j$) { SpyStrategy.prototype.callFake = function(fn) { if ( !( - j$.isFunction_(fn) || - j$.isAsyncFunction_(fn) || - j$.isGeneratorFunction_(fn) + j$.private.isFunction(fn) || + j$.private.isAsyncFunction(fn) || + j$.private.isGeneratorFunction(fn) ) ) { throw new Error( @@ -10594,8 +10631,8 @@ getJasmineRequireObj().Suite = function(j$) { // Key and value will eventually be cloned during reporting. The error // thrown at that point if they aren't cloneable isn't very helpful. // Throw a better one now. - j$.util.assertStructuredCloneable(key, 'Key'); - j$.util.assertStructuredCloneable(value, 'Value'); + j$.private.util.assertStructuredCloneable(key, 'Key'); + j$.private.util.assertStructuredCloneable(value, 'Value'); this.result.properties = this.result.properties || {}; this.result.properties[key] = value; } @@ -10730,18 +10767,18 @@ getJasmineRequireObj().Suite = function(j$) { if (!this.sharedContext) { this.sharedContext = this.parentSuite ? this.parentSuite.clonedSharedUserContext() - : new j$.UserContext(); + : new j$.private.UserContext(); } return this.sharedContext; } clonedSharedUserContext() { - return j$.UserContext.fromExisting(this.sharedUserContext()); + return j$.private.UserContext.fromExisting(this.sharedUserContext()); } handleException() { - if (arguments[0] instanceof j$.errors.ExpectationFailed) { + if (arguments[0] instanceof j$.private.errors.ExpectationFailed) { return; } @@ -10750,7 +10787,7 @@ getJasmineRequireObj().Suite = function(j$) { passed: false, error: arguments[0] }; - const failedExpectation = j$.buildExpectationResult(data); + const failedExpectation = j$.private.buildExpectationResult(data); if (!this.parentSuite) { failedExpectation.globalErrorType = 'afterAll'; @@ -10792,7 +10829,7 @@ getJasmineRequireObj().Suite = function(j$) { return; } - const expectationResult = j$.buildExpectationResult(data); + const expectationResult = j$.private.buildExpectationResult(data); if (this.reportedDone) { this.onLateError(expectationResult); @@ -10806,7 +10843,7 @@ getJasmineRequireObj().Suite = function(j$) { } if (this.#throwOnExpectationFailure) { - throw new j$.errors.ExpectationFailed(); + throw new j$.private.errors.ExpectationFailed(); } } @@ -10815,7 +10852,7 @@ getJasmineRequireObj().Suite = function(j$) { deprecation = { message: deprecation }; } this.result.deprecationWarnings.push( - j$.buildExpectationResult(deprecation) + j$.private.buildExpectationResult(deprecation) ); } @@ -11000,7 +11037,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(fn, 'fit'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } const spec = this.specFactory_(description, fn, timeout, filename); this.currentDeclarationSuite_.addChild(spec); @@ -11013,7 +11050,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(beforeEachFunction, 'beforeEach'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } this.currentDeclarationSuite_.beforeEach({ @@ -11026,7 +11063,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(beforeAllFunction, 'beforeAll'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } this.currentDeclarationSuite_.beforeAll({ @@ -11039,7 +11076,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(afterEachFunction, 'afterEach'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } afterEachFunction.isCleanup = true; @@ -11053,7 +11090,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(afterAllFunction, 'afterAll'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } this.currentDeclarationSuite_.afterAll({ @@ -11064,7 +11101,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { it_(description, fn, timeout, filename) { if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } this.checkDuplicate_(description, 'spec'); @@ -11103,7 +11140,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { const parentSuite = this.currentDeclarationSuite_; const reportedParentSuiteId = parentSuite === this.topSuite ? null : parentSuite.id; - return new j$.Suite({ + return new j$.private.Suite({ id: 'suite' + this.nextSuiteId_++, description, filename, @@ -11145,7 +11182,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { const config = this.env_.configuration(); const suite = this.currentDeclarationSuite_; const parentSuiteId = suite === this.topSuite ? null : suite.id; - const spec = new j$.Spec({ + const spec = new j$.private.Spec({ id: 'spec' + this.nextSpecId_++, filename, parentSuiteId, @@ -11208,17 +11245,21 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { } function ensureIsFunction(fn, caller) { - if (!j$.isFunction_(fn)) { + if (!j$.private.isFunction(fn)) { throw new Error( - caller + ' expects a function argument; received ' + j$.getType_(fn) + caller + + ' expects a function argument; received ' + + j$.private.getType(fn) ); } } function ensureIsFunctionOrAsync(fn, caller) { - if (!j$.isFunction_(fn) && !j$.isAsyncFunction_(fn)) { + if (!j$.private.isFunction(fn) && !j$.private.isAsyncFunction(fn)) { throw new Error( - caller + ' expects a function argument; received ' + j$.getType_(fn) + caller + + ' expects a function argument; received ' + + j$.private.getType(fn) ); } } @@ -11587,14 +11628,14 @@ getJasmineRequireObj().TreeRunner = function(j$) { }, onComplete: () => { if (spec.result.status === 'failed') { - specOverallDone(new j$.StopExecutionError('spec failed')); + specOverallDone(new j$.private.StopExecutionError('spec failed')); } else { specOverallDone(); } }, userContext: spec.userContext(), runnableName: spec.getFullName.bind(spec), - SkipPolicy: j$.CompleteOnFirstErrorSkipPolicy + SkipPolicy: j$.private.CompleteOnFirstErrorSkipPolicy }); } @@ -11769,7 +11810,7 @@ getJasmineRequireObj().TreeRunner = function(j$) { async #reportChildrenOfBeforeAllFailure(suite) { for (const child of suite.children) { - if (child instanceof j$.Suite) { + if (child instanceof j$.private.Suite) { await this.#reportDispatcher.suiteStarted(child.result); await this.#reportChildrenOfBeforeAllFailure(child); @@ -11801,9 +11842,9 @@ getJasmineRequireObj().TreeRunner = function(j$) { #suiteSkipPolicy() { if (this.#getConfig().stopOnSpecFailure) { - return j$.CompleteOnFirstErrorSkipPolicy; + return j$.private.CompleteOnFirstErrorSkipPolicy; } else { - return j$.SkipAfterBeforeAllErrorPolicy; + return j$.private.SkipAfterBeforeAllErrorPolicy; } } } diff --git a/release_notes/3.9.0.md b/release_notes/3.9.0.md index ca12f32b..79ec1111 100644 --- a/release_notes/3.9.0.md +++ b/release_notes/3.9.0.md @@ -2,7 +2,7 @@ ## New features and bug fixes -* Fixed Trusted Types error in `j$.isError_` in Chromium-based browsers +* Fixed Trusted Types error in `j$.private.isError` in Chromium-based browsers * Merges [#1921](https://github.com/jasmine/jasmine/pull/1921) from @bjarkler * Fixes [#1910](https://github.com/jasmine/jasmine/issues/1910) * Fixes [#1653](https://github.com/jasmine/jasmine/issues/1653) diff --git a/spec/core/AsyncExpectationSpec.js b/spec/core/AsyncExpectationSpec.js index dc687f53..e7653b4e 100644 --- a/spec/core/AsyncExpectationSpec.js +++ b/spec/core/AsyncExpectationSpec.js @@ -1,7 +1,7 @@ describe('AsyncExpectation', function() { beforeEach(function() { - jasmineUnderTest.Expectation.addAsyncCoreMatchers( - jasmineUnderTest.asyncMatchers + privateUnderTest.Expectation.addAsyncCoreMatchers( + privateUnderTest.asyncMatchers ); }); @@ -9,9 +9,9 @@ describe('AsyncExpectation', function() { it('converts a pass to a fail', function() { const addExpectationResult = jasmine.createSpy('addExpectationResult'), actual = Promise.resolve(), - pp = jasmineUnderTest.makePrettyPrinter(), - expectation = jasmineUnderTest.Expectation.asyncFactory({ - matchersUtil: new jasmineUnderTest.MatchersUtil({ pp: pp }), + pp = privateUnderTest.makePrettyPrinter(), + expectation = privateUnderTest.Expectation.asyncFactory({ + matchersUtil: new privateUnderTest.MatchersUtil({ pp: pp }), actual: actual, addExpectationResult: addExpectationResult }); @@ -30,8 +30,8 @@ describe('AsyncExpectation', function() { it('converts a fail to a pass', function() { const addExpectationResult = jasmine.createSpy('addExpectationResult'), actual = Promise.reject(new Error('nope')), - expectation = jasmineUnderTest.Expectation.asyncFactory({ - matchersUtil: new jasmineUnderTest.MatchersUtil({ + expectation = privateUnderTest.Expectation.asyncFactory({ + matchersUtil: new privateUnderTest.MatchersUtil({ pp: function() {} }), actual: actual, @@ -55,7 +55,7 @@ describe('AsyncExpectation', function() { const addExpectationResult = jasmine.createSpy('addExpectationResult'), actual = dummyPromise(), - expectation = jasmineUnderTest.Expectation.asyncFactory({ + expectation = privateUnderTest.Expectation.asyncFactory({ actual: actual, addExpectationResult: addExpectationResult }); @@ -80,7 +80,7 @@ describe('AsyncExpectation', function() { } }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.asyncFactory({ + expectation = privateUnderTest.Expectation.asyncFactory({ actual: Promise.reject('rejected'), addExpectationResult: addExpectationResult, matchersUtil: matchersUtil @@ -105,10 +105,10 @@ describe('AsyncExpectation', function() { buildFailureMessage: function() { return 'failure message'; }, - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.asyncFactory({ + expectation = privateUnderTest.Expectation.asyncFactory({ actual: Promise.reject('b'), addExpectationResult: addExpectationResult, matchersUtil: matchersUtil @@ -140,7 +140,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); const actual = Promise.reject(new Error('nope')); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ actual: actual, addExpectationResult: addExpectationResult, matchersUtil: matchersUtil @@ -161,11 +161,11 @@ describe('AsyncExpectation', function() { it('works with #not', function() { const addExpectationResult = jasmine.createSpy('addExpectationResult'), actual = Promise.resolve(), - pp = jasmineUnderTest.makePrettyPrinter(), - expectation = jasmineUnderTest.Expectation.asyncFactory({ + pp = privateUnderTest.makePrettyPrinter(), + expectation = privateUnderTest.Expectation.asyncFactory({ actual: actual, addExpectationResult: addExpectationResult, - matchersUtil: new jasmineUnderTest.MatchersUtil({ pp: pp }) + matchersUtil: new privateUnderTest.MatchersUtil({ pp: pp }) }); return expectation @@ -185,11 +185,11 @@ describe('AsyncExpectation', function() { it('works with #not and a custom message', function() { const addExpectationResult = jasmine.createSpy('addExpectationResult'), actual = Promise.resolve('a'), - expectation = jasmineUnderTest.Expectation.asyncFactory({ + expectation = privateUnderTest.Expectation.asyncFactory({ actual: actual, addExpectationResult: addExpectationResult, - matchersUtil: new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + matchersUtil: new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }) }); @@ -214,7 +214,7 @@ describe('AsyncExpectation', function() { toFoo: function() {}, toBar: function() {} }, - expectation = jasmineUnderTest.Expectation.asyncFactory({ + expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: asyncMatchers }); @@ -236,7 +236,7 @@ describe('AsyncExpectation', function() { buildFailureMessage: jasmine.createSpy('buildFailureMessage') }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.asyncFactory({ + expectation = privateUnderTest.Expectation.asyncFactory({ matchersUtil: matchersUtil, customAsyncMatchers: matchers, actual: 'an actual', @@ -263,7 +263,7 @@ describe('AsyncExpectation', function() { buildFailureMessage: jasmine.createSpy('buildFailureMessage') }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.asyncFactory({ + expectation = privateUnderTest.Expectation.asyncFactory({ matchersUtil: matchersUtil, customAsyncMatchers: matchers, actual: 'an actual', @@ -290,7 +290,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: matchers, matchersUtil: matchersUtil, actual: 'an actual', @@ -325,7 +325,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: matchers, matchersUtil: matchersUtil, actual: 'an actual', @@ -358,7 +358,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ actual: 'an actual', customAsyncMatchers: matchers, addExpectationResult: addExpectationResult @@ -392,7 +392,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -421,7 +421,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -455,7 +455,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: matchers, actual: 'an actual', matchersUtil: matchersUtil, @@ -488,7 +488,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -520,7 +520,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -555,7 +555,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ customAsyncMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -589,7 +589,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ actual: 'an actual', customAsyncMatchers: matchers, addExpectationResult: addExpectationResult @@ -621,7 +621,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.asyncFactory({ + const expectation = privateUnderTest.Expectation.asyncFactory({ actual: 'an actual', customAsyncMatchers: matchers, addExpectationResult: addExpectationResult @@ -655,7 +655,7 @@ describe('AsyncExpectation', function() { }; const addExpectationResult = jasmine.createSpy('addExpectationResult'); - let expectation = jasmineUnderTest.Expectation.asyncFactory({ + let expectation = privateUnderTest.Expectation.asyncFactory({ actual: 'an actual', customAsyncMatchers: matchers, addExpectationResult: addExpectationResult diff --git a/spec/core/CallTrackerSpec.js b/spec/core/CallTrackerSpec.js index 55541b72..07d6d83d 100644 --- a/spec/core/CallTrackerSpec.js +++ b/spec/core/CallTrackerSpec.js @@ -1,6 +1,6 @@ describe('CallTracker', function() { it('tracks that it was called when executed', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); expect(callTracker.any()).toBe(false); @@ -10,7 +10,7 @@ describe('CallTracker', function() { }); it('tracks that number of times that it is executed', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); expect(callTracker.count()).toEqual(0); @@ -20,7 +20,7 @@ describe('CallTracker', function() { }); it('tracks the params from each execution', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.track({ object: void 0, args: [] }); callTracker.track({ object: {}, args: [0, 'foo'] }); @@ -31,7 +31,7 @@ describe('CallTracker', function() { }); it("tracks the 'this' object from each execution", function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); const this0 = {}, this1 = {}; @@ -45,13 +45,13 @@ describe('CallTracker', function() { }); it('returns any empty array when there was no call', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); expect(callTracker.argsFor(0)).toEqual([]); }); it('allows access for the arguments for all calls', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.track({ object: {}, args: [] }); callTracker.track({ object: {}, args: [0, 'foo'] }); @@ -60,7 +60,7 @@ describe('CallTracker', function() { }); it('tracks the context and arguments for each call', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.track({ object: {}, args: [] }); callTracker.track({ object: {}, args: [0, 'foo'] }); @@ -71,7 +71,7 @@ describe('CallTracker', function() { }); it('simplifies access to the arguments for the last (most recent) call', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.track(); callTracker.track({ object: {}, args: [0, 'foo'] }); @@ -83,13 +83,13 @@ describe('CallTracker', function() { }); it("returns a useful falsy value when there isn't a last (most recent) call", function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); expect(callTracker.mostRecent()).toBeFalsy(); }); it('simplifies access to the arguments for the first (oldest) call', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.track({ object: {}, args: [0, 'foo'] }); @@ -97,13 +97,13 @@ describe('CallTracker', function() { }); it("returns a useful falsy value when there isn't a first (oldest) call", function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); expect(callTracker.first()).toBeFalsy(); }); it('allows the tracking to be reset', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.track(); callTracker.track({ object: {}, args: [0, 'foo'] }); @@ -117,7 +117,7 @@ describe('CallTracker', function() { }); it('allows object arguments to be shallow cloned', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.saveArgumentsByValue(); const objectArg = { foo: 'bar' }, @@ -135,7 +135,7 @@ describe('CallTracker', function() { }); it('allows object arguments to be deep cloned', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.saveArgumentsByValue(args => JSON.parse(JSON.stringify(args))); const objectArg = { foo: { bar: { baz: ['qux'] } } }, @@ -158,7 +158,7 @@ describe('CallTracker', function() { }); it('can take any function to transform arguments when saving by value', function() { - const callTracker = new jasmineUnderTest.CallTracker(); + const callTracker = new privateUnderTest.CallTracker(); callTracker.saveArgumentsByValue(JSON.stringify); const objectArg = { foo: { bar: { baz: ['qux'] } } }, @@ -171,7 +171,7 @@ describe('CallTracker', function() { }); it('saves primitive arguments by value', function() { - const callTracker = new jasmineUnderTest.CallTracker(), + const callTracker = new privateUnderTest.CallTracker(), args = [undefined, null, false, '', /\s/, 0, 1.2, NaN]; callTracker.saveArgumentsByValue(); diff --git a/spec/core/ClearStackSpec.js b/spec/core/ClearStackSpec.js index 1fa06c73..8b2aff34 100644 --- a/spec/core/ClearStackSpec.js +++ b/spec/core/ClearStackSpec.js @@ -1,6 +1,6 @@ describe('ClearStack', function() { it('works in an integrationy way', function(done) { - const clearStack = jasmineUnderTest.getClearStack( + const clearStack = privateUnderTest.getClearStack( jasmineUnderTest.getGlobal() ); @@ -36,7 +36,7 @@ describe('ClearStack', function() { queueMicrotask }; - const clearStack = jasmineUnderTest.getClearStack(global); + const clearStack = privateUnderTest.getClearStack(global); for (let i = 0; i < 9; i++) { clearStack(function() {}); @@ -104,7 +104,7 @@ describe('ClearStack', function() { ...makeGlobal(), MessageChannel: fakeMessageChannel }; - const clearStack = jasmineUnderTest.getClearStack(global); + const clearStack = privateUnderTest.getClearStack(global); let called = false; clearStack(function() { @@ -125,7 +125,7 @@ describe('ClearStack', function() { return fakeChannel; } }; - const clearStack = jasmineUnderTest.getClearStack(global); + const clearStack = privateUnderTest.getClearStack(global); for (let i = 0; i < 9; i++) { clearStack(function() {}); @@ -150,7 +150,7 @@ describe('ClearStack', function() { setTimeout, MessageChannel: fakeMessageChannel }; - const clearStack = jasmineUnderTest.getClearStack(global); + const clearStack = privateUnderTest.getClearStack(global); const fn = jasmine.createSpy('second clearStack function'); clearStack(function() { @@ -170,7 +170,7 @@ describe('ClearStack', function() { fn(); } }; - const clearStack = jasmineUnderTest.getClearStack(global); + const clearStack = privateUnderTest.getClearStack(global); let called = false; clearStack(function() { @@ -188,7 +188,7 @@ describe('ClearStack', function() { queueMicrotask, setTimeout }; - const clearStack = jasmineUnderTest.getClearStack(global); + const clearStack = privateUnderTest.getClearStack(global); for (let i = 0; i < 9; i++) { clearStack(function() {}); @@ -215,7 +215,7 @@ describe('ClearStack', function() { fn(); } }; - const clearStack = jasmineUnderTest.getClearStack(global); + const clearStack = privateUnderTest.getClearStack(global); let called = false; clearStack(function() { @@ -233,7 +233,7 @@ describe('ClearStack', function() { queueMicrotask, setTimeout }; - const clearStack = jasmineUnderTest.getClearStack(global); + const clearStack = privateUnderTest.getClearStack(global); clearStack(function() {}); clearStack(function() {}); diff --git a/spec/core/ClockSpec.js b/spec/core/ClockSpec.js index 2fb48d65..a4d92f85 100644 --- a/spec/core/ClockSpec.js +++ b/spec/core/ClockSpec.js @@ -17,7 +17,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -51,7 +51,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -88,7 +88,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -122,7 +122,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -154,7 +154,7 @@ describe('Clock', function() { 'delayedFunctionSchedulerFactory' ), mockDate = {}, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, delayedFunctionSchedulerFactory, mockDate @@ -178,7 +178,7 @@ describe('Clock', function() { 'delayedFunctionSchedulerFactory' ), mockDate = {}, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, delayedFunctionSchedulerFactory, mockDate @@ -202,7 +202,7 @@ describe('Clock', function() { 'delayedFunctionSchedulerFactory' ), mockDate = {}, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, delayedFunctionSchedulerFactory, mockDate @@ -226,7 +226,7 @@ describe('Clock', function() { 'delayedFunctionSchedulerFactory' ), mockDate = {}, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, delayedFunctionSchedulerFactory, mockDate @@ -263,7 +263,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -306,7 +306,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -366,7 +366,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -420,7 +420,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }; - const clock = new jasmineUnderTest.Clock( + const clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -430,16 +430,16 @@ describe('Clock', function() { clock.install(); expect( - fakeGlobal.setTimeout[jasmineUnderTest.Clock.IsMockClockTimingFn] + fakeGlobal.setTimeout[privateUnderTest.Clock.IsMockClockTimingFn] ).toEqual(true); expect( - fakeGlobal.clearTimeout[jasmineUnderTest.Clock.IsMockClockTimingFn] + fakeGlobal.clearTimeout[privateUnderTest.Clock.IsMockClockTimingFn] ).toEqual(true); expect( - fakeGlobal.setInterval[jasmineUnderTest.Clock.IsMockClockTimingFn] + fakeGlobal.setInterval[privateUnderTest.Clock.IsMockClockTimingFn] ).toEqual(true); expect( - fakeGlobal.clearInterval[jasmineUnderTest.Clock.IsMockClockTimingFn] + fakeGlobal.clearInterval[privateUnderTest.Clock.IsMockClockTimingFn] ).toEqual(true); }); @@ -455,7 +455,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -500,7 +500,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -532,7 +532,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -562,7 +562,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -608,7 +608,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -640,7 +640,7 @@ describe('Clock', function() { tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( fakeGlobal, function() { return delayedFunctionScheduler; @@ -659,7 +659,7 @@ describe('Clock', function() { }); it('gives you a friendly reminder if the Clock is not installed and you tick', function() { - const clock = new jasmineUnderTest.Clock( + const clock = new privateUnderTest.Clock( {}, jasmine.createSpyObj('delayedFunctionScheduler', ['tick']) ); @@ -675,13 +675,13 @@ describe('Clock (acceptance)', function() { delayedFn2 = jasmine.createSpy('delayedFn2'), delayedFn3 = jasmine.createSpy('delayedFn3'), recurring1 = jasmine.createSpy('recurring1'), - delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( { setTimeout: setTimeout }, function() { return delayedFunctionScheduler; @@ -736,7 +736,7 @@ describe('Clock (acceptance)', function() { let clock; beforeEach(() => { - delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(); + delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(); mockDate = { install: function() {}, tick: function() {}, @@ -747,7 +747,7 @@ describe('Clock (acceptance)', function() { typeof window !== 'undefined' ? setTimeout.bind(window) : setTimeout; // passing a fake global allows us to preserve the real timing functions for use in tests const _global = { setTimeout: _setTimeout, setInterval: setInterval }; - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( _global, function() { return delayedFunctionScheduler; @@ -885,13 +885,13 @@ describe('Clock (acceptance)', function() { it('can clear a previously set timeout', function() { const clearedFn = jasmine.createSpy('clearedFn'), - delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( { setTimeout: function() {} }, function() { return delayedFunctionScheduler; @@ -912,13 +912,13 @@ describe('Clock (acceptance)', function() { it("can clear a previously set interval using that interval's handler", function() { const spy = jasmine.createSpy('spy'), - delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( { setInterval: function() {} }, function() { return delayedFunctionScheduler; @@ -939,13 +939,13 @@ describe('Clock (acceptance)', function() { it('correctly schedules functions after the Clock has advanced', function() { const delayedFn1 = jasmine.createSpy('delayedFn1'), - delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( { setTimeout: function() {} }, function() { return delayedFunctionScheduler; @@ -966,13 +966,13 @@ describe('Clock (acceptance)', function() { it('correctly schedules functions while the Clock is advancing', function() { const delayedFn1 = jasmine.createSpy('delayedFn1'), delayedFn2 = jasmine.createSpy('delayedFn2'), - delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( { setTimeout: function() {} }, function() { return delayedFunctionScheduler; @@ -997,13 +997,13 @@ describe('Clock (acceptance)', function() { it('correctly calls functions scheduled while the Clock is advancing', function() { const delayedFn1 = jasmine.createSpy('delayedFn1'), delayedFn2 = jasmine.createSpy('delayedFn2'), - delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( { setTimeout: function() {} }, function() { return delayedFunctionScheduler; @@ -1025,13 +1025,13 @@ describe('Clock (acceptance)', function() { it('correctly schedules functions scheduled while the Clock is advancing but after the Clock is uninstalled', function() { const delayedFn1 = jasmine.createSpy('delayedFn1'), delayedFn2 = jasmine.createSpy('delayedFn2'), - delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), mockDate = { install: function() {}, tick: function() {}, uninstall: function() {} }, - clock = new jasmineUnderTest.Clock( + clock = new privateUnderTest.Clock( { setTimeout: function() {} }, function() { return delayedFunctionScheduler; @@ -1057,10 +1057,10 @@ describe('Clock (acceptance)', function() { }); it('does not mock the Date object by default', function() { - const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), global = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(global), - clock = new jasmineUnderTest.Clock( + mockDate = new privateUnderTest.MockDate(global), + clock = new privateUnderTest.Clock( { setTimeout: setTimeout }, function() { return delayedFunctionScheduler; @@ -1080,10 +1080,10 @@ describe('Clock (acceptance)', function() { }); it('mocks the Date object and sets it to current time', function() { - const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), global = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(global), - clock = new jasmineUnderTest.Clock( + mockDate = new privateUnderTest.MockDate(global), + clock = new privateUnderTest.Clock( { setTimeout: setTimeout }, function() { return delayedFunctionScheduler; @@ -1110,10 +1110,10 @@ describe('Clock (acceptance)', function() { }); it('mocks the Date object and sets it to a given time', function() { - const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), global = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(global), - clock = new jasmineUnderTest.Clock( + mockDate = new privateUnderTest.MockDate(global), + clock = new privateUnderTest.Clock( { setTimeout: setTimeout }, function() { return delayedFunctionScheduler; @@ -1143,10 +1143,10 @@ describe('Clock (acceptance)', function() { }); it('throws mockDate is called with a non-Date', function() { - const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), global = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(global), - clock = new jasmineUnderTest.Clock( + mockDate = new privateUnderTest.MockDate(global), + clock = new privateUnderTest.Clock( { setTimeout: setTimeout }, function() { return delayedFunctionScheduler; @@ -1161,10 +1161,10 @@ describe('Clock (acceptance)', function() { }); it('mocks the Date object and updates the date per delayed function', function() { - const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), global = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(global), - clock = new jasmineUnderTest.Clock( + mockDate = new privateUnderTest.MockDate(global), + clock = new privateUnderTest.Clock( { setTimeout: setTimeout }, function() { return delayedFunctionScheduler; @@ -1200,10 +1200,10 @@ describe('Clock (acceptance)', function() { }); it('correctly clears a scheduled timeout while the Clock is advancing', function() { - const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), global = { Date: Date, setTimeout: undefined }, - mockDate = new jasmineUnderTest.MockDate(global), - clock = new jasmineUnderTest.Clock( + mockDate = new privateUnderTest.MockDate(global), + clock = new privateUnderTest.Clock( global, function() { return delayedFunctionScheduler; @@ -1225,10 +1225,10 @@ describe('Clock (acceptance)', function() { }); it('correctly clears a scheduled interval while the Clock is advancing', function() { - const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const delayedFunctionScheduler = new privateUnderTest.DelayedFunctionScheduler(), global = { Date: Date, setTimeout: undefined }, - mockDate = new jasmineUnderTest.MockDate(global), - clock = new jasmineUnderTest.Clock( + mockDate = new privateUnderTest.MockDate(global), + clock = new privateUnderTest.Clock( global, function() { return delayedFunctionScheduler; diff --git a/spec/core/CompleteOnFirstErrorSkipPolicySpec.js b/spec/core/CompleteOnFirstErrorSkipPolicySpec.js index babe4605..3d499581 100644 --- a/spec/core/CompleteOnFirstErrorSkipPolicySpec.js +++ b/spec/core/CompleteOnFirstErrorSkipPolicySpec.js @@ -2,7 +2,7 @@ describe('CompleteOnFirstErrorSkipPolicy', function() { describe('#skipTo', function() { describe('Before anything has errored', function() { it('returns the next index', function() { - const policy = new jasmineUnderTest.CompleteOnFirstErrorSkipPolicy( + const policy = new privateUnderTest.CompleteOnFirstErrorSkipPolicy( arrayOfArbitraryFns(4), 4 ); @@ -15,7 +15,7 @@ describe('CompleteOnFirstErrorSkipPolicy', function() { const fns = arrayOfArbitraryFns(4); fns[2].type = arbitraryCleanupType(); fns[3].type = arbitraryCleanupType(); - const policy = new jasmineUnderTest.CompleteOnFirstErrorSkipPolicy(fns); + const policy = new privateUnderTest.CompleteOnFirstErrorSkipPolicy(fns); policy.fnErrored(0); expect(policy.skipTo(0)).toEqual(2); @@ -27,7 +27,7 @@ describe('CompleteOnFirstErrorSkipPolicy', function() { it(`does not skip ${type} fns`, function() { const fns = arrayOfArbitraryFns(2); fns[1].type = type; - const policy = new jasmineUnderTest.CompleteOnFirstErrorSkipPolicy( + const policy = new privateUnderTest.CompleteOnFirstErrorSkipPolicy( fns ); @@ -58,7 +58,7 @@ describe('CompleteOnFirstErrorSkipPolicy', function() { type: arbitraryCleanupType() } ]; - const policy = new jasmineUnderTest.CompleteOnFirstErrorSkipPolicy( + const policy = new privateUnderTest.CompleteOnFirstErrorSkipPolicy( fns ); @@ -90,7 +90,7 @@ describe('CompleteOnFirstErrorSkipPolicy', function() { type: arbitraryCleanupType() } ]; - const policy = new jasmineUnderTest.CompleteOnFirstErrorSkipPolicy( + const policy = new privateUnderTest.CompleteOnFirstErrorSkipPolicy( fns ); @@ -107,7 +107,7 @@ describe('CompleteOnFirstErrorSkipPolicy', function() { type: arbitraryCleanupType() } ]; - const policy = new jasmineUnderTest.CompleteOnFirstErrorSkipPolicy(fns); + const policy = new privateUnderTest.CompleteOnFirstErrorSkipPolicy(fns); policy.fnErrored(0); expect(policy.skipTo(0)).toEqual(1); diff --git a/spec/core/ConfigurationSpec.js b/spec/core/ConfigurationSpec.js index b90ec59c..aec33af2 100644 --- a/spec/core/ConfigurationSpec.js +++ b/spec/core/ConfigurationSpec.js @@ -15,7 +15,7 @@ describe('Configuration', function() { Object.freeze(allKeys); it('provides defaults', function() { - const subject = new jasmineUnderTest.Configuration(); + const subject = new privateUnderTest.Configuration(); expect(subject.random).toEqual(true); expect(subject.seed).toBeNull(); expect(subject.stopOnSpecFailure).toEqual(false); @@ -32,7 +32,7 @@ describe('Configuration', function() { describe('copy()', function() { it('returns a copy of the configuration as a plain old JS object', function() { - const subject = new jasmineUnderTest.Configuration(); + const subject = new privateUnderTest.Configuration(); const copy = subject.copy(); @@ -47,7 +47,7 @@ describe('Configuration', function() { describe('update()', function() { it('does not update properties that are absent from the parameter', function() { - const subject = new jasmineUnderTest.Configuration(); + const subject = new privateUnderTest.Configuration(); const originalValues = subject.copy(); subject.update({}); @@ -56,7 +56,7 @@ describe('Configuration', function() { function booleanPropertyBehavior(key) { it('does not update the property if the specified value is undefined', function() { - const subject = new jasmineUnderTest.Configuration(); + const subject = new privateUnderTest.Configuration(); const orig = subject[key]; subject.update({ [key]: undefined }); @@ -65,7 +65,7 @@ describe('Configuration', function() { }); it('updates the property if the specified value is not undefined', function() { - const subject = new jasmineUnderTest.Configuration(); + const subject = new privateUnderTest.Configuration(); const orig = subject[key]; subject.update({ [key]: !orig }); @@ -83,7 +83,7 @@ describe('Configuration', function() { } it('sets specFilter when truthy', function() { - const subject = new jasmineUnderTest.Configuration(); + const subject = new privateUnderTest.Configuration(); const orig = subject.specFilter; subject.update({ specFilter: undefined }); @@ -98,7 +98,7 @@ describe('Configuration', function() { }); it('sets seed when not undefined', function() { - const subject = new jasmineUnderTest.Configuration(); + const subject = new privateUnderTest.Configuration(); subject.update({ seed: undefined }); expect(subject.seed).toBeNull(); diff --git a/spec/core/DelayedFunctionSchedulerSpec.js b/spec/core/DelayedFunctionSchedulerSpec.js index 20674c3d..6a2f775e 100644 --- a/spec/core/DelayedFunctionSchedulerSpec.js +++ b/spec/core/DelayedFunctionSchedulerSpec.js @@ -2,7 +2,7 @@ describe('DelayedFunctionScheduler', function() { 'use strict'; it('schedules a function for later execution', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'); scheduler.scheduleFunction(fn, 0); @@ -15,7 +15,7 @@ describe('DelayedFunctionScheduler', function() { }); it('throws if a string is passed', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(); + const scheduler = new privateUnderTest.DelayedFunctionScheduler(); expect(function() { scheduler.scheduleFunction('horrible = true;', 0); @@ -25,7 +25,7 @@ describe('DelayedFunctionScheduler', function() { }); it('#tick defaults to 0', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'); scheduler.scheduleFunction(fn, 0); @@ -38,7 +38,7 @@ describe('DelayedFunctionScheduler', function() { }); it('defaults delay to 0', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'); scheduler.scheduleFunction(fn); @@ -51,7 +51,7 @@ describe('DelayedFunctionScheduler', function() { }); it('optionally passes params to scheduled functions', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'); scheduler.scheduleFunction(fn, 0, ['foo', 'bar']); @@ -64,7 +64,7 @@ describe('DelayedFunctionScheduler', function() { }); it('scheduled fns can optionally reoccur', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'); scheduler.scheduleFunction(fn, 20, [], true); @@ -85,7 +85,7 @@ describe('DelayedFunctionScheduler', function() { }); it('increments scheduled fns ids unless one is passed', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(); + const scheduler = new privateUnderTest.DelayedFunctionScheduler(); const initial = scheduler.scheduleFunction(function() {}, 0); expect(scheduler.scheduleFunction(function() {}, 0)).toBe(initial + 1); @@ -97,7 +97,7 @@ describe('DelayedFunctionScheduler', function() { }); it('#removeFunctionWithId removes a previously scheduled function with a given id', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'), timeoutKey = scheduler.scheduleFunction(fn, 0); @@ -111,7 +111,7 @@ describe('DelayedFunctionScheduler', function() { }); it('executes recurring functions interleaved with regular functions in the correct order', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(); + const scheduler = new privateUnderTest.DelayedFunctionScheduler(); const fn = jasmine.createSpy('fn'); let recurringCallCount = 0; const recurring = jasmine.createSpy('recurring').and.callFake(function() { @@ -132,7 +132,7 @@ describe('DelayedFunctionScheduler', function() { }); it('schedules a function for later execution during a tick', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'), fnDelay = 10; @@ -148,7 +148,7 @@ describe('DelayedFunctionScheduler', function() { }); it('#removeFunctionWithId removes a previously scheduled function with a given id during a tick', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'), fnDelay = 10; let timeoutKey; @@ -166,7 +166,7 @@ describe('DelayedFunctionScheduler', function() { }); it('executes recurring functions interleaved with regular functions and functions scheduled during a tick in the correct order', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(); + const scheduler = new privateUnderTest.DelayedFunctionScheduler(); const fn = jasmine.createSpy('fn'); let recurringCallCount = 0; const recurring = jasmine.createSpy('recurring').and.callFake(function() { @@ -199,7 +199,7 @@ describe('DelayedFunctionScheduler', function() { }); it('executes recurring functions after rescheduling them', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), recurring = function() { expect(scheduler.scheduleFunction).toHaveBeenCalled(); }; @@ -212,7 +212,7 @@ describe('DelayedFunctionScheduler', function() { }); it('removes functions during a tick that runs the function', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), spy = jasmine.createSpy('fn'), spyAndRemove = jasmine.createSpy('fn'), fnDelay = 10; @@ -233,7 +233,7 @@ describe('DelayedFunctionScheduler', function() { }); it('removes functions during the first tick that runs the function', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'), fnDelay = 10; let timeoutKey; @@ -252,7 +252,7 @@ describe('DelayedFunctionScheduler', function() { }); it("does not remove a function that hasn't been added yet", function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), fn = jasmine.createSpy('fn'), fnDelay = 10; @@ -267,7 +267,7 @@ describe('DelayedFunctionScheduler', function() { }); it('runs the next scheduled funtion', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(); + const scheduler = new privateUnderTest.DelayedFunctionScheduler(); const fn = jasmine.createSpy('fn'); const tickSpy = jasmine.createSpy('tick'); @@ -282,7 +282,7 @@ describe('DelayedFunctionScheduler', function() { }); it('runs the only a single scheduled funtion in a time slot', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(); + const scheduler = new privateUnderTest.DelayedFunctionScheduler(); const fn1 = jasmine.createSpy('fn'); const fn2 = jasmine.createSpy('fn2'); const tickSpy = jasmine.createSpy('tick'); @@ -303,7 +303,7 @@ describe('DelayedFunctionScheduler', function() { }); it('updates the mockDate per scheduled time', function() { - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(), + const scheduler = new privateUnderTest.DelayedFunctionScheduler(), tickDate = jasmine.createSpy('tickDate'); scheduler.scheduleFunction(function() {}); @@ -325,7 +325,7 @@ describe('DelayedFunctionScheduler', function() { } const nativeTimeoutId = setTimeout(function() {}, 100); - const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(); + const scheduler = new privateUnderTest.DelayedFunctionScheduler(); const fn = jasmine.createSpy('fn'); for (let i = 0; i < nativeTimeoutId; i++) { diff --git a/spec/core/DeprecatorSpec.js b/spec/core/DeprecatorSpec.js index c2a126bf..5f6e6ff4 100644 --- a/spec/core/DeprecatorSpec.js +++ b/spec/core/DeprecatorSpec.js @@ -7,7 +7,7 @@ describe('Deprecator', function() { it('logs the mesage without context when the runnable is the top suite', function() { const runnable = { addDeprecationWarning: function() {} }; - const deprecator = new jasmineUnderTest.Deprecator(runnable); + const deprecator = new privateUnderTest.Deprecator(runnable); deprecator.verboseDeprecations(true); deprecator.addDeprecationWarning(runnable, 'the message', { @@ -25,7 +25,7 @@ describe('Deprecator', function() { }, children: [] }; - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); deprecator.verboseDeprecations(true); deprecator.addDeprecationWarning(runnable, 'the message', { @@ -44,7 +44,7 @@ describe('Deprecator', function() { return 'the spec'; } }; - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); deprecator.verboseDeprecations(true); deprecator.addDeprecationWarning(runnable, 'the message', { @@ -61,7 +61,7 @@ describe('Deprecator', function() { 'addDeprecationWarning', 'getFullName' ]); - const deprecator = new jasmineUnderTest.Deprecator(topSuite); + const deprecator = new privateUnderTest.Deprecator(topSuite); const runnable = jasmine.createSpyObj('spec', [ 'addDeprecationWarning', 'getFullName' @@ -105,7 +105,7 @@ describe('Deprecator', function() { }); it('emits the deprecation only once when verboseDeprecations is not set', function() { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable1 = jasmine.createSpyObj('runnable1', [ 'addDeprecationWarning', 'getFullName' @@ -124,7 +124,7 @@ describe('Deprecator', function() { }); it('emits the deprecation only once when verboseDeprecations is false', function() { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable1 = jasmine.createSpyObj('runnable1', [ 'addDeprecationWarning', 'getFullName' @@ -144,7 +144,7 @@ describe('Deprecator', function() { }); it('emits the deprecation for each call when verboseDeprecations is true', function() { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable1 = jasmine.createSpyObj('runnable1', [ 'addDeprecationWarning', 'getFullName' @@ -164,7 +164,7 @@ describe('Deprecator', function() { }); it('includes a note about verboseDeprecations', function() { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable = jasmine.createSpyObj('runnable', [ 'addDeprecationWarning', 'getFullName' @@ -183,7 +183,7 @@ describe('Deprecator', function() { }); it('omits the note about verboseDeprecations when verboseDeprecations is true', function() { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable = jasmine.createSpyObj('runnable', [ 'addDeprecationWarning', 'getFullName' @@ -207,7 +207,7 @@ describe('Deprecator', function() { // to report their own deprecations through Jasmine. See // . it('passes the error through unchanged', function() { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable = jasmine.createSpyObj('runnable', [ 'addDeprecationWarning', 'getFullName' @@ -238,7 +238,7 @@ describe('Deprecator', function() { }); it('reports the deprecation every time, regardless of config.verboseDeprecations', function() { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable = jasmine.createSpyObj('runnable', [ 'addDeprecationWarning', 'getFullName' @@ -259,7 +259,7 @@ describe('Deprecator', function() { }); it('omits the note about verboseDeprecations', function() { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable = jasmine.createSpyObj('runnable', [ 'addDeprecationWarning', 'getFullName' @@ -293,7 +293,7 @@ describe('Deprecator', function() { } function testStackTrace(options) { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable = jasmine.createSpyObj('runnable', [ 'addDeprecationWarning', 'getFullName' @@ -311,7 +311,7 @@ describe('Deprecator', function() { } function testNoStackTrace(options) { - const deprecator = new jasmineUnderTest.Deprecator({}); + const deprecator = new privateUnderTest.Deprecator({}); const runnable = jasmine.createSpyObj('runnable', [ 'addDeprecationWarning', 'getFullName' diff --git a/spec/core/EnvSpec.js b/spec/core/EnvSpec.js index 353ab285..faffc2d7 100644 --- a/spec/core/EnvSpec.js +++ b/spec/core/EnvSpec.js @@ -2,7 +2,7 @@ describe('Env', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { @@ -13,14 +13,14 @@ describe('Env', function() { it('throws the Pending Spec exception', function() { expect(function() { env.pending(); - }).toThrow(jasmineUnderTest.Spec.pendingSpecExceptionMessage); + }).toThrow(privateUnderTest.Spec.pendingSpecExceptionMessage); }); it('throws the Pending Spec exception with a custom message', function() { expect(function() { env.pending('custom message'); }).toThrow( - jasmineUnderTest.Spec.pendingSpecExceptionMessage + 'custom message' + privateUnderTest.Spec.pendingSpecExceptionMessage + 'custom message' ); }); }); @@ -38,24 +38,24 @@ describe('Env', function() { }); const suite = env.topSuite(); - expect(suite).not.toBeInstanceOf(jasmineUnderTest.Suite); + expect(suite).not.toBeInstanceOf(privateUnderTest.Suite); expect(suite.description).toEqual('Jasmine__TopLevel__Suite'); expect(suite.getFullName()).toEqual(''); expect(suite.children.length).toEqual(2); - expect(suite.children[0]).not.toBeInstanceOf(jasmineUnderTest.Spec); + expect(suite.children[0]).not.toBeInstanceOf(privateUnderTest.Spec); expect(suite.children[0].description).toEqual('a top level spec'); expect(suite.children[0].getFullName()).toEqual('a top level spec'); expect(suite.children[0].children).toBeFalsy(); - expect(suite.children[1]).not.toBeInstanceOf(jasmineUnderTest.Suite); + expect(suite.children[1]).not.toBeInstanceOf(privateUnderTest.Suite); expect(suite.children[1].description).toEqual('a suite'); expect(suite.children[1].getFullName()).toEqual('a suite'); expect(suite.children[1].parentSuite).toBe(suite); expect(suite.children[1].children.length).toEqual(2); expect(suite.children[1].children[0]).not.toBeInstanceOf( - jasmineUnderTest.Spec + privateUnderTest.Spec ); expect(suite.children[1].children[0].description).toEqual('a spec'); expect(suite.children[1].children[0].getFullName()).toEqual( @@ -102,9 +102,9 @@ describe('Env', function() { it('can configure specs to throw errors on expectation failures', function() { env.configure({ stopSpecOnExpectationFailure: true }); - spyOn(jasmineUnderTest, 'Spec').and.callThrough(); + spyOn(privateUnderTest, 'Spec').and.callThrough(); env.it('foo', function() {}); - expect(jasmineUnderTest.Spec).toHaveBeenCalledWith( + expect(privateUnderTest.Spec).toHaveBeenCalledWith( jasmine.objectContaining({ throwOnExpectationFailure: true }) @@ -114,9 +114,9 @@ describe('Env', function() { it('can configure suites to throw errors on expectation failures', function() { env.configure({ stopSpecOnExpectationFailure: true }); - spyOn(jasmineUnderTest, 'Suite'); + spyOn(privateUnderTest, 'Suite'); env.describe('foo', function() {}); - expect(jasmineUnderTest.Suite).toHaveBeenCalledWith( + expect(privateUnderTest.Suite).toHaveBeenCalledWith( jasmine.objectContaining({ throwOnExpectationFailure: true }) @@ -150,9 +150,9 @@ describe('Env', function() { }); it('defaults to multiple failures for specs', function() { - spyOn(jasmineUnderTest, 'Spec').and.callThrough(); + spyOn(privateUnderTest, 'Spec').and.callThrough(); env.it('bar', function() {}); - expect(jasmineUnderTest.Spec).toHaveBeenCalledWith( + expect(privateUnderTest.Spec).toHaveBeenCalledWith( jasmine.objectContaining({ throwOnExpectationFailure: false }) @@ -160,9 +160,9 @@ describe('Env', function() { }); it('defaults to multiple failures for suites', function() { - spyOn(jasmineUnderTest, 'Suite'); + spyOn(privateUnderTest, 'Suite'); env.describe('foo', function() {}); - expect(jasmineUnderTest.Suite).toHaveBeenCalledWith( + expect(privateUnderTest.Suite).toHaveBeenCalledWith( jasmine.objectContaining({ throwOnExpectationFailure: false }) @@ -337,7 +337,7 @@ describe('Env', function() { it('calls spec.exclude with "Temporarily disabled with xit"', function() { const excludeSpy = jasmine.createSpy(); - spyOn(jasmineUnderTest.SuiteBuilder.prototype, 'it_').and.returnValue({ + spyOn(privateUnderTest.SuiteBuilder.prototype, 'it_').and.returnValue({ exclude: excludeSpy }); env.xit('foo', function() {}); @@ -346,9 +346,9 @@ describe('Env', function() { it('calls spec.pend with "Temporarily disabled with xit"', function() { const pendSpy = jasmine.createSpy(); - const realExclude = jasmineUnderTest.Spec.prototype.exclude; + const realExclude = privateUnderTest.Spec.prototype.exclude; - spyOn(jasmineUnderTest.SuiteBuilder.prototype, 'it_').and.returnValue({ + spyOn(privateUnderTest.SuiteBuilder.prototype, 'it_').and.returnValue({ exclude: realExclude, pend: pendSpy }); @@ -626,7 +626,7 @@ describe('Env', function() { 'removeOverrideListener' ]); env.cleanup_(); - env = new jasmineUnderTest.Env({ + env = new privateUnderTest.Env({ GlobalErrors: function() { return globalErrors; } @@ -645,7 +645,7 @@ describe('Env', function() { 'removeOverrideListener' ]); env.cleanup_(); - env = new jasmineUnderTest.Env({ + env = new privateUnderTest.Env({ suppressLoadErrors: true, GlobalErrors: function() { return globalErrors; @@ -661,12 +661,12 @@ describe('Env', function() { function customEqualityTester() {} function customObjectFormatter() {} function prettyPrinter() {} - const RealSpec = jasmineUnderTest.Spec; + const RealSpec = privateUnderTest.Spec; let specInstance; let expectationFactory; - spyOn(jasmineUnderTest, 'MatchersUtil'); - spyOn(jasmineUnderTest, 'makePrettyPrinter').and.returnValue(prettyPrinter); - spyOn(jasmineUnderTest, 'Spec').and.callFake(function(options) { + spyOn(privateUnderTest, 'MatchersUtil'); + spyOn(privateUnderTest, 'makePrettyPrinter').and.returnValue(prettyPrinter); + spyOn(privateUnderTest, 'Spec').and.callFake(function(options) { expectationFactory = options.expectationFactory; specInstance = new RealSpec(options); return specInstance; @@ -679,10 +679,10 @@ describe('Env', function() { }); await env.execute(); - expect(jasmineUnderTest.makePrettyPrinter).toHaveBeenCalledWith([ + expect(privateUnderTest.makePrettyPrinter).toHaveBeenCalledWith([ customObjectFormatter ]); - expect(jasmineUnderTest.MatchersUtil).toHaveBeenCalledWith({ + expect(privateUnderTest.MatchersUtil).toHaveBeenCalledWith({ customTesters: [customEqualityTester], pp: prettyPrinter }); @@ -692,12 +692,12 @@ describe('Env', function() { function customEqualityTester() {} function customObjectFormatter() {} function prettyPrinter() {} - const RealSpec = jasmineUnderTest.Spec; + const RealSpec = privateUnderTest.Spec; let specInstance; let asyncExpectationFactory; - spyOn(jasmineUnderTest, 'MatchersUtil'); - spyOn(jasmineUnderTest, 'makePrettyPrinter').and.returnValue(prettyPrinter); - spyOn(jasmineUnderTest, 'Spec').and.callFake(function(options) { + spyOn(privateUnderTest, 'MatchersUtil'); + spyOn(privateUnderTest, 'makePrettyPrinter').and.returnValue(prettyPrinter); + spyOn(privateUnderTest, 'Spec').and.callFake(function(options) { asyncExpectationFactory = options.asyncExpectationFactory; specInstance = new RealSpec(options); return specInstance; @@ -711,10 +711,10 @@ describe('Env', function() { await env.execute(); - expect(jasmineUnderTest.makePrettyPrinter).toHaveBeenCalledWith([ + expect(privateUnderTest.makePrettyPrinter).toHaveBeenCalledWith([ customObjectFormatter ]); - expect(jasmineUnderTest.MatchersUtil).toHaveBeenCalledWith({ + expect(privateUnderTest.MatchersUtil).toHaveBeenCalledWith({ customTesters: [customEqualityTester], pp: prettyPrinter }); @@ -729,7 +729,7 @@ describe('Env', function() { env.it('has a spec'); }); - expect(suiteThis).not.toBeInstanceOf(jasmineUnderTest.Suite); + expect(suiteThis).not.toBeInstanceOf(privateUnderTest.Suite); }); describe('#execute', function() { @@ -738,7 +738,7 @@ describe('Env', function() { }); it('should reset the topSuite when run twice', function() { - spyOn(jasmineUnderTest.Suite.prototype, 'reset'); + spyOn(privateUnderTest.Suite.prototype, 'reset'); return env .execute() // 1 .then(function() { @@ -746,9 +746,9 @@ describe('Env', function() { }) .then(function() { expect( - jasmineUnderTest.Suite.prototype.reset + privateUnderTest.Suite.prototype.reset ).toHaveBeenCalledOnceWith(); - const id = jasmineUnderTest.Suite.prototype.reset.calls.thisFor(0).id; + const id = privateUnderTest.Suite.prototype.reset.calls.thisFor(0).id; expect(id).toBeTruthy(); expect(id).toEqual(env.topSuite().id); }); @@ -757,9 +757,9 @@ describe('Env', function() { it('should not reset the topSuite if parallelReset was called since the last run', async function() { await env.execute(); env.parallelReset(); - spyOn(jasmineUnderTest.Suite.prototype, 'reset'); + spyOn(privateUnderTest.Suite.prototype, 'reset'); await env.execute(); - expect(jasmineUnderTest.Suite.prototype.reset).not.toHaveBeenCalled(); + expect(privateUnderTest.Suite.prototype.reset).not.toHaveBeenCalled(); }); describe('In parallel mode', function() { diff --git a/spec/core/ExceptionFormatterSpec.js b/spec/core/ExceptionFormatterSpec.js index c720da1d..47217fd6 100644 --- a/spec/core/ExceptionFormatterSpec.js +++ b/spec/core/ExceptionFormatterSpec.js @@ -7,7 +7,7 @@ describe('ExceptionFormatter', function() { message: 'you got your foo in my bar', name: 'A Classic Mistake' }, - exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(), + exceptionFormatter = new privateUnderTest.ExceptionFormatter(), message = exceptionFormatter.message(sampleFirefoxException); expect(message).toEqual( @@ -22,7 +22,7 @@ describe('ExceptionFormatter', function() { message: 'you got your foo in my bar', name: 'A Classic Mistake' }, - exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(), + exceptionFormatter = new privateUnderTest.ExceptionFormatter(), message = exceptionFormatter.message(sampleWebkitException); expect(message).toEqual( @@ -35,7 +35,7 @@ describe('ExceptionFormatter', function() { message: 'you got your foo in my bar', name: 'A Classic Mistake' }, - exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(), + exceptionFormatter = new privateUnderTest.ExceptionFormatter(), message = exceptionFormatter.message(sampleV8); expect(message).toEqual('A Classic Mistake: you got your foo in my bar'); @@ -44,7 +44,7 @@ describe('ExceptionFormatter', function() { it('formats unnamed exceptions with message', function() { const unnamedError = { message: 'This is an unnamed error message.' }; - const exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(), + const exceptionFormatter = new privateUnderTest.ExceptionFormatter(), message = exceptionFormatter.message(unnamedError); expect(message).toEqual('This is an unnamed error message.'); @@ -57,7 +57,7 @@ describe('ExceptionFormatter', function() { }; const emptyError = new EmptyError(); - const exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(), + const exceptionFormatter = new privateUnderTest.ExceptionFormatter(), message = exceptionFormatter.message(emptyError); expect(message).toEqual('[EmptyError] thrown'); @@ -65,7 +65,7 @@ describe('ExceptionFormatter', function() { it("formats thrown exceptions that aren't errors", function() { const thrown = 'crazy error', - exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(), + exceptionFormatter = new privateUnderTest.ExceptionFormatter(), message = exceptionFormatter.message(thrown); expect(message).toEqual('crazy error thrown'); @@ -76,7 +76,7 @@ describe('ExceptionFormatter', function() { it('formats stack traces', function() { const error = new Error('an error'); - expect(new jasmineUnderTest.ExceptionFormatter().stack(error)).toMatch( + expect(new privateUnderTest.ExceptionFormatter().stack(error)).toMatch( /ExceptionFormatterSpec\.js.*\d+/ ); }); @@ -96,7 +96,7 @@ describe('ExceptionFormatter', function() { ' at fn3 (C:\\__jasmine__\\lib\\jasmine-core\\jasmine.js:7575:25)\n' + ' at fn4 (node:internal/timers:462:21)\n' }; - const subject = new jasmineUnderTest.ExceptionFormatter({ + const subject = new privateUnderTest.ExceptionFormatter({ jasmineFile: 'C:\\__jasmine__\\lib\\jasmine-core\\jasmine.js' }); const result = subject.stack(error); @@ -122,7 +122,7 @@ describe('ExceptionFormatter', function() { ' at fn3 (http://localhost:8888/__jasmine__/jasmine.js:4320:20)\n' + ' at fn4 (http://localhost:8888/__spec__/core/UtilSpec.js:110:19)\n' }; - const subject = new jasmineUnderTest.ExceptionFormatter({ + const subject = new privateUnderTest.ExceptionFormatter({ jasmineFile: 'http://localhost:8888/__jasmine__/jasmine.js' }); const result = subject.stack(error); @@ -142,7 +142,7 @@ describe('ExceptionFormatter', function() { 'fn2@http://localhost:8888/__jasmine__/jasmine.js:4320:27\n' + 'http://localhost:8888/__spec__/core/UtilSpec.js:115:28' }; - const subject = new jasmineUnderTest.ExceptionFormatter({ + const subject = new privateUnderTest.ExceptionFormatter({ jasmineFile: 'http://localhost:8888/__jasmine__/jasmine.js' }); const result = subject.stack(error); @@ -161,7 +161,7 @@ describe('ExceptionFormatter', function() { 'setTimeout handler*fn2@http://localhost:8888/__jasmine__/jasmine.js:4320:27\n' + 'http://localhost:8888/__spec__/core/UtilSpec.js:115:28' }; - const subject = new jasmineUnderTest.ExceptionFormatter({ + const subject = new privateUnderTest.ExceptionFormatter({ jasmineFile: 'http://localhost:8888/__jasmine__/jasmine.js' }); const result = subject.stack(error); @@ -174,8 +174,8 @@ describe('ExceptionFormatter', function() { it('filters Jasmine stack frames in this environment', function() { const error = new Error('an error'); - const subject = new jasmineUnderTest.ExceptionFormatter({ - jasmineFile: jasmine.util.jasmineFile() + const subject = new privateUnderTest.ExceptionFormatter({ + jasmineFile: jasmine.private.util.jasmineFile() }); const result = subject.stack(error); jasmine.debugLog('Original stack trace: ' + error.stack); @@ -202,8 +202,8 @@ describe('ExceptionFormatter', function() { if (error.stack.indexOf(msg) === -1) { pending("Stack traces don't have messages in this environment"); } - const subject = new jasmineUnderTest.ExceptionFormatter({ - jasmineFile: jasmine.util.jasmineFile() + const subject = new privateUnderTest.ExceptionFormatter({ + jasmineFile: jasmine.private.util.jasmineFile() }); const result = subject.stack(error); const lines = result.split('\n'); @@ -215,14 +215,14 @@ describe('ExceptionFormatter', function() { }); it('returns null if no Error provided', function() { - expect(new jasmineUnderTest.ExceptionFormatter().stack()).toBeNull(); + expect(new privateUnderTest.ExceptionFormatter().stack()).toBeNull(); }); it("includes the error's own properties in stack", function() { const error = new Error('an error'); error.someProperty = 'hello there'; - const result = new jasmineUnderTest.ExceptionFormatter().stack(error); + const result = new privateUnderTest.ExceptionFormatter().stack(error); expect(result).toMatch(/error properties:.*someProperty.*hello there/); }); @@ -236,7 +236,7 @@ describe('ExceptionFormatter', function() { CustomError.prototype.anInheritedProp = 'something'; const error = new CustomError('nope'); - const result = new jasmineUnderTest.ExceptionFormatter().stack(error); + const result = new privateUnderTest.ExceptionFormatter().stack(error); expect(result).not.toContain('anInheritedProp'); }); @@ -251,7 +251,7 @@ describe('ExceptionFormatter', function() { ' at fn3 (http://localhost:8888/__jasmine__/jasmine.js:4320:20)\n' + ' at fn4 (http://localhost:8888/__spec__/core/UtilSpec.js:110:19)\n' }; - const subject = new jasmineUnderTest.ExceptionFormatter({ + const subject = new privateUnderTest.ExceptionFormatter({ jasmineFile: 'http://localhost:8888/__jasmine__/jasmine.js' }); const result = subject.stack(error, { omitMessage: true }); @@ -270,7 +270,7 @@ describe('ExceptionFormatter', function() { 'fn2@http://localhost:8888/__jasmine__/jasmine.js:4320:27\n' + 'http://localhost:8888/__spec__/core/UtilSpec.js:115:28' }; - const subject = new jasmineUnderTest.ExceptionFormatter({ + const subject = new privateUnderTest.ExceptionFormatter({ jasmineFile: 'http://localhost:8888/__jasmine__/jasmine.js' }); const result = subject.stack(error, { omitMessage: true }); @@ -283,8 +283,8 @@ describe('ExceptionFormatter', function() { it('ensures that stack traces do not include the message in this environment', function() { const error = new Error('an error'); - const subject = new jasmineUnderTest.ExceptionFormatter({ - jasmineFile: jasmine.util.jasmineFile() + const subject = new privateUnderTest.ExceptionFormatter({ + jasmineFile: jasmine.private.util.jasmineFile() }); const result = subject.stack(error, { omitMessage: true }); expect(result).not.toContain('an error'); @@ -293,7 +293,7 @@ describe('ExceptionFormatter', function() { describe('when the error has a cause property', function() { it('recursively includes the cause in the stack trace in this environment', function() { - const subject = new jasmineUnderTest.ExceptionFormatter(); + const subject = new privateUnderTest.ExceptionFormatter(); const rootCause = new Error('root cause'); const proximateCause = new Error('proximate cause', { cause: rootCause @@ -327,7 +327,7 @@ describe('ExceptionFormatter', function() { }); it('does not throw if cause is a non Error', function() { - const formatter = new jasmineUnderTest.ExceptionFormatter(); + const formatter = new privateUnderTest.ExceptionFormatter(); expect(function() { formatter.stack( diff --git a/spec/core/ExceptionsSpec.js b/spec/core/ExceptionsSpec.js index c357290c..108a1253 100644 --- a/spec/core/ExceptionsSpec.js +++ b/spec/core/ExceptionsSpec.js @@ -2,7 +2,7 @@ describe('Exceptions:', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { diff --git a/spec/core/ExpectationFilterChainSpec.js b/spec/core/ExpectationFilterChainSpec.js index aab7171d..f0acbb5d 100644 --- a/spec/core/ExpectationFilterChainSpec.js +++ b/spec/core/ExpectationFilterChainSpec.js @@ -3,7 +3,7 @@ describe('ExpectationFilterChain', function() { it('returns a new filter chain with the added filter', function() { const first = jasmine.createSpy('first'), second = jasmine.createSpy('second'), - orig = new jasmineUnderTest.ExpectationFilterChain({ + orig = new privateUnderTest.ExpectationFilterChain({ modifyFailureMessage: first }), added = orig.addFilter({ selectComparisonFunc: second }); @@ -15,7 +15,7 @@ describe('ExpectationFilterChain', function() { }); it('does not modify the original filter chain', function() { - const orig = new jasmineUnderTest.ExpectationFilterChain({}), + const orig = new privateUnderTest.ExpectationFilterChain({}), f = jasmine.createSpy('f'); orig.addFilter({ selectComparisonFunc: f }); @@ -28,7 +28,7 @@ describe('ExpectationFilterChain', function() { describe('#selectComparisonFunc', function() { describe('When no filters have #selectComparisonFunc', function() { it('returns undefined', function() { - const chain = new jasmineUnderTest.ExpectationFilterChain(); + const chain = new privateUnderTest.ExpectationFilterChain(); chain.addFilter({}); expect(chain.selectComparisonFunc()).toBeUndefined(); }); @@ -38,7 +38,7 @@ describe('ExpectationFilterChain', function() { it('calls the first filter that has #selectComparisonFunc', function() { const first = jasmine.createSpy('first').and.returnValue('first'), second = jasmine.createSpy('second').and.returnValue('second'), - chain = new jasmineUnderTest.ExpectationFilterChain() + chain = new privateUnderTest.ExpectationFilterChain() .addFilter({ selectComparisonFunc: first }) .addFilter({ selectComparisonFunc: second }), matcher = {}, @@ -54,7 +54,7 @@ describe('ExpectationFilterChain', function() { describe('#buildFailureMessage', function() { describe('When no filters have #buildFailureMessage', function() { it('returns undefined', function() { - const chain = new jasmineUnderTest.ExpectationFilterChain(); + const chain = new privateUnderTest.ExpectationFilterChain(); chain.addFilter({}); expect(chain.buildFailureMessage()).toBeUndefined(); }); @@ -64,7 +64,7 @@ describe('ExpectationFilterChain', function() { it('calls the first filter that has #buildFailureMessage', function() { const first = jasmine.createSpy('first').and.returnValue('first'), second = jasmine.createSpy('second').and.returnValue('second'), - chain = new jasmineUnderTest.ExpectationFilterChain() + chain = new privateUnderTest.ExpectationFilterChain() .addFilter({ buildFailureMessage: first }) .addFilter({ buildFailureMessage: second }), matcherResult = { pass: false }, @@ -94,7 +94,7 @@ describe('ExpectationFilterChain', function() { describe('#modifyFailureMessage', function() { describe('When no filters have #modifyFailureMessage', function() { it('returns the original message', function() { - const chain = new jasmineUnderTest.ExpectationFilterChain(); + const chain = new privateUnderTest.ExpectationFilterChain(); chain.addFilter({}); expect(chain.modifyFailureMessage('msg')).toEqual('msg'); }); @@ -104,7 +104,7 @@ describe('ExpectationFilterChain', function() { it('calls the first filter that has #modifyFailureMessage', function() { const first = jasmine.createSpy('first').and.returnValue('first'), second = jasmine.createSpy('second').and.returnValue('second'), - chain = new jasmineUnderTest.ExpectationFilterChain() + chain = new privateUnderTest.ExpectationFilterChain() .addFilter({ modifyFailureMessage: first }) .addFilter({ modifyFailureMessage: second }), result = chain.modifyFailureMessage('original'); diff --git a/spec/core/ExpectationSpec.js b/spec/core/ExpectationSpec.js index 06964b40..0e1f110f 100644 --- a/spec/core/ExpectationSpec.js +++ b/spec/core/ExpectationSpec.js @@ -4,7 +4,7 @@ describe('Expectation', function() { toFoo: function() {}, toBar: function() {} }, - expectation = jasmineUnderTest.Expectation.factory({ + expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers }); @@ -17,9 +17,9 @@ describe('Expectation', function() { toQuux: function() {} }; - jasmineUnderTest.Expectation.addCoreMatchers(coreMatchers); + privateUnderTest.Expectation.addCoreMatchers(coreMatchers); - const expectation = jasmineUnderTest.Expectation.factory({}); + const expectation = privateUnderTest.Expectation.factory({}); expect(expectation.toQuux).toBeDefined(); }); @@ -39,7 +39,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ matchersUtil: matchersUtil, customMatchers: matchers, actual: 'an actual', @@ -67,7 +67,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ matchersUtil: matchersUtil, customMatchers: matchers, actual: 'an actual', @@ -94,7 +94,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, matchersUtil: matchersUtil, actual: 'an actual', @@ -129,7 +129,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, matchersUtil: matchersUtil, actual: 'an actual', @@ -162,7 +162,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ actual: 'an actual', customMatchers: matchers, addExpectationResult: addExpectationResult @@ -196,7 +196,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -225,7 +225,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -259,7 +259,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', matchersUtil: matchersUtil, @@ -292,7 +292,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -324,7 +324,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -359,7 +359,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -393,7 +393,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ actual: 'an actual', customMatchers: matchers, addExpectationResult: addExpectationResult @@ -427,7 +427,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ actual: 'an actual', customMatchers: matchers, addExpectationResult: addExpectationResult @@ -463,7 +463,7 @@ describe('Expectation', function() { }, addExpectationResult = jasmine.createSpy('addExpectationResult'); - const expectation = jasmineUnderTest.Expectation.factory({ + const expectation = privateUnderTest.Expectation.factory({ actual: 'an actual', customMatchers: matchers, addExpectationResult: addExpectationResult @@ -497,7 +497,7 @@ describe('Expectation', function() { } }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.factory({ + expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, matchersUtil: matchersUtil, actual: 'an actual', @@ -525,7 +525,7 @@ describe('Expectation', function() { } }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.factory({ + expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -552,7 +552,7 @@ describe('Expectation', function() { } }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.factory({ + expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -582,7 +582,7 @@ describe('Expectation', function() { } }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.factory({ + expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, actual: 'an actual', addExpectationResult: addExpectationResult @@ -609,10 +609,10 @@ describe('Expectation', function() { } }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - pp = jasmineUnderTest.makePrettyPrinter(), - expectation = jasmineUnderTest.Expectation.factory({ + pp = privateUnderTest.makePrettyPrinter(), + expectation = privateUnderTest.Expectation.factory({ customMatchers: matchers, - matchersUtil: new jasmineUnderTest.MatchersUtil({ pp: pp }), + matchersUtil: new privateUnderTest.MatchersUtil({ pp: pp }), actual: 'an actual', addExpectationResult: addExpectationResult }); @@ -645,7 +645,7 @@ describe('Expectation', function() { } }, addExpectationResult = jasmine.createSpy('addExpectationResult'), - expectation = jasmineUnderTest.Expectation.factory({ + expectation = privateUnderTest.Expectation.factory({ actual: 'an actual', customMatchers: matchers, addExpectationResult: addExpectationResult diff --git a/spec/core/GlobalErrorsSpec.js b/spec/core/GlobalErrorsSpec.js index 959bb340..d53695ad 100644 --- a/spec/core/GlobalErrorsSpec.js +++ b/spec/core/GlobalErrorsSpec.js @@ -2,7 +2,7 @@ describe('GlobalErrors', function() { it('calls the added handler on error', function() { const globals = browserGlobals(); const handler = jasmine.createSpy('errorHandler'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -22,7 +22,7 @@ describe('GlobalErrors', function() { it('is not affected by overriding global.onerror', function() { const globals = browserGlobals(); const handler = jasmine.createSpy('errorHandler'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -45,7 +45,7 @@ describe('GlobalErrors', function() { const globals = browserGlobals(); const handler1 = jasmine.createSpy('errorHandler1'); const handler2 = jasmine.createSpy('errorHandler2'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -68,7 +68,7 @@ describe('GlobalErrors', function() { const globals = browserGlobals(); const handler1 = jasmine.createSpy('errorHandler1'); const handler2 = jasmine.createSpy('errorHandler2'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -90,7 +90,7 @@ describe('GlobalErrors', function() { }); it('throws when no listener is passed to #popListener', function() { - const errors = new jasmineUnderTest.GlobalErrors({}); + const errors = new privateUnderTest.GlobalErrors({}); expect(function() { errors.popListener(); }).toThrowError('popListener expects a listener'); @@ -98,7 +98,7 @@ describe('GlobalErrors', function() { it('uninstalls itself', function() { const globals = browserGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -113,7 +113,7 @@ describe('GlobalErrors', function() { it('rethrows the original error when there is no handler', function() { const globals = browserGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -132,7 +132,7 @@ describe('GlobalErrors', function() { it('reports uncaught exceptions in node.js', function() { const globals = nodeGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -165,7 +165,7 @@ describe('GlobalErrors', function() { describe('Reporting unhandled promise rejections in node.js', function() { it('reports rejections with `Error` reasons', function() { const globals = nodeGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -197,7 +197,7 @@ describe('GlobalErrors', function() { it('reports rejections with non-`Error` reasons', function() { const globals = nodeGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -220,7 +220,7 @@ describe('GlobalErrors', function() { it('reports rejections with no reason provided', function() { const globals = nodeGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -246,7 +246,7 @@ describe('GlobalErrors', function() { beforeEach(function() { globals = nodeGlobals(); - errors = new jasmineUnderTest.GlobalErrors(globals.global, () => ({ + errors = new privateUnderTest.GlobalErrors(globals.global, () => ({ detectLateRejectionHandling: true })); }); @@ -379,7 +379,7 @@ describe('GlobalErrors', function() { describe('Reporting unhandled promise rejections in the browser', function() { it('subscribes and unsubscribes from the unhandledrejection event', function() { const globals = browserGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -396,7 +396,7 @@ describe('GlobalErrors', function() { it('reports rejections whose reason is a string', function() { const globals = browserGlobals(); const handler = jasmine.createSpy('errorHandler'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -416,7 +416,7 @@ describe('GlobalErrors', function() { it('reports rejections whose reason is an Error', function() { const globals = browserGlobals(); const handler = jasmine.createSpy('errorHandler'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -443,7 +443,7 @@ describe('GlobalErrors', function() { beforeEach(function() { globals = browserGlobals(); - errors = new jasmineUnderTest.GlobalErrors(globals.global, () => ({ + errors = new privateUnderTest.GlobalErrors(globals.global, () => ({ detectLateRejectionHandling: true })); }); @@ -556,7 +556,7 @@ describe('GlobalErrors', function() { describe('Reporting uncaught exceptions in node.js', function() { it('prepends a descriptive message when the error is not an `Error`', function() { const globals = nodeGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -575,7 +575,7 @@ describe('GlobalErrors', function() { it('substitutes a descriptive message when the error is falsy', function() { const globals = nodeGlobals(); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -599,7 +599,7 @@ describe('GlobalErrors', function() { const handler0 = jasmine.createSpy('handler0'); const handler1 = jasmine.createSpy('handler1'); const overrideHandler = jasmine.createSpy('overrideHandler'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -627,7 +627,7 @@ describe('GlobalErrors', function() { const handler0 = jasmine.createSpy('handler0'); const handler1 = jasmine.createSpy('handler1'); const overrideHandler = jasmine.createSpy('overrideHandler'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -655,7 +655,7 @@ describe('GlobalErrors', function() { const globals = browserGlobals(); const handler = jasmine.createSpy('handler'); const overrideHandler = jasmine.createSpy('overrideHandler'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -683,7 +683,7 @@ describe('GlobalErrors', function() { const handler0 = jasmine.createSpy('handler0'); const handler1 = jasmine.createSpy('handler1'); const overrideHandler = jasmine.createSpy('overrideHandler'); - const errors = new jasmineUnderTest.GlobalErrors( + const errors = new privateUnderTest.GlobalErrors( globals.global, () => ({}) ); @@ -701,7 +701,7 @@ describe('GlobalErrors', function() { }); it('throws if there is already an override handler', function() { - const errors = new jasmineUnderTest.GlobalErrors(browserGlobals().global); + const errors = new privateUnderTest.GlobalErrors(browserGlobals().global); errors.setOverrideListener(() => {}, () => {}); expect(function() { @@ -713,7 +713,7 @@ describe('GlobalErrors', function() { describe('#removeOverrideListener', function() { it("calls the handler's onRemove callback", function() { const onRemove = jasmine.createSpy('onRemove'); - const errors = new jasmineUnderTest.GlobalErrors(browserGlobals().global); + const errors = new privateUnderTest.GlobalErrors(browserGlobals().global); errors.setOverrideListener(() => {}, onRemove); errors.removeOverrideListener(); @@ -722,7 +722,7 @@ describe('GlobalErrors', function() { }); it('does not throw if there is no handler', function() { - const errors = new jasmineUnderTest.GlobalErrors(browserGlobals().global); + const errors = new privateUnderTest.GlobalErrors(browserGlobals().global); expect(() => errors.removeOverrideListener()).not.toThrow(); }); diff --git a/spec/core/JsApiReporterSpec.js b/spec/core/JsApiReporterSpec.js index 28f9e3b8..d2af65ce 100644 --- a/spec/core/JsApiReporterSpec.js +++ b/spec/core/JsApiReporterSpec.js @@ -1,6 +1,6 @@ describe('JsApiReporter', function() { it('knows when a full environment is started', function() { - const reporter = new jasmineUnderTest.JsApiReporter({}); + const reporter = new privateUnderTest.JsApiReporter({}); expect(reporter.started).toBe(false); expect(reporter.finished).toBe(false); @@ -12,7 +12,7 @@ describe('JsApiReporter', function() { }); it('knows when a full environment is done', function() { - const reporter = new jasmineUnderTest.JsApiReporter({}); + const reporter = new privateUnderTest.JsApiReporter({}); expect(reporter.started).toBe(false); expect(reporter.finished).toBe(false); @@ -24,13 +24,13 @@ describe('JsApiReporter', function() { }); it("defaults to 'loaded' status", function() { - const reporter = new jasmineUnderTest.JsApiReporter({}); + const reporter = new privateUnderTest.JsApiReporter({}); expect(reporter.status()).toEqual('loaded'); }); it("reports 'started' when Jasmine has started", function() { - const reporter = new jasmineUnderTest.JsApiReporter({}); + const reporter = new privateUnderTest.JsApiReporter({}); reporter.jasmineStarted(); @@ -38,7 +38,7 @@ describe('JsApiReporter', function() { }); it("reports 'done' when Jasmine is done", function() { - const reporter = new jasmineUnderTest.JsApiReporter({}); + const reporter = new privateUnderTest.JsApiReporter({}); reporter.jasmineDone({}); @@ -46,7 +46,7 @@ describe('JsApiReporter', function() { }); it('tracks a suite', function() { - const reporter = new jasmineUnderTest.JsApiReporter({}); + const reporter = new privateUnderTest.JsApiReporter({}); reporter.suiteStarted({ id: 123, @@ -71,7 +71,7 @@ describe('JsApiReporter', function() { describe('#specResults', function() { let reporter, specResult1, specResult2; beforeEach(function() { - reporter = new jasmineUnderTest.JsApiReporter({}); + reporter = new privateUnderTest.JsApiReporter({}); specResult1 = { id: 1, description: 'A spec' @@ -101,7 +101,7 @@ describe('JsApiReporter', function() { describe('#suiteResults', function() { let reporter, suiteStarted1, suiteResult1, suiteResult2; beforeEach(function() { - reporter = new jasmineUnderTest.JsApiReporter({}); + reporter = new privateUnderTest.JsApiReporter({}); suiteStarted1 = { id: 1 }; @@ -138,7 +138,7 @@ describe('JsApiReporter', function() { describe('#executionTime', function() { it('should start the timer when jasmine starts', function() { const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']), - reporter = new jasmineUnderTest.JsApiReporter({ + reporter = new privateUnderTest.JsApiReporter({ timer: timerSpy }); @@ -148,7 +148,7 @@ describe('JsApiReporter', function() { it('should return the time it took the specs to run, in ms', function() { const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']), - reporter = new jasmineUnderTest.JsApiReporter({ + reporter = new privateUnderTest.JsApiReporter({ timer: timerSpy }); @@ -160,7 +160,7 @@ describe('JsApiReporter', function() { describe("when the specs haven't finished being run", function() { it('should return undefined', function() { const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']), - reporter = new jasmineUnderTest.JsApiReporter({ + reporter = new privateUnderTest.JsApiReporter({ timer: timerSpy }); @@ -171,7 +171,7 @@ describe('JsApiReporter', function() { describe('#runDetails', function() { it('should have details about the run', function() { - const reporter = new jasmineUnderTest.JsApiReporter({}); + const reporter = new privateUnderTest.JsApiReporter({}); reporter.jasmineDone({ some: { run: 'details' } }); expect(reporter.runDetails).toEqual({ some: { run: 'details' } }); }); diff --git a/spec/core/MockDateSpec.js b/spec/core/MockDateSpec.js index b4ce40dd..e394ac8e 100644 --- a/spec/core/MockDateSpec.js +++ b/spec/core/MockDateSpec.js @@ -1,7 +1,7 @@ describe('FakeDate', function() { it('does not fail if no global date is found', function() { const fakeGlobal = {}, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + mockDate = new privateUnderTest.MockDate(fakeGlobal); expect(function() { mockDate.install(); @@ -19,7 +19,7 @@ describe('FakeDate', function() { }; }), fakeGlobal = { Date: globalDate }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + mockDate = new privateUnderTest.MockDate(fakeGlobal); expect(fakeGlobal.Date).toEqual(globalDate); mockDate.install(); @@ -36,7 +36,7 @@ describe('FakeDate', function() { }; }), fakeGlobal = { Date: globalDate }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); mockDate.uninstall(); @@ -55,7 +55,7 @@ describe('FakeDate', function() { }; }), fakeGlobal = { Date: globalDate }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); @@ -66,7 +66,7 @@ describe('FakeDate', function() { it('can accept a date as time base when installing', function() { const fakeGlobal = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal), + mockDate = new privateUnderTest.MockDate(fakeGlobal), baseDate = new Date(); spyOn(baseDate, 'getTime').and.returnValue(123); @@ -77,7 +77,7 @@ describe('FakeDate', function() { it('makes real dates', function() { const fakeGlobal = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); expect(new fakeGlobal.Date()).toEqual(jasmine.any(Date)); @@ -97,7 +97,7 @@ describe('FakeDate', function() { fakeGlobal = { Date: globalDate }; globalDate.now = function() {}; - const mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + const mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); @@ -117,7 +117,7 @@ describe('FakeDate', function() { fakeGlobal = { Date: globalDate }; globalDate.now = function() {}; - const mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + const mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); @@ -143,7 +143,7 @@ describe('FakeDate', function() { fakeGlobal = { Date: globalDate }; globalDate.now = function() {}; - const mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + const mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); @@ -156,7 +156,7 @@ describe('FakeDate', function() { it('allows creation of a Date in a different time than the mocked time', function() { const fakeGlobal = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); @@ -168,7 +168,7 @@ describe('FakeDate', function() { it("allows creation of a Date that isn't fully specified", function() { const fakeGlobal = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); @@ -178,7 +178,7 @@ describe('FakeDate', function() { it('allows creation of a Date with millis', function() { const fakeGlobal = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal), + mockDate = new privateUnderTest.MockDate(fakeGlobal), now = new Date(2014, 3, 15).getTime(); mockDate.install(); @@ -189,7 +189,7 @@ describe('FakeDate', function() { it('copies all Date properties to the mocked date', function() { const fakeGlobal = { Date: Date }, - mockDate = new jasmineUnderTest.MockDate(fakeGlobal); + mockDate = new privateUnderTest.MockDate(fakeGlobal); mockDate.install(); diff --git a/spec/core/PrettyPrintSpec.js b/spec/core/PrettyPrintSpec.js index 88194b56..f737cb30 100644 --- a/spec/core/PrettyPrintSpec.js +++ b/spec/core/PrettyPrintSpec.js @@ -1,12 +1,12 @@ describe('PrettyPrinter', function() { it('should wrap strings in single quotes', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp('some string')).toEqual("'some string'"); expect(pp("som' string")).toEqual("'som' string'"); }); it('stringifies empty string primitives and objects recognizably', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(new String(''))).toEqual(pp('')); expect(pp(new String(''))).toEqual("''"); expect(pp([new String('')])).toEqual(pp([''])); @@ -14,7 +14,7 @@ describe('PrettyPrinter', function() { }); it('should stringify primitives properly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(true)).toEqual('true'); expect(pp(false)).toEqual('false'); expect(pp(null)).toEqual('null'); @@ -29,7 +29,7 @@ describe('PrettyPrinter', function() { const set = new Set(); set.add(1); set.add(2); - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(set)).toEqual('Set( 1, 2 )'); }); @@ -42,7 +42,7 @@ describe('PrettyPrinter', function() { set.add('a'); set.add('b'); set.add('c'); - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(set)).toEqual("Set( 'a', 'b', ... )"); } finally { jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxSize; @@ -54,7 +54,7 @@ describe('PrettyPrinter', function() { it('should stringify maps properly', function() { const map = new Map(); map.set(1, 2); - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(map)).toEqual('Map( [ 1, 2 ] )'); }); @@ -67,7 +67,7 @@ describe('PrettyPrinter', function() { map.set('a', 1); map.set('b', 2); map.set('c', 3); - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(map)).toEqual("Map( [ 'a', 1 ], [ 'b', 2 ], ... )"); } finally { jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxSize; @@ -77,7 +77,7 @@ describe('PrettyPrinter', function() { describe('stringify arrays', function() { it('should stringify arrays properly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp([1, 2])).toEqual('[ 1, 2 ]'); expect(pp([1, 'foo', {}, jasmine.undefined, null])).toEqual( "[ 1, 'foo', Object({ }), undefined, null ]" @@ -85,14 +85,14 @@ describe('PrettyPrinter', function() { }); it('includes symbols', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp([1, Symbol('foo'), 2])).toEqual('[ 1, Symbol(foo), 2 ]'); }); it('should truncate arrays that are longer than jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH', function() { const originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH; const array = [1, 2, 3]; - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); try { jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2; @@ -103,7 +103,7 @@ describe('PrettyPrinter', function() { }); it('should stringify arrays with properties properly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const arr = [1, 2]; arr.foo = 'bar'; arr.baz = {}; @@ -111,7 +111,7 @@ describe('PrettyPrinter', function() { }); it('should stringify empty arrays with properties properly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const empty = []; empty.foo = 'bar'; empty.baz = {}; @@ -119,7 +119,7 @@ describe('PrettyPrinter', function() { }); it('should stringify long arrays with properties properly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH; const long = [1, 2, 3]; long.foo = 'bar'; @@ -136,7 +136,7 @@ describe('PrettyPrinter', function() { }); it('should indicate circular array references', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const array1 = [1, 2]; const array2 = [array1]; array1.push(array2); @@ -144,14 +144,14 @@ describe('PrettyPrinter', function() { }); it('should not indicate circular references incorrectly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const array = [[1]]; expect(pp(array)).toEqual('[ [ 1 ] ]'); }); }); it('should stringify objects properly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp({ foo: 'bar' })).toEqual("Object({ foo: 'bar' })"); expect( pp({ @@ -169,14 +169,14 @@ describe('PrettyPrinter', function() { }); it('includes symbol keys in objects', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const obj = {}; obj[Symbol('foo')] = 'bar'; expect(pp(obj)).toEqual("Object({ Symbol(foo): 'bar' })"); }); it('stringifies string and symbol keys differently', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const symObj = {}; const strObj = {}; const k = 'foo'; @@ -188,12 +188,12 @@ describe('PrettyPrinter', function() { }); it('should stringify objects that almost look like DOM nodes', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp({ nodeType: 1 })).toEqual('Object({ nodeType: 1 })'); }); it('should truncate objects with too many keys', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH; const long = { a: 1, b: 2, c: 3 }; @@ -217,7 +217,7 @@ describe('PrettyPrinter', function() { } it('should truncate outputs that are too long', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const big = [{ a: 1, b: 'a long string' }, {}]; withMaxChars(34, function() { @@ -246,7 +246,7 @@ describe('PrettyPrinter', function() { .createSpy('d jasmineToString') .and.returnValue('') }, - pp = jasmineUnderTest.makePrettyPrinter(); + pp = privateUnderTest.makePrettyPrinter(); withMaxChars(30, function() { pp([{ a: a, b: b, c: c }, d]); @@ -256,13 +256,13 @@ describe('PrettyPrinter', function() { }); it("should print 'null' as the constructor of an object with its own constructor property", function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp({ constructor: function() {} })).toContain('null({'); expect(pp({ constructor: 'foo' })).toContain('null({'); }); it('should not include inherited properties when stringifying an object', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const SomeClass = function SomeClass() {}; SomeClass.prototype.foo = 'inherited foo'; const instance = new SomeClass(); @@ -271,7 +271,7 @@ describe('PrettyPrinter', function() { }); it('should not recurse objects and arrays more deeply than jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const originalMaxDepth = jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH; const nestedObject = { level1: { level2: { level3: { level4: 'leaf' } } } }; const nestedArray = [1, [2, [3, [4, 'leaf']]]]; @@ -300,7 +300,7 @@ describe('PrettyPrinter', function() { }); it('should stringify immutable circular objects', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); let frozenObject = { foo: { bar: 'baz' } }; frozenObject.circular = frozenObject; frozenObject = Object.freeze(frozenObject); @@ -310,12 +310,12 @@ describe('PrettyPrinter', function() { }); it('should stringify RegExp objects properly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(/x|y|z/)).toEqual('/x|y|z/'); }); it('should indicate circular object references', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const sampleValue = { foo: 'hello' }; sampleValue.nested = sampleValue; expect(pp(sampleValue)).toEqual( @@ -324,7 +324,7 @@ describe('PrettyPrinter', function() { }); it('should use the return value of getters', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const sampleValue = { id: 1, get calculatedValue() { @@ -337,19 +337,19 @@ describe('PrettyPrinter', function() { }); it('should not do HTML escaping of strings', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp('some html string &', false)).toEqual( "'some html string &'" ); }); it('should abbreviate the global (usually window) object', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(jasmine.getGlobal())).toEqual(''); }); it('should stringify Date objects properly', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const now = new Date(); expect(pp(now)).toEqual('Date(' + now.toString() + ')'); }); @@ -358,8 +358,8 @@ describe('PrettyPrinter', function() { let env, pp; beforeEach(function() { - env = new jasmineUnderTest.Env(); - pp = jasmineUnderTest.makePrettyPrinter(); + env = new privateUnderTest.Env(); + pp = privateUnderTest.makePrettyPrinter(); }); afterEach(function() { @@ -371,12 +371,12 @@ describe('PrettyPrinter', function() { someFunction: function() {} }; - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return []; }, createSpy: function(name, originalFn) { - return jasmineUnderTest.Spy(name, originalFn); + return privateUnderTest.Spy(name, originalFn); } }); @@ -390,15 +390,15 @@ describe('PrettyPrinter', function() { const TestObject = { someFunction: function() {} }, - env = new jasmineUnderTest.Env(), - pp = jasmineUnderTest.makePrettyPrinter(); + env = new privateUnderTest.Env(), + pp = privateUnderTest.makePrettyPrinter(); - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return []; }, createSpy: function(name, originalFn) { - return jasmineUnderTest.Spy(name, originalFn); + return privateUnderTest.Spy(name, originalFn); } }); @@ -410,7 +410,7 @@ describe('PrettyPrinter', function() { }); it('should stringify objects that implement jasmineToString', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const obj = { jasmineToString: function() { return 'strung'; @@ -421,7 +421,7 @@ describe('PrettyPrinter', function() { }); it('should pass itself to jasmineToString', function() { - const pp = jasmineUnderTest.makePrettyPrinter([]); + const pp = privateUnderTest.makePrettyPrinter([]); const obj = { jasmineToString: jasmine.createSpy('jasmineToString').and.returnValue('') }; @@ -431,7 +431,7 @@ describe('PrettyPrinter', function() { }); it('should stringify objects that implement custom toString', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const obj = { toString: function() { return 'my toString'; @@ -455,7 +455,7 @@ describe('PrettyPrinter', function() { }); it("should stringify objects have have a toString that isn't a function", function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const obj = { toString: 'foo' }; @@ -464,7 +464,7 @@ describe('PrettyPrinter', function() { }); it('should stringify objects from anonymous constructors with custom toString', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const MyAnonymousConstructor = (function() { return function() {}; })(); @@ -478,18 +478,18 @@ describe('PrettyPrinter', function() { }); it('stringifies functions with names', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(foo)).toEqual("Function 'foo'"); function foo() {} }); it('stringifies functions without names', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(function() {})).toEqual('Function'); }); it('should handle objects with null prototype', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const obj = Object.create(null); obj.foo = 'bar'; @@ -497,7 +497,7 @@ describe('PrettyPrinter', function() { }); it('should gracefully handle objects with invalid toString implementations', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const obj = { foo: { toString: function() { @@ -545,7 +545,7 @@ describe('PrettyPrinter', function() { return '3rd: ' + obj.foo; } ], - pp = jasmineUnderTest.makePrettyPrinter(customObjectFormatters), + pp = privateUnderTest.makePrettyPrinter(customObjectFormatters), obj = { foo: 'bar' }; expect(pp(obj)).toEqual('2nd: bar'); @@ -557,7 +557,7 @@ describe('PrettyPrinter', function() { return undefined; } ], - pp = jasmineUnderTest.makePrettyPrinter(customObjectFormatters), + pp = privateUnderTest.makePrettyPrinter(customObjectFormatters), obj = { foo: 'bar' }; expect(pp(obj)).toEqual("Object({ foo: 'bar' })"); @@ -577,7 +577,7 @@ describe('PrettyPrinter', function() { return '3rd: ' + obj.foo; } ], - pp = jasmineUnderTest.makePrettyPrinter(customObjectFormatters), + pp = privateUnderTest.makePrettyPrinter(customObjectFormatters), obj = { foo: 'bar' }; expect(pp.customFormat_(obj)).toEqual('2nd: bar'); @@ -589,7 +589,7 @@ describe('PrettyPrinter', function() { return undefined; } ], - pp = jasmineUnderTest.makePrettyPrinter(customObjectFormatters), + pp = privateUnderTest.makePrettyPrinter(customObjectFormatters), obj = { foo: 'bar' }; expect(pp.customFormat_(obj)).toBeUndefined(); diff --git a/spec/core/QueueRunnerSpec.js b/spec/core/QueueRunnerSpec.js index 8eac83cd..9d5a3673 100644 --- a/spec/core/QueueRunnerSpec.js +++ b/spec/core/QueueRunnerSpec.js @@ -1,7 +1,7 @@ describe('QueueRunner', function() { it('validates that queueableFns are truthy', function() { expect(function() { - new jasmineUnderTest.QueueRunner({ + new privateUnderTest.QueueRunner({ queueableFns: [undefined] }); }).toThrowError('Received a falsy queueableFn'); @@ -9,7 +9,7 @@ describe('QueueRunner', function() { it('validates that queueableFns have fn properties', function() { expect(function() { - new jasmineUnderTest.QueueRunner({ + new privateUnderTest.QueueRunner({ queueableFns: [{ fn: undefined }] }); }).toThrowError('Received a queueableFn with no fn'); @@ -19,7 +19,7 @@ describe('QueueRunner', function() { const calls = [], queueableFn1 = { fn: jasmine.createSpy('fn1') }, queueableFn2 = { fn: jasmine.createSpy('fn2') }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2] }); queueableFn1.fn.and.callFake(function() { @@ -44,14 +44,14 @@ describe('QueueRunner', function() { done(); } }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2, queueableFn3] }); queueRunner.execute(); const context = queueableFn1.fn.calls.first().object; - expect(context).toEqual(new jasmineUnderTest.UserContext()); + expect(context).toEqual(new privateUnderTest.UserContext()); expect(queueableFn2.fn.calls.first().object).toBe(context); expect(asyncContext).toBe(context); }); @@ -91,7 +91,7 @@ describe('QueueRunner', function() { setTimeout(done, 100); } }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2, queueableFn3], onComplete: onComplete }); @@ -129,7 +129,7 @@ describe('QueueRunner', function() { }, queueableFn2 = { fn: jasmine.createSpy('fn2') }, failFn = jasmine.createSpy('fail'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2], fail: failFn }); @@ -157,7 +157,7 @@ describe('QueueRunner', function() { }, queueableFn2 = { fn: jasmine.createSpy('fn2') }, failFn = jasmine.createSpy('fail'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2], fail: failFn }); @@ -189,7 +189,7 @@ describe('QueueRunner', function() { }, queueableFn2 = { fn: jasmine.createSpy('fn2') }, failFn = jasmine.createSpy('fail'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2], fail: failFn, onComplete: function() { @@ -211,7 +211,7 @@ describe('QueueRunner', function() { } }, failFn = jasmine.createSpy('fail'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1], fail: failFn, onComplete: function() { @@ -227,7 +227,7 @@ describe('QueueRunner', function() { }); it('does not cause an explicit fail if execution is being stopped', function() { - const err = new jasmineUnderTest.StopExecutionError('foo'), + const err = new privateUnderTest.StopExecutionError('foo'), queueableFn1 = { fn: function(done) { setTimeout(function() { @@ -237,7 +237,7 @@ describe('QueueRunner', function() { }, queueableFn2 = { fn: jasmine.createSpy('fn2') }, failFn = jasmine.createSpy('fail'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2], fail: failFn }); @@ -259,7 +259,7 @@ describe('QueueRunner', function() { queueableFn = { fn: jasmine.createSpy('fn'), type: 'queueable' }, onComplete = jasmine.createSpy('onComplete'), onException = jasmine.createSpy('onException'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [beforeFn, queueableFn], onComplete: onComplete, onException: onException @@ -287,7 +287,7 @@ describe('QueueRunner', function() { }; const onComplete = jasmine.createSpy('onComplete'); const onMultipleDone = jasmine.createSpy('onMultipleDone'); - const queueRunner = new jasmineUnderTest.QueueRunner({ + const queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], onComplete: onComplete, onMultipleDone: onMultipleDone @@ -306,7 +306,7 @@ describe('QueueRunner', function() { queueableFn = { fn: jasmine.createSpy('fn') }, onComplete = jasmine.createSpy('onComplete'), onException = jasmine.createSpy('onException'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [beforeFn, queueableFn], onComplete: onComplete, onException: onException @@ -330,7 +330,7 @@ describe('QueueRunner', function() { }, onComplete = jasmine.createSpy('onComplete'), onException = jasmine.createSpy('onException'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], onComplete: onComplete, onException: onException @@ -353,7 +353,7 @@ describe('QueueRunner', function() { }, onComplete = jasmine.createSpy('onComplete'), onException = jasmine.createSpy('onException'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], onComplete: onComplete, onException: onException @@ -377,7 +377,7 @@ describe('QueueRunner', function() { }, nextQueueableFn = { fn: jasmine.createSpy('nextFn') }, onMultipleDone = jasmine.createSpy('onMultipleDone'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn, nextQueueableFn], onMultipleDone: onMultipleDone }); @@ -396,7 +396,7 @@ describe('QueueRunner', function() { } }, nextQueueableFn = { fn: jasmine.createSpy('nextFn') }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn, nextQueueableFn] }); queueRunner.execute(); @@ -412,7 +412,7 @@ describe('QueueRunner', function() { doneReturn = done(); } }; - const queueRunner = new jasmineUnderTest.QueueRunner({ + const queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn] }); @@ -433,7 +433,7 @@ describe('QueueRunner', function() { pushListener: jasmine.createSpy('pushListener'), popListener: jasmine.createSpy('popListener') }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn, nextQueueableFn], onException: onException, globalErrors: globalErrors @@ -485,7 +485,7 @@ describe('QueueRunner', function() { pushListener: jasmine.createSpy('pushListener'), popListener: jasmine.createSpy('popListener') }; - const queueRunner = new jasmineUnderTest.QueueRunner({ + const queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], onException: onException, globalErrors: globalErrors @@ -513,7 +513,7 @@ describe('QueueRunner', function() { }, clearStack = jasmine.createSpy('clearStack'), onException = jasmine.createSpy('onException'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], globalErrors: globalErrors, clearStack: clearStack, @@ -547,7 +547,7 @@ describe('QueueRunner', function() { }; const clearStack = jasmine.createSpy('clearStack'); const onException = jasmine.createSpy('onException'); - const queueRunner = new jasmineUnderTest.QueueRunner({ + const queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], globalErrors: globalErrors, clearStack: clearStack, @@ -603,7 +603,7 @@ describe('QueueRunner', function() { return p2; } }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2], onComplete: onComplete }); @@ -634,7 +634,7 @@ describe('QueueRunner', function() { }, queueableFn2 = { fn: jasmine.createSpy('fn2') }, onExceptionCallback = jasmine.createSpy('on exception callback'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn1, queueableFn2], onException: onExceptionCallback }); @@ -657,7 +657,7 @@ describe('QueueRunner', function() { } }, onException = jasmine.createSpy('onException'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], onException: onException }); @@ -678,7 +678,7 @@ describe('QueueRunner', function() { it('issues a more specific error if the function is `async`', function() { async function fn(done) {} const onException = jasmine.createSpy('onException'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [{ fn: fn }], onException: onException }); @@ -699,7 +699,7 @@ describe('QueueRunner', function() { it('passes final errors to exception handlers', function() { const error = new Error('fake error'), onExceptionCallback = jasmine.createSpy('on exception callback'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ onException: onExceptionCallback }); @@ -717,7 +717,7 @@ describe('QueueRunner', function() { } }, onExceptionCallback = jasmine.createSpy('on exception callback'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], onException: onExceptionCallback }); @@ -734,7 +734,7 @@ describe('QueueRunner', function() { } }, nextQueueableFn = { fn: jasmine.createSpy('nextFunction') }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn, nextQueueableFn] }); @@ -747,7 +747,7 @@ describe('QueueRunner', function() { const SkipPolicy = jasmine.createSpy('SkipPolicy ctor'); const queueableFns = [{ fn: () => {} }, { fn: () => {} }]; - new jasmineUnderTest.QueueRunner({ + new privateUnderTest.QueueRunner({ queueableFns, SkipPolicy }); @@ -769,7 +769,7 @@ describe('QueueRunner', function() { skipPolicy.skipTo.and.callFake(function(lastRanIx) { return lastRanIx === 0 ? 2 : lastRanIx + 1; }); - const queueRunner = new jasmineUnderTest.QueueRunner({ + const queueRunner = new privateUnderTest.QueueRunner({ queueableFns, SkipPolicy: function() { return skipPolicy; @@ -790,7 +790,7 @@ describe('QueueRunner', function() { it('throws if the skip policy returns the current fn', function() { const skipPolicy = { skipTo: i => i }; const queueableFns = [{ fn: () => {} }]; - const queueRunner = new jasmineUnderTest.QueueRunner({ + const queueRunner = new privateUnderTest.QueueRunner({ queueableFns, SkipPolicy: function() { return skipPolicy; @@ -816,17 +816,17 @@ describe('QueueRunner', function() { type: 'specCleanup' }, onComplete = jasmine.createSpy('onComplete'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn, nextQueueableFn, cleanupFn], onComplete: onComplete, - SkipPolicy: jasmineUnderTest.CompleteOnFirstErrorSkipPolicy + SkipPolicy: privateUnderTest.CompleteOnFirstErrorSkipPolicy }); queueRunner.execute(); expect(nextQueueableFn.fn).not.toHaveBeenCalled(); expect(cleanupFn.fn).toHaveBeenCalled(); expect(onComplete).toHaveBeenCalledWith( - jasmine.any(jasmineUnderTest.StopExecutionError) + jasmine.any(privateUnderTest.StopExecutionError) ); }); @@ -842,9 +842,9 @@ describe('QueueRunner', function() { fn: jasmine.createSpy('cleanupFn2'), type: 'afterEach' }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn, cleanupFn1, cleanupFn2], - SkipPolicy: jasmineUnderTest.CompleteOnFirstErrorSkipPolicy + SkipPolicy: privateUnderTest.CompleteOnFirstErrorSkipPolicy }); queueRunner.execute(); @@ -873,7 +873,7 @@ describe('QueueRunner', function() { fn: jasmine.createSpy('cleanup'), type: 'specCleanup' }; - const queueRunner = new jasmineUnderTest.QueueRunner({ + const queueRunner = new privateUnderTest.QueueRunner({ globalErrors: { pushListener: function(f) { errorListeners.push(f); @@ -883,7 +883,7 @@ describe('QueueRunner', function() { } }, queueableFns: [queueableFn, nextQueueableFn, cleanupFn], - SkipPolicy: jasmineUnderTest.CompleteOnFirstErrorSkipPolicy + SkipPolicy: privateUnderTest.CompleteOnFirstErrorSkipPolicy }); queueRunner.execute(); @@ -902,9 +902,9 @@ describe('QueueRunner', function() { }, nextQueueableFn = { fn: jasmine.createSpy('nextFunction') }, cleanupFn = { fn: jasmine.createSpy('cleanup'), type: 'specCleanup' }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn, nextQueueableFn, cleanupFn], - SkipPolicy: jasmineUnderTest.CompleteOnFirstErrorSkipPolicy + SkipPolicy: privateUnderTest.CompleteOnFirstErrorSkipPolicy }); queueRunner.execute(); @@ -924,9 +924,9 @@ describe('QueueRunner', function() { fn: jasmine.createSpy('cleanup'), type: 'specCleanup' }, - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn, nextQueueableFn, cleanupFn], - SkipPolicy: jasmineUnderTest.CompleteOnFirstErrorSkipPolicy + SkipPolicy: privateUnderTest.CompleteOnFirstErrorSkipPolicy }); queueRunner.execute(); @@ -940,7 +940,7 @@ describe('QueueRunner', function() { it('calls a provided complete callback when done', function() { const queueableFn = { fn: jasmine.createSpy('fn') }, completeCallback = jasmine.createSpy('completeCallback'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [queueableFn], onComplete: completeCallback }); @@ -968,7 +968,7 @@ describe('QueueRunner', function() { afterFn = { fn: jasmine.createSpy('afterFn') }, completeCallback = jasmine.createSpy('completeCallback'), clearStack = jasmine.createSpy('clearStack'), - queueRunner = new jasmineUnderTest.QueueRunner({ + queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [asyncFn, afterFn], clearStack: clearStack, onComplete: completeCallback @@ -992,7 +992,7 @@ describe('QueueRunner', function() { const fn = jasmine.createSpy('fn1'); this.fn = fn; - this.queueRunner = new jasmineUnderTest.QueueRunner({ + this.queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [{ fn: fn }] }); }); @@ -1005,7 +1005,7 @@ describe('QueueRunner', function() { this.queueRunner.execute(); - expect(context.constructor).toBe(jasmineUnderTest.UserContext); + expect(context.constructor).toBe(privateUnderTest.UserContext); }); }); @@ -1015,8 +1015,8 @@ describe('QueueRunner', function() { let context; this.fn = fn; - this.context = context = new jasmineUnderTest.UserContext(); - this.queueRunner = new jasmineUnderTest.QueueRunner({ + this.context = context = new privateUnderTest.UserContext(); + this.queueRunner = new privateUnderTest.QueueRunner({ queueableFns: [{ fn: fn }], userContext: context }); diff --git a/spec/core/ReportDispatcherSpec.js b/spec/core/ReportDispatcherSpec.js index c1234e65..260aa28b 100644 --- a/spec/core/ReportDispatcherSpec.js +++ b/spec/core/ReportDispatcherSpec.js @@ -1,6 +1,6 @@ describe('ReportDispatcher', function() { it('builds an interface of requested methods', function() { - const dispatcher = new jasmineUnderTest.ReportDispatcher([ + const dispatcher = new privateUnderTest.ReportDispatcher([ 'foo', 'bar', 'baz' @@ -13,7 +13,7 @@ describe('ReportDispatcher', function() { it('dispatches requested methods to added reporters', function() { const runQueue = jasmine.createSpy('runQueue'), - dispatcher = new jasmineUnderTest.ReportDispatcher( + dispatcher = new privateUnderTest.ReportDispatcher( ['foo', 'bar'], runQueue ), @@ -68,7 +68,7 @@ describe('ReportDispatcher', function() { it('passes each reporter a separate deep copy of the event', function() { const runQueue = jasmine.createSpy('runQueue'); - const dispatcher = new jasmineUnderTest.ReportDispatcher( + const dispatcher = new privateUnderTest.ReportDispatcher( ['foo', 'bar'], runQueue ); @@ -101,7 +101,7 @@ describe('ReportDispatcher', function() { it("does not dispatch to a reporter if the reporter doesn't accept the method", function() { const runQueue = jasmine.createSpy('runQueue'), - dispatcher = new jasmineUnderTest.ReportDispatcher(['foo'], runQueue), + dispatcher = new privateUnderTest.ReportDispatcher(['foo'], runQueue), reporter = jasmine.createSpyObj('reporter', ['baz']); dispatcher.addReporter(reporter); @@ -116,7 +116,7 @@ describe('ReportDispatcher', function() { it("allows providing a fallback reporter in case there's no other reporter", function() { const runQueue = jasmine.createSpy('runQueue'), - dispatcher = new jasmineUnderTest.ReportDispatcher( + dispatcher = new privateUnderTest.ReportDispatcher( ['foo', 'bar'], runQueue ), @@ -139,7 +139,7 @@ describe('ReportDispatcher', function() { it('does not call fallback reporting methods when another reporter is provided', function() { const runQueue = jasmine.createSpy('runQueue'), - dispatcher = new jasmineUnderTest.ReportDispatcher( + dispatcher = new privateUnderTest.ReportDispatcher( ['foo', 'bar'], runQueue ), @@ -165,7 +165,7 @@ describe('ReportDispatcher', function() { it('allows registered reporters to be cleared', function() { const runQueue = jasmine.createSpy('runQueue'), - dispatcher = new jasmineUnderTest.ReportDispatcher( + dispatcher = new privateUnderTest.ReportDispatcher( ['foo', 'bar'], runQueue ), diff --git a/spec/core/RunableResourcesSpec.js b/spec/core/RunableResourcesSpec.js index a337c291..20283de4 100644 --- a/spec/core/RunableResourcesSpec.js +++ b/spec/core/RunableResourcesSpec.js @@ -38,7 +38,7 @@ describe('RunableResources', function() { describe('#addCustomMatchers', function() { it("adds all properties to the current runable's matchers", function() { const currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -70,7 +70,7 @@ describe('RunableResources', function() { describe('#addCustomAsyncMatchers', function() { it("adds all properties to the current runable's matchers", function() { const currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -95,7 +95,7 @@ describe('RunableResources', function() { describe('#defaultSpyStrategy', function() { it('returns undefined for a newly initialized resource', function() { let currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -106,7 +106,7 @@ describe('RunableResources', function() { it('returns the value previously set by #setDefaultSpyStrategy', function() { let currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -119,7 +119,7 @@ describe('RunableResources', function() { it('is per-runable', function() { let currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -132,7 +132,7 @@ describe('RunableResources', function() { }); it('does not require a current runable', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => null }); @@ -141,7 +141,7 @@ describe('RunableResources', function() { it("inherits the parent runable's value", function() { let currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -157,7 +157,7 @@ describe('RunableResources', function() { describe('#setDefaultSpyStrategy', function() { it('throws a user-facing error when there is no current runable', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => null }); @@ -171,21 +171,21 @@ describe('RunableResources', function() { describe('#makePrettyPrinter', function() { it('returns a pretty printer configured with the current customObjectFormatters', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => 1 }); runableResources.initForRunable(1); function cof() {} runableResources.customObjectFormatters().push(cof); - spyOn(jasmineUnderTest, 'makePrettyPrinter').and.callThrough(); + spyOn(privateUnderTest, 'makePrettyPrinter').and.callThrough(); const pp = runableResources.makePrettyPrinter(); - expect(jasmineUnderTest.makePrettyPrinter).toHaveBeenCalledOnceWith([ + expect(privateUnderTest.makePrettyPrinter).toHaveBeenCalledOnceWith([ cof ]); expect(pp).toBe( - jasmineUnderTest.makePrettyPrinter.calls.first().returnValue + privateUnderTest.makePrettyPrinter.calls.first().returnValue ); }); }); @@ -193,7 +193,7 @@ describe('RunableResources', function() { describe('#makeMatchersUtil', function() { describe('When there is a current runable', function() { it('returns a MatchersUtil configured with the current resources', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => 1 }); @@ -204,26 +204,26 @@ describe('RunableResources', function() { runableResources.customEqualityTesters().push(ceq); const expectedPP = {}; const expectedMatchersUtil = {}; - spyOn(jasmineUnderTest, 'makePrettyPrinter').and.returnValue( + spyOn(privateUnderTest, 'makePrettyPrinter').and.returnValue( expectedPP ); - spyOn(jasmineUnderTest, 'MatchersUtil').and.returnValue( + spyOn(privateUnderTest, 'MatchersUtil').and.returnValue( expectedMatchersUtil ); const matchersUtil = runableResources.makeMatchersUtil(); expect(matchersUtil).toBe(expectedMatchersUtil); - expect(jasmineUnderTest.makePrettyPrinter).toHaveBeenCalledOnceWith([ + expect(privateUnderTest.makePrettyPrinter).toHaveBeenCalledOnceWith([ cof ]); // We need === equality on the pp passed to MatchersUtil - expect(jasmineUnderTest.MatchersUtil).toHaveBeenCalledOnceWith( + expect(privateUnderTest.MatchersUtil).toHaveBeenCalledOnceWith( jasmine.objectContaining({ customTesters: [ceq] }) ); - expect(jasmineUnderTest.MatchersUtil.calls.argsFor(0)[0].pp).toBe( + expect(privateUnderTest.MatchersUtil.calls.argsFor(0)[0].pp).toBe( expectedPP ); }); @@ -231,12 +231,12 @@ describe('RunableResources', function() { describe('When there is no current runable', function() { it('returns a MatchersUtil configured with defaults', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => null }); const expectedMatchersUtil = {}; - spyOn(jasmineUnderTest, 'MatchersUtil').and.returnValue( + spyOn(privateUnderTest, 'MatchersUtil').and.returnValue( expectedMatchersUtil ); @@ -244,12 +244,12 @@ describe('RunableResources', function() { expect(matchersUtil).toBe(expectedMatchersUtil); // We need === equality on the pp passed to MatchersUtil - expect(jasmineUnderTest.MatchersUtil).toHaveBeenCalledTimes(1); - expect(jasmineUnderTest.MatchersUtil.calls.argsFor(0)[0].pp).toBe( - jasmineUnderTest.basicPrettyPrinter_ + expect(privateUnderTest.MatchersUtil).toHaveBeenCalledTimes(1); + expect(privateUnderTest.MatchersUtil.calls.argsFor(0)[0].pp).toBe( + privateUnderTest.basicPrettyPrinter ); expect( - jasmineUnderTest.MatchersUtil.calls.argsFor(0)[0].customTesters + privateUnderTest.MatchersUtil.calls.argsFor(0)[0].customTesters ).toBeUndefined(); }); }); @@ -258,11 +258,11 @@ describe('RunableResources', function() { describe('.spyFactory', function() { describe('When there is no current runable', function() { it('is configured with default strategies and matchersUtil', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => null }); - spyOn(jasmineUnderTest, 'Spy'); + spyOn(privateUnderTest, 'Spy'); const matchersUtil = {}; spyOn(runableResources, 'makeMatchersUtil').and.returnValue( matchersUtil @@ -270,7 +270,7 @@ describe('RunableResources', function() { runableResources.spyFactory.createSpy('foo'); - expect(jasmineUnderTest.Spy).toHaveBeenCalledWith( + expect(privateUnderTest.Spy).toHaveBeenCalledWith( 'foo', is(matchersUtil), jasmine.objectContaining({ @@ -283,7 +283,7 @@ describe('RunableResources', function() { describe('When there is a current runable', function() { it("is configured with the current runable's strategies and matchersUtil", function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => 1 }); @@ -292,7 +292,7 @@ describe('RunableResources', function() { function defaultStrategy() {} runableResources.customSpyStrategies().foo = customStrategy; runableResources.setDefaultSpyStrategy(defaultStrategy); - spyOn(jasmineUnderTest, 'Spy'); + spyOn(privateUnderTest, 'Spy'); const matchersUtil = {}; spyOn(runableResources, 'makeMatchersUtil').and.returnValue( matchersUtil @@ -300,7 +300,7 @@ describe('RunableResources', function() { runableResources.spyFactory.createSpy('foo'); - expect(jasmineUnderTest.Spy).toHaveBeenCalledWith( + expect(privateUnderTest.Spy).toHaveBeenCalledWith( 'foo', is(matchersUtil), jasmine.objectContaining({ @@ -325,7 +325,7 @@ describe('RunableResources', function() { describe('.spyRegistry', function() { it("writes to the current runable's spies", function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => 1 }); @@ -348,7 +348,7 @@ describe('RunableResources', function() { describe('#clearForRunable', function() { it('removes resources for the specified runable', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => 1 }); @@ -363,7 +363,7 @@ describe('RunableResources', function() { }); it('clears spies', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => 1 }); @@ -381,7 +381,7 @@ describe('RunableResources', function() { const globalErrors = jasmine.createSpyObj('globalErrors', [ 'removeOverrideListener' ]); - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ getCurrentRunableId: () => 1, globalErrors }); @@ -392,7 +392,7 @@ describe('RunableResources', function() { }); it('does not remove resources for other runables', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => 1 }); @@ -411,7 +411,7 @@ describe('RunableResources', function() { ) { it('is initially empty', function() { const currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -422,7 +422,7 @@ describe('RunableResources', function() { it('is mutable', function() { const currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -434,7 +434,7 @@ describe('RunableResources', function() { it('is per-runable', function() { let currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -446,7 +446,7 @@ describe('RunableResources', function() { }); it('throws a user-facing error when there is no current runable', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => null }); @@ -458,7 +458,7 @@ describe('RunableResources', function() { if (inherits) { it('inherits from the parent runable', function() { let currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -480,7 +480,7 @@ describe('RunableResources', function() { function behavesLikeAPerRunableMutableObject(methodName, errorMsg) { it('is initially empty', function() { const currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -491,7 +491,7 @@ describe('RunableResources', function() { it('is mutable', function() { const currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -503,7 +503,7 @@ describe('RunableResources', function() { it('is per-runable', function() { let currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); @@ -515,7 +515,7 @@ describe('RunableResources', function() { }); it('throws a user-facing error when there is no current runable', function() { - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => null }); @@ -526,7 +526,7 @@ describe('RunableResources', function() { it('inherits from the parent runable', function() { let currentRunableId = 1; - const runableResources = new jasmineUnderTest.RunableResources({ + const runableResources = new privateUnderTest.RunableResources({ globalErrors: stubGlobalErrors(), getCurrentRunableId: () => currentRunableId }); diff --git a/spec/core/RunnerSpec.js b/spec/core/RunnerSpec.js index 57547975..b4170886 100644 --- a/spec/core/RunnerSpec.js +++ b/spec/core/RunnerSpec.js @@ -15,10 +15,10 @@ describe('Runner', function() { globalErrors = 'the global errors instance'; reportDispatcher = jasmine.createSpyObj( 'reportDispatcher', - jasmineUnderTest.reporterEvents + privateUnderTest.reporterEvents ); - for (const k of jasmineUnderTest.reporterEvents) { + for (const k of privateUnderTest.reporterEvents) { reportDispatcher[k].and.returnValue(Promise.resolve()); } @@ -26,7 +26,7 @@ describe('Runner', function() { failSpecWithNoExpectations = false; detectLateRejectionHandling = false; - spyOn(jasmineUnderTest.TreeRunner.prototype, '_executeSpec'); + spyOn(privateUnderTest.TreeRunner.prototype, '_executeSpec'); }); function StubSuite(attrs) { @@ -72,7 +72,7 @@ describe('Runner', function() { }), focusedRunables: () => [], totalSpecsDefined: () => 1, - TreeProcessor: jasmineUnderTest.TreeProcessor, + TreeProcessor: privateUnderTest.TreeProcessor, runableResources: { initForRunable: () => {}, clearForRunable: () => {} @@ -81,7 +81,7 @@ describe('Runner', function() { globalErrors, runQueue }; - return new jasmineUnderTest.Runner({ + return new privateUnderTest.Runner({ ...defaultOptions, topSuite }); @@ -90,7 +90,7 @@ describe('Runner', function() { function arrayNotContaining(item) { return { asymmetricMatch(other, matchersUtil) { - if (!jasmine.isArray_(other)) { + if (!jasmine.private.isArray(other)) { return false; } @@ -105,9 +105,9 @@ describe('Runner', function() { }; } - // Precondition: jasmineUnderTest.TreeRunner.prototype._executeSpec is a spy + // Precondition: privateUnderTest.TreeRunner.prototype._executeSpec is a spy function verifyAndFinishSpec(spec, queueableFn, shouldBeExcluded) { - const ex = jasmineUnderTest.TreeRunner.prototype._executeSpec; + const ex = privateUnderTest.TreeRunner.prototype._executeSpec; ex.withArgs(spec, 'onComplete').and.callThrough(); queueableFn.fn('onComplete'); @@ -116,7 +116,7 @@ describe('Runner', function() { expect(runQueue).toHaveBeenCalledWith( jasmine.objectContaining({ isLeaf: true, - SkipPolicy: jasmineUnderTest.CompleteOnFirstErrorSkipPolicy, + SkipPolicy: privateUnderTest.CompleteOnFirstErrorSkipPolicy, queueableFns: shouldBeExcluded ? arrayNotContaining(spec.queueableFn) : jasmine.arrayContaining([spec.queueableFn]) @@ -142,7 +142,7 @@ describe('Runner', function() { userContext: { root: 'context' }, queueableFns: [{ fn: jasmine.any(Function) }], onMultipleDone: null, - SkipPolicy: jasmineUnderTest.SkipAfterBeforeAllErrorPolicy + SkipPolicy: privateUnderTest.SkipAfterBeforeAllErrorPolicy }); const runQueueArgs = runQueue.calls.mostRecent().args[0]; @@ -169,7 +169,7 @@ describe('Runner', function() { userContext: { for: 'topSuite' }, queueableFns: [{ fn: jasmine.any(Function) }], onMultipleDone: null, - SkipPolicy: jasmineUnderTest.SkipAfterBeforeAllErrorPolicy + SkipPolicy: privateUnderTest.SkipAfterBeforeAllErrorPolicy }); const runQueueArgs = runQueue.calls.mostRecent().args[0]; @@ -182,7 +182,7 @@ describe('Runner', function() { userContext: { for: 'suite' }, onException: jasmine.any(Function), onMultipleDone: null, - SkipPolicy: jasmineUnderTest.SkipAfterBeforeAllErrorPolicy + SkipPolicy: privateUnderTest.SkipAfterBeforeAllErrorPolicy }); runQueue.calls.mostRecent().args[0].queueableFns[0].fn('foo'); @@ -266,7 +266,7 @@ describe('Runner', function() { queueableFns[1].fn('foo'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec, 'foo'); await expectAsync(promise).toBePending(); @@ -362,16 +362,16 @@ describe('Runner', function() { queueableFns[0].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).not.toHaveBeenCalledWith(specs[0], jasmine.anything()); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(specs[1], 'done'); queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(specs[0], 'done'); await expectAsync(promise).toBePending(); @@ -390,16 +390,16 @@ describe('Runner', function() { queueableFns[0].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).not.toHaveBeenCalledWith(nonSpecified, jasmine.anything()); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(specified, 'done'); queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(nonSpecified, 'done'); await expectAsync(promise).toBePending(); @@ -424,12 +424,12 @@ describe('Runner', function() { const nodeQueueableFns = runQueue.calls.mostRecent().args[0].queueableFns; nodeQueueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(nonSpecifiedSpec, 'done'); queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(specifiedSpec, 'done'); await expectAsync(promise).toBePending(); @@ -451,7 +451,7 @@ describe('Runner', function() { queueableFns[0].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec1, 'done'); queueableFns[1].fn(); @@ -459,12 +459,12 @@ describe('Runner', function() { expect(childFns.length).toBe(3); childFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec2, 'done'); childFns[2].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec3, 'done'); await expectAsync(promise).toBePending(); @@ -496,12 +496,12 @@ describe('Runner', function() { expect(runQueue.calls.mostRecent().args[0].queueableFns.length).toBe(2); runQueue.calls.mostRecent().args[0].queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec1, 'done'); queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec4, 'done'); queueableFns[2].fn(); @@ -509,12 +509,12 @@ describe('Runner', function() { expect(runQueue.calls.mostRecent().args[0].queueableFns.length).toBe(2); runQueue.calls.mostRecent().args[0].queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec2, 'done'); queueableFns[3].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec5, 'done'); queueableFns[4].fn(); @@ -522,7 +522,7 @@ describe('Runner', function() { expect(runQueue.calls.mostRecent().args[0].queueableFns.length).toBe(2); runQueue.calls.mostRecent().args[0].queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec3, 'done'); await expectAsync(promise).toBePending(); @@ -561,12 +561,12 @@ describe('Runner', function() { runQueue.calls.mostRecent().args[0].queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec1, 'done'); queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec4, 'done'); queueableFns[2].fn(); @@ -578,12 +578,12 @@ describe('Runner', function() { runQueue.calls.mostRecent().args[0].queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec2, 'done'); queueableFns[3].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec5, 'done'); queueableFns[4].fn(); @@ -595,7 +595,7 @@ describe('Runner', function() { runQueue.calls.mostRecent().args[0].queueableFns[1].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(spec3, 'done'); await expectAsync(promise).toBePending(); @@ -620,7 +620,7 @@ describe('Runner', function() { for (let i = 0; i < 11; i++) { queueableFns[i].fn('done'); expect( - jasmineUnderTest.TreeRunner.prototype._executeSpec + privateUnderTest.TreeRunner.prototype._executeSpec ).toHaveBeenCalledWith(specs[i], 'done'); } diff --git a/spec/core/SkipAfterBeforeAllErrorPolicySpec.js b/spec/core/SkipAfterBeforeAllErrorPolicySpec.js index 455f4381..c4b8f37f 100644 --- a/spec/core/SkipAfterBeforeAllErrorPolicySpec.js +++ b/spec/core/SkipAfterBeforeAllErrorPolicySpec.js @@ -2,7 +2,7 @@ describe('SkipAfterBeforeAllErrorPolicy', function() { describe('#skipTo', function() { describe('When nothing has errored', function() { it('does not skip anything', function() { - const policy = new jasmineUnderTest.SkipAfterBeforeAllErrorPolicy( + const policy = new privateUnderTest.SkipAfterBeforeAllErrorPolicy( arrayOfArbitraryFns(4) ); @@ -15,7 +15,7 @@ describe('SkipAfterBeforeAllErrorPolicy', function() { describe('When anything but a beforeAll has errored', function() { it('does not skip anything', function() { - const policy = new jasmineUnderTest.SkipAfterBeforeAllErrorPolicy( + const policy = new privateUnderTest.SkipAfterBeforeAllErrorPolicy( arrayOfArbitraryFns(4) ); @@ -40,7 +40,7 @@ describe('SkipAfterBeforeAllErrorPolicy', function() { { type: 'afterAll', fn: () => {} }, { type: 'afterAll', fn: () => {} } ]; - const policy = new jasmineUnderTest.SkipAfterBeforeAllErrorPolicy(fns); + const policy = new privateUnderTest.SkipAfterBeforeAllErrorPolicy(fns); policy.fnErrored(0); expect(policy.skipTo(0)).toEqual(3); @@ -54,7 +54,7 @@ describe('SkipAfterBeforeAllErrorPolicy', function() { it("sets the suite's hadBeforeAllFailure property to true", function() { const suite = {}; const fns = [{ type: 'beforeAll', fn: () => {}, suite }]; - const policy = new jasmineUnderTest.SkipAfterBeforeAllErrorPolicy(fns); + const policy = new privateUnderTest.SkipAfterBeforeAllErrorPolicy(fns); policy.fnErrored(0); @@ -65,7 +65,7 @@ describe('SkipAfterBeforeAllErrorPolicy', function() { describe('When the fn is not a beforeAll', function() { it('does not try to access the suite, which is probably not there', function() { const fns = [{ fn: () => {} /* no suite */ }]; - const policy = new jasmineUnderTest.SkipAfterBeforeAllErrorPolicy(fns); + const policy = new privateUnderTest.SkipAfterBeforeAllErrorPolicy(fns); expect(() => policy.fnErrored(0)).not.toThrow(); }); diff --git a/spec/core/SpecSpec.js b/spec/core/SpecSpec.js index 18769efa..13bcddf7 100644 --- a/spec/core/SpecSpec.js +++ b/spec/core/SpecSpec.js @@ -1,24 +1,24 @@ describe('Spec', function() { it('#isPendingSpecException returns true for a pending spec exception', function() { - const e = new Error(jasmineUnderTest.Spec.pendingSpecExceptionMessage); + const e = new Error(privateUnderTest.Spec.pendingSpecExceptionMessage); - expect(jasmineUnderTest.Spec.isPendingSpecException(e)).toBe(true); + expect(privateUnderTest.Spec.isPendingSpecException(e)).toBe(true); }); it('#isPendingSpecException returns true for a pending spec exception (even when FF bug is present)', function() { const fakeError = { toString: function() { - return 'Error: ' + jasmineUnderTest.Spec.pendingSpecExceptionMessage; + return 'Error: ' + privateUnderTest.Spec.pendingSpecExceptionMessage; } }; - expect(jasmineUnderTest.Spec.isPendingSpecException(fakeError)).toBe(true); + expect(privateUnderTest.Spec.isPendingSpecException(fakeError)).toBe(true); }); it('#isPendingSpecException returns true for a pending spec exception with a custom message', function() { expect( - jasmineUnderTest.Spec.isPendingSpecException( - jasmineUnderTest.Spec.pendingSpecExceptionMessage + 'foo' + privateUnderTest.Spec.isPendingSpecException( + privateUnderTest.Spec.pendingSpecExceptionMessage + 'foo' ) ).toBe(true); }); @@ -26,16 +26,16 @@ describe('Spec', function() { it('#isPendingSpecException returns false for not a pending spec exception', function() { const e = new Error('foo'); - expect(jasmineUnderTest.Spec.isPendingSpecException(e)).toBe(false); + expect(privateUnderTest.Spec.isPendingSpecException(e)).toBe(false); }); it("#isPendingSpecException returns false for thrown values that don't have toString", function() { - expect(jasmineUnderTest.Spec.isPendingSpecException(void 0)).toBe(false); + expect(privateUnderTest.Spec.isPendingSpecException(void 0)).toBe(false); }); describe('#executionFinished', function() { it('removes the fn if autoCleanClosures is true', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} }, autoCleanClosures: true }); @@ -45,7 +45,7 @@ describe('Spec', function() { }); it('removes the fn after execution if autoCleanClosures is undefined', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} }, autoCleanClosures: undefined }); @@ -56,7 +56,7 @@ describe('Spec', function() { it('does not remove the fn after execution if autoCleanClosures is false', function() { function originalFn() {} - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: originalFn }, autoCleanClosures: false }); @@ -68,7 +68,7 @@ describe('Spec', function() { describe('#getSpecProperty', function() { it('get the property value', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -79,7 +79,7 @@ describe('Spec', function() { describe('#setSpecProperty', function() { it('adds the property to the result', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -89,7 +89,7 @@ describe('Spec', function() { }); it('replace the property result when it was previously set', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -104,7 +104,7 @@ describe('Spec', function() { }); it('throws if the key is not structured-cloneable', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -114,7 +114,7 @@ describe('Spec', function() { }); it('throws if the value is not structured-cloneable', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -126,14 +126,14 @@ describe('Spec', function() { describe('status', function() { it('is "passed" by default', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); expect(spec.getResult().status).toBe('passed'); }); it('is "passed" if all expectations passed', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -143,7 +143,7 @@ describe('Spec', function() { }); it('is "failed" if any expectation failed', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -156,7 +156,7 @@ describe('Spec', function() { it('is "pending" if created without a function body', function() { const startCallback = jasmine.createSpy('startCallback'), resultCallback = jasmine.createSpy('resultCallback'), - spec = new jasmineUnderTest.Spec({ + spec = new privateUnderTest.Spec({ onStart: startCallback, queueableFn: { fn: null }, resultCallback: resultCallback @@ -168,7 +168,7 @@ describe('Spec', function() { describe('#addExpectationResult', function() { it('keeps track of passed and failed expectations', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -185,7 +185,7 @@ describe('Spec', function() { describe("when 'throwOnExpectationFailure' is set", function() { it('throws an ExpectationFailed error', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} }, throwOnExpectationFailure: true }); @@ -193,7 +193,7 @@ describe('Spec', function() { spec.addExpectationResult(true, { message: 'passed' }); expect(function() { spec.addExpectationResult(false, { message: 'failed' }); - }).toThrowError(jasmineUnderTest.errors.ExpectationFailed); + }).toThrowError(jasmineUnderTest.private.errors.ExpectationFailed); expect(spec.result.failedExpectations).toEqual([ jasmine.objectContaining({ message: 'failed' }) @@ -203,7 +203,7 @@ describe('Spec', function() { describe("when 'throwOnExpectationFailure' is not set", function() { it('does not throw', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -218,7 +218,7 @@ describe('Spec', function() { it('forwards late expectation failures to onLateError', function() { const onLateError = jasmine.createSpy('onLateError'); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ onLateError, queueableFn: { fn: function() {} } }); @@ -243,7 +243,7 @@ describe('Spec', function() { it('does not forward non-late expectation failures to onLateError', function() { const onLateError = jasmine.createSpy('onLateError'); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ onLateError, queueableFn: { fn: function() {} } }); @@ -262,7 +262,7 @@ describe('Spec', function() { it('forwards late handleException calls to onLateError', function() { const onLateError = jasmine.createSpy('onLateError'); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ onLateError, queueableFn: { fn: function() {} } }); @@ -280,7 +280,7 @@ describe('Spec', function() { it('does not forward non-late handleException calls to onLateError', function() { const onLateError = jasmine.createSpy('onLateError'); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ onLateError, queueableFn: { fn: function() {} } }); @@ -293,7 +293,7 @@ describe('Spec', function() { }); it('clears the reportedDone flag when reset', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: function() {} } }); spec.reportedDone = true; @@ -305,7 +305,7 @@ describe('Spec', function() { it('does not throw an ExpectationFailed error when handling an error', function() { const resultCallback = jasmine.createSpy('resultCallback'), - spec = new jasmineUnderTest.Spec({ + spec = new privateUnderTest.Spec({ queueableFn: { fn: function() {} }, resultCallback: resultCallback, throwOnExpectationFailure: true @@ -319,7 +319,7 @@ describe('Spec', function() { .createSpy('getPath') .and.returnValue(['expected', 'val']); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ getPath, queueableFn: { fn: null } }); @@ -333,7 +333,7 @@ describe('Spec', function() { .createSpy('getPath') .and.returnValue(['expected val']); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ getPath, queueableFn: { fn: null } }); @@ -346,7 +346,7 @@ describe('Spec', function() { describe('#handleException', function() { it('records a failure', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: {} }); @@ -364,11 +364,13 @@ describe('Spec', function() { }); it('does not record an additional failure when the error is ExpectationFailed', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: {} }); - spec.handleException(new jasmineUnderTest.errors.ExpectationFailed()); + spec.handleException( + new jasmineUnderTest.private.errors.ExpectationFailed() + ); expect(spec.result.failedExpectations).toEqual([]); }); @@ -377,7 +379,7 @@ describe('Spec', function() { describe('#debugLog', function() { it('adds the messages to the result', function() { const timer = jasmine.createSpyObj('timer', ['start', 'elapsed']); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} }, timer: timer }); @@ -400,7 +402,7 @@ describe('Spec', function() { describe('When the spec passes', function() { it('removes the logs from the result', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -414,7 +416,7 @@ describe('Spec', function() { describe('When the spec fails', function() { it('includes the messages in the result', function() { const timer = jasmine.createSpyObj('timer', ['start', 'elapsed']); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} }, timer: timer }); @@ -435,7 +437,7 @@ describe('Spec', function() { describe('#startedEvent', function() { it('includes only properties that are known before execution', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ id: 'spec1', parentSuiteId: 'suite1', description: 'a spec', @@ -464,7 +466,7 @@ describe('Spec', function() { return 123; } }; - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ id: 'spec1', parentSuiteId: 'suite1', description: 'a spec', @@ -514,7 +516,7 @@ describe('Spec', function() { return 123; } }; - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ id: 'spec1', parentSuiteId: 'suite1', description: 'a spec', @@ -571,7 +573,7 @@ describe('Spec', function() { }); it("reports a status of 'pending' for a declaratively pended spec", function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: {} }); @@ -583,7 +585,7 @@ describe('Spec', function() { }); it("reports a status of 'pending' for a spec pended by #pend", function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -596,7 +598,7 @@ describe('Spec', function() { }); it("reports a status of 'excluded' for an excluded spec", function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -607,7 +609,7 @@ describe('Spec', function() { describe('When failSpecWithNoExpectations is true', function() { it("reports a status of 'failed' for a spec with no expectations", function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -618,7 +620,7 @@ describe('Spec', function() { }); it('includes deprecation warnings', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); @@ -643,7 +645,7 @@ describe('Spec', function() { return 123; } }; - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ timer, queueableFn: { fn: () => {} } }); @@ -659,7 +661,7 @@ describe('Spec', function() { }); it('includes spec properties', function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn: () => {} } }); diff --git a/spec/core/SpyRegistrySpec.js b/spec/core/SpyRegistrySpec.js index 74ba4a2d..1d5f772b 100644 --- a/spec/core/SpyRegistrySpec.js +++ b/spec/core/SpyRegistrySpec.js @@ -1,11 +1,11 @@ describe('SpyRegistry', function() { function createSpy(name, originalFn) { - return jasmineUnderTest.Spy(name, originalFn); + return privateUnderTest.Spy(name, originalFn); } describe('#spyOn', function() { it('checks for the existence of the object', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: createSpy }); expect(function() { @@ -14,7 +14,7 @@ describe('SpyRegistry', function() { }); it('checks that a method name was passed', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(), + const spyRegistry = new privateUnderTest.SpyRegistry(), target = {}; expect(function() { @@ -23,14 +23,14 @@ describe('SpyRegistry', function() { }); it('checks that the object is not `null`', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(); + const spyRegistry = new privateUnderTest.SpyRegistry(); expect(function() { spyRegistry.spyOn(null, 'pants'); }).toThrowError(/could not find an object/); }); it('checks that the method name is not `null`', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(), + const spyRegistry = new privateUnderTest.SpyRegistry(), target = {}; expect(function() { @@ -39,7 +39,7 @@ describe('SpyRegistry', function() { }); it('checks for the existence of the method', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(), + const spyRegistry = new privateUnderTest.SpyRegistry(), target = {}; expect(function() { @@ -49,7 +49,7 @@ describe('SpyRegistry', function() { it('checks if it has already been spied upon', function() { const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, @@ -78,7 +78,7 @@ describe('SpyRegistry', function() { }); const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; } @@ -108,7 +108,7 @@ describe('SpyRegistry', function() { set() {} }); - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: createSpy }); expect(function() { @@ -120,7 +120,7 @@ describe('SpyRegistry', function() { it('overrides the method on the object and returns the spy', function() { let originalFunctionWasCalled = false; - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: createSpy }); const target = { @@ -137,11 +137,11 @@ describe('SpyRegistry', function() { }); it('throws if the method is a mock clock method', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: createSpy }); const target = { spiedFunc: function() {} }; - target.spiedFunc[jasmineUnderTest.Clock.IsMockClockTimingFn] = true; + target.spiedFunc[privateUnderTest.Clock.IsMockClockTimingFn] = true; expect(function() { spyRegistry.spyOn(target, 'spiedFunc'); @@ -151,14 +151,14 @@ describe('SpyRegistry', function() { describe('#spyOnProperty', function() { it('checks for the existence of the object', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(); + const spyRegistry = new privateUnderTest.SpyRegistry(); expect(function() { spyRegistry.spyOnProperty(void 0, 'pants'); }).toThrowError(/could not find an object/); }); it('checks that a property name was passed', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(), + const spyRegistry = new privateUnderTest.SpyRegistry(), target = {}; expect(function() { @@ -167,7 +167,7 @@ describe('SpyRegistry', function() { }); it('checks for the existence of the method', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(), + const spyRegistry = new privateUnderTest.SpyRegistry(), target = {}; expect(function() { @@ -176,7 +176,7 @@ describe('SpyRegistry', function() { }); it('checks for the existence of access type', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(), + const spyRegistry = new privateUnderTest.SpyRegistry(), target = {}; Object.defineProperty(target, 'pants', { @@ -203,7 +203,7 @@ describe('SpyRegistry', function() { configurable: true }); - const spyRegistry = new jasmineUnderTest.SpyRegistry(); + const spyRegistry = new privateUnderTest.SpyRegistry(); expect(function() { spyRegistry.spyOnProperty(target, 'myProp'); @@ -215,7 +215,7 @@ describe('SpyRegistry', function() { }); it('overrides the property getter on the object and returns the spy', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: createSpy }), target = {}, @@ -239,7 +239,7 @@ describe('SpyRegistry', function() { }); it('overrides the property setter on the object and returns the spy', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: createSpy }), target = {}, @@ -263,7 +263,7 @@ describe('SpyRegistry', function() { describe('when the property is already spied upon', function() { it('throws an error if respy is not allowed', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: createSpy }), target = {}; @@ -283,7 +283,7 @@ describe('SpyRegistry', function() { }); it('returns the original spy if respy is allowed', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: createSpy }), target = {}; @@ -308,14 +308,14 @@ describe('SpyRegistry', function() { describe('#spyOnAllFunctions', function() { it('checks for the existence of the object', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry(); + const spyRegistry = new privateUnderTest.SpyRegistry(); expect(function() { spyRegistry.spyOnAllFunctions(void 0); }).toThrowError(/spyOnAllFunctions could not find an object to spy upon/); }); it('overrides all writable and configurable functions of the object and its parents', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -405,7 +405,7 @@ describe('SpyRegistry', function() { }); it('overrides prototype methods on the object', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -428,7 +428,7 @@ describe('SpyRegistry', function() { }); it('does not override non-enumerable properties (like Object.prototype methods)', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -445,7 +445,7 @@ describe('SpyRegistry', function() { }); describe('when includeNonEnumerable is true', function() { it('does not override Object.prototype methods', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -462,7 +462,7 @@ describe('SpyRegistry', function() { }); it('overrides non-enumerable properties', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -485,7 +485,7 @@ describe('SpyRegistry', function() { }); it('should not spy on non-enumerable functions named constructor', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -506,7 +506,7 @@ describe('SpyRegistry', function() { }); it('should spy on enumerable functions named constructor', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -521,7 +521,7 @@ describe('SpyRegistry', function() { }); it('should not throw an exception if we try and access strict mode restricted properties', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -535,7 +535,7 @@ describe('SpyRegistry', function() { }); it('should not spy on properties which are more permissable further up the prototype chain', function() { - const spyRegistry = new jasmineUnderTest.SpyRegistry({ + const spyRegistry = new privateUnderTest.SpyRegistry({ createSpy: function() { return 'I am a spy'; } @@ -565,7 +565,7 @@ describe('SpyRegistry', function() { describe('#clearSpies', function() { it('restores the original functions on the spied-upon objects', function() { const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, @@ -582,7 +582,7 @@ describe('SpyRegistry', function() { it('restores the original functions, even when that spy has been replace and re-spied upon', function() { const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, @@ -606,7 +606,7 @@ describe('SpyRegistry', function() { it("does not add a property that the spied-upon object didn't originally have", function() { const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, @@ -628,7 +628,7 @@ describe('SpyRegistry', function() { it("restores the original function when it's inherited and cannot be deleted", function() { const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, @@ -657,7 +657,7 @@ describe('SpyRegistry', function() { const spies = [], global = new FakeWindow(), - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, @@ -675,7 +675,7 @@ describe('SpyRegistry', function() { describe('spying on properties', function() { it('restores the original properties on the spied-upon objects', function() { const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, @@ -699,7 +699,7 @@ describe('SpyRegistry', function() { it("does not add a property that the spied-upon object didn't originally have", function() { const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, diff --git a/spec/core/SpySpec.js b/spec/core/SpySpec.js index d880d290..0280a658 100644 --- a/spec/core/SpySpec.js +++ b/spec/core/SpySpec.js @@ -2,7 +2,7 @@ describe('Spies', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { @@ -50,8 +50,8 @@ describe('Spies', function() { TestClass.prototype.someFunction ); - expect(spy.and).toEqual(jasmine.any(jasmineUnderTest.SpyStrategy)); - expect(spy.calls).toEqual(jasmine.any(jasmineUnderTest.CallTracker)); + expect(spy.and).toEqual(jasmine.any(privateUnderTest.SpyStrategy)); + expect(spy.calls).toEqual(jasmine.any(privateUnderTest.CallTracker)); }); it('tracks the argument of calls', function() { @@ -241,7 +241,7 @@ describe('Spies', function() { }); it('uses the provided matchersUtil selecting a strategy', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ + const matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [ function(a, b) { if ((a === 'bar' && b === 'baz') || (a === 'baz' && b === 'bar')) { @@ -250,7 +250,7 @@ describe('Spies', function() { } ] }); - const spy = new jasmineUnderTest.Spy('aSpy', matchersUtil); + const spy = new privateUnderTest.Spy('aSpy', matchersUtil); spy.and.returnValue('default strategy return value'); spy.withArgs('bar').and.returnValue('custom strategy return value'); expect(spy('foo')).toEqual('default strategy return value'); diff --git a/spec/core/SpyStrategySpec.js b/spec/core/SpyStrategySpec.js index a6492018..57c35e9d 100644 --- a/spec/core/SpyStrategySpec.js +++ b/spec/core/SpyStrategySpec.js @@ -1,19 +1,19 @@ describe('SpyStrategy', function() { it('defaults its name to unknown', function() { - const spyStrategy = new jasmineUnderTest.SpyStrategy(); + const spyStrategy = new privateUnderTest.SpyStrategy(); expect(spyStrategy.identity).toEqual('unknown'); }); it('takes a name', function() { - const spyStrategy = new jasmineUnderTest.SpyStrategy({ name: 'foo' }); + const spyStrategy = new privateUnderTest.SpyStrategy({ name: 'foo' }); expect(spyStrategy.identity).toEqual('foo'); }); it('stubs an original function, if provided', function() { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.exec(); @@ -22,7 +22,7 @@ describe('SpyStrategy', function() { it("allows an original function to be called, passed through the params and returns it's value", function() { const originalFn = jasmine.createSpy('original').and.returnValue(42), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.callThrough(); const returnValue = spyStrategy.exec(null, ['foo']); @@ -34,7 +34,7 @@ describe('SpyStrategy', function() { it('can return a specified value when executed', function() { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.returnValue(17); const returnValue = spyStrategy.exec(); @@ -45,7 +45,7 @@ describe('SpyStrategy', function() { it('can return specified values in order specified when executed', function() { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.returnValues('value1', 'value2', 'value3'); @@ -58,7 +58,7 @@ describe('SpyStrategy', function() { it('allows an exception to be thrown when executed', function() { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.throwError(new TypeError('bar')); @@ -70,7 +70,7 @@ describe('SpyStrategy', function() { it('allows a string to be thrown, wrapping it into an exception when executed', function() { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.throwError('bar'); @@ -82,7 +82,7 @@ describe('SpyStrategy', function() { it('allows a non-Error to be thrown when executed', function() { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.throwError({ code: 'ESRCH' }); @@ -95,7 +95,7 @@ describe('SpyStrategy', function() { it('allows a fake function to be called instead', function() { const originalFn = jasmine.createSpy('original'), fakeFn = jasmine.createSpy('fake').and.returnValue(67), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.callFake(fakeFn); const returnValue = spyStrategy.exec(); @@ -109,7 +109,7 @@ describe('SpyStrategy', function() { fakeFn = jasmine.createSpy('fake').and.callFake(async () => { return 67; }), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.callFake(fakeFn); spyStrategy @@ -128,7 +128,7 @@ describe('SpyStrategy', function() { describe('#resolveTo', function() { it('allows a resolved promise to be returned', function(done) { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); @@ -144,7 +144,7 @@ describe('SpyStrategy', function() { it('allows an empty resolved promise to be returned', function(done) { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); @@ -162,7 +162,7 @@ describe('SpyStrategy', function() { describe('#rejectWith', function() { it('allows a rejected promise to be returned', function(done) { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); @@ -179,7 +179,7 @@ describe('SpyStrategy', function() { it('allows an empty rejected promise to be returned', function(done) { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); @@ -196,7 +196,7 @@ describe('SpyStrategy', function() { it('allows a non-Error to be rejected', function(done) { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); @@ -220,7 +220,7 @@ describe('SpyStrategy', function() { .createSpy('custom strategy') .and.returnValue(plan), originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn, customStrategies: { doSomething: customStrategy @@ -237,7 +237,7 @@ describe('SpyStrategy', function() { it("throws an error if a custom strategy doesn't return a function", function() { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn, customStrategies: { doSomething: function() { @@ -252,37 +252,32 @@ describe('SpyStrategy', function() { }); it('does not allow custom strategies to overwrite existing methods', function() { - const spyStrategy = new jasmineUnderTest.SpyStrategy({ + const spyStrategy = new privateUnderTest.SpyStrategy({ fn: function() {}, customStrategies: { exec: function() {} } }); - expect(spyStrategy.exec).toBe(jasmineUnderTest.SpyStrategy.prototype.exec); + expect(spyStrategy.exec).toBe(privateUnderTest.SpyStrategy.prototype.exec); }); it('throws an error when a non-function is passed to callFake strategy', function() { const originalFn = jasmine.createSpy('original'), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); - - spyOn(jasmineUnderTest, 'isFunction_').and.returnValue(false); - spyOn(jasmineUnderTest, 'isAsyncFunction_').and.returnValue(false); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); expect(function() { - spyStrategy.callFake(function() {}); - }).toThrowError(/^Argument passed to callFake should be a function, got/); - - expect(function() { - spyStrategy.callFake(function() {}); - }).toThrowError(/^Argument passed to callFake should be a function, got/); + spyStrategy.callFake('not a function'); + }).toThrowError( + 'Argument passed to callFake should be a function, got not a function' + ); }); it('allows generator functions to be passed to callFake strategy', function() { const generator = function*() { yield 'ok'; }, - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: function() {} }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: function() {} }); spyStrategy.callFake(generator); @@ -292,7 +287,7 @@ describe('SpyStrategy', function() { it('allows a return to plan stubbing after another strategy', function() { const originalFn = jasmine.createSpy('original'), fakeFn = jasmine.createSpy('fake').and.returnValue(67), - spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ fn: originalFn }); spyStrategy.callFake(fakeFn); let returnValue = spyStrategy.exec(); @@ -309,7 +304,7 @@ describe('SpyStrategy', function() { it('returns the spy after changing the strategy', function() { const spy = {}, spyFn = jasmine.createSpy('spyFn').and.returnValue(spy), - spyStrategy = new jasmineUnderTest.SpyStrategy({ getSpy: spyFn }); + spyStrategy = new privateUnderTest.SpyStrategy({ getSpy: spyFn }); expect(spyStrategy.callThrough()).toBe(spy); expect(spyStrategy.returnValue()).toBe(spy); diff --git a/spec/core/StackTraceSpec.js b/spec/core/StackTraceSpec.js index 2f94799d..0248b5f3 100644 --- a/spec/core/StackTraceSpec.js +++ b/spec/core/StackTraceSpec.js @@ -8,7 +8,7 @@ describe('StackTrace', function() { ' at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.message).toEqual('Error: nope'); expect(result.style).toEqual('v8'); @@ -39,7 +39,7 @@ describe('StackTrace', function() { ' at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.message).toEqual('Error: line 1\nline 2'); const rawFrames = result.frames.map(function(f) { @@ -60,7 +60,7 @@ describe('StackTrace', function() { ' at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.message).toEqual('Error: line 1\n\nline 2'); const rawFrames = result.frames.map(function(f) { @@ -82,7 +82,7 @@ describe('StackTrace', function() { ' at Immediate. (/somewhere/jasmine/lib/jasmine-core/jasmine.js:4314:12)\n' + ' at runCallback (timers.js:672:20)' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.message).toEqual('Error'); expect(result.style).toEqual('v8'); @@ -123,7 +123,7 @@ describe('StackTrace', function() { 'http://localhost:8888/__spec__/core/UtilSpec.js:115:28\n' + 'run@http://localhost:8888/__jasmine__/jasmine.js:4320:27' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.message).toBeFalsy(); expect(result.style).toEqual('webkit'); @@ -150,7 +150,7 @@ describe('StackTrace', function() { '@http://localhost:8888/__spec__/core/FooSpec.js:164:24\n' + 'attempt@http://localhost:8888/__jasmine__/jasmine.js:8074:44\n' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.message).toBeFalsy(); expect(result.style).toEqual('webkit'); @@ -175,7 +175,7 @@ describe('StackTrace', function() { message: 'nope', stack: 'randomcharsnotincludingwhitespace' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.style).toBeNull(); expect(result.frames).toEqual([{ raw: error.stack }]); }); @@ -187,7 +187,7 @@ describe('StackTrace', function() { ' at UserContext. (http://localhost:8888/__spec__/core/UtilSpec.js:115:19)\n' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.frames).toEqual([ { @@ -209,7 +209,7 @@ describe('StackTrace', function() { ' at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.style).toEqual('v8'); expect(result.frames).toEqual([ { @@ -241,7 +241,7 @@ describe('StackTrace', function() { ' at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)' }; - const result = new jasmineUnderTest.StackTrace(error); + const result = new privateUnderTest.StackTrace(error); expect(result.message).toEqual('TypeError: nope'); expect(result.frames).toEqual([ @@ -269,7 +269,7 @@ describe('StackTrace', function() { ' at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)' }; - const result_no_error = new jasmineUnderTest.StackTrace(no_error); + const result_no_error = new privateUnderTest.StackTrace(no_error); expect(result_no_error.message).not.toEqual(jasmine.anything()); }); diff --git a/spec/core/SuiteBuilderSpec.js b/spec/core/SuiteBuilderSpec.js index 0f03579c..613144ef 100644 --- a/spec/core/SuiteBuilderSpec.js +++ b/spec/core/SuiteBuilderSpec.js @@ -1,12 +1,12 @@ describe('SuiteBuilder', function() { beforeEach(function() { // Rethrow exceptions to ease debugging - spyOn(jasmineUnderTest.Suite.prototype, 'handleException').and.callFake( + spyOn(privateUnderTest.Suite.prototype, 'handleException').and.callFake( function(e) { throw e; } ); - spyOn(jasmineUnderTest.Spec.prototype, 'handleException').and.callFake( + spyOn(privateUnderTest.Spec.prototype, 'handleException').and.callFake( function(e) { throw e; } @@ -15,9 +15,9 @@ describe('SuiteBuilder', function() { it('creates the top suite', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); - expect(suiteBuilder.topSuite).toBeInstanceOf(jasmineUnderTest.Suite); + expect(suiteBuilder.topSuite).toBeInstanceOf(privateUnderTest.Suite); expect(suiteBuilder.topSuite.description).toEqual( 'Jasmine__TopLevel__Suite' ); @@ -33,7 +33,7 @@ describe('SuiteBuilder', function() { it('focuses the suite', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); const suite = suiteBuilder.fdescribe('a suite', function() { suiteBuilder.it('a spec'); @@ -45,7 +45,7 @@ describe('SuiteBuilder', function() { it('unfocuses any focused ancestor suite', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); const grandparent = suiteBuilder.fdescribe('a suite', function() { suiteBuilder.describe('another suite', function() { @@ -64,7 +64,7 @@ describe('SuiteBuilder', function() { it('excludes the suite', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); const suite = suiteBuilder.xdescribe('a suite', function() { suiteBuilder.it('a spec'); @@ -75,7 +75,7 @@ describe('SuiteBuilder', function() { it('causes child suites to be marked excluded', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); let suite; suiteBuilder.xdescribe('a suite', function() { @@ -103,7 +103,7 @@ describe('SuiteBuilder', function() { function definesSuites(fnName) { it('links suites to their parents and children', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); let child; const parent = suiteBuilder[fnName]('parent', function() { @@ -120,7 +120,7 @@ describe('SuiteBuilder', function() { it('gives each suite a unique ID', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); let child; const parent = suiteBuilder[fnName]('parent', function() { @@ -142,7 +142,7 @@ describe('SuiteBuilder', function() { function definesSpecs(fnName) { it('adds the spec to its suite', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); let spec; const suite = suiteBuilder.describe('a suite', function() { @@ -154,7 +154,7 @@ describe('SuiteBuilder', function() { it('gives each spec a unique ID', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); const spec1 = suiteBuilder[fnName]('a spec', function() {}); const spec2 = suiteBuilder[fnName]('another spec', function() {}); @@ -166,7 +166,7 @@ describe('SuiteBuilder', function() { it('gives each spec a full path', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); let spec; suiteBuilder.describe('a suite', function() { @@ -199,7 +199,7 @@ describe('SuiteBuilder', function() { }); it('forbids duplicate spec names', function() { - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); expect(function() { suiteBuilder.describe('a suite', function() { @@ -214,7 +214,7 @@ describe('SuiteBuilder', function() { }); it('forbids duplicate spec names in the top suite', function() { - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); expect(function() { suiteBuilder.it('another spec'); @@ -225,7 +225,7 @@ describe('SuiteBuilder', function() { }); it('forbids duplicate suite names', function() { - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); expect(function() { suiteBuilder.describe('a suite', function() { @@ -244,7 +244,7 @@ describe('SuiteBuilder', function() { }); it('forbids duplicate suite names in the top suite', function() { - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); expect(function() { suiteBuilder.describe('a suite', function() { @@ -257,7 +257,7 @@ describe('SuiteBuilder', function() { }); it('allows spec and suite names to be duplicated in different suites', function() { - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); expect(function() { suiteBuilder.describe('suite a', function() { @@ -285,7 +285,7 @@ describe('SuiteBuilder', function() { }); it('allows duplicate spec and suite names', function() { - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); expect(function() { suiteBuilder.describe('dupe suite', function() { @@ -303,10 +303,10 @@ describe('SuiteBuilder', function() { describe('#parallelReset', function() { it('resets the top suite result', function() { - jasmineUnderTest.Suite.prototype.handleException.and.callThrough(); + privateUnderTest.Suite.prototype.handleException.and.callThrough(); const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); suiteBuilder.topSuite.handleException(new Error('nope')); suiteBuilder.parallelReset(); @@ -326,7 +326,7 @@ describe('SuiteBuilder', function() { it('removes children of the top suite', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); suiteBuilder.describe('a suite', function() { suiteBuilder.it('a nested spec'); }); @@ -339,7 +339,7 @@ describe('SuiteBuilder', function() { it('preserves top suite befores and afters', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); function beforeAll() {} function beforeEach() {} @@ -369,7 +369,7 @@ describe('SuiteBuilder', function() { it('resets totalSpecsDefined', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); suiteBuilder.it('a spec'); suiteBuilder.parallelReset(); @@ -379,7 +379,7 @@ describe('SuiteBuilder', function() { it('resets focusedRunables', function() { const env = { configuration: () => ({}) }; - const suiteBuilder = new jasmineUnderTest.SuiteBuilder({ env }); + const suiteBuilder = new privateUnderTest.SuiteBuilder({ env }); suiteBuilder.fit('a spec', function() {}); suiteBuilder.parallelReset(); diff --git a/spec/core/SuiteSpec.js b/spec/core/SuiteSpec.js index e3961193..4a32fab1 100644 --- a/spec/core/SuiteSpec.js +++ b/spec/core/SuiteSpec.js @@ -2,7 +2,7 @@ describe('Suite', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { @@ -10,7 +10,7 @@ describe('Suite', function() { }); it('keeps its id', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ env: env, id: 456, description: 'I am a suite' @@ -20,7 +20,7 @@ describe('Suite', function() { }); it('returns blank full name for top level suite', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ env: env, description: 'I am a suite' }); @@ -29,12 +29,12 @@ describe('Suite', function() { }); it('returns its full name when it has parent suites', function() { - const parentSuite = new jasmineUnderTest.Suite({ + const parentSuite = new privateUnderTest.Suite({ env: env, description: 'I am a parent suite', parentSuite: jasmine.createSpy('pretend top level suite') }), - suite = new jasmineUnderTest.Suite({ + suite = new privateUnderTest.Suite({ env: env, description: 'I am a suite', parentSuite: parentSuite @@ -44,7 +44,7 @@ describe('Suite', function() { }); it('adds beforeEach functions in order of needed execution', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ env: env, description: 'I am a suite' }), @@ -61,7 +61,7 @@ describe('Suite', function() { }); it('adds beforeAll functions in order of needed execution', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ env: env, description: 'I am a suite' }), @@ -78,7 +78,7 @@ describe('Suite', function() { }); it('adds afterEach functions in order of needed execution', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ env: env, description: 'I am a suite' }), @@ -95,7 +95,7 @@ describe('Suite', function() { }); it('adds afterAll functions in order of needed execution', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ env: env, description: 'I am a suite' }), @@ -112,33 +112,33 @@ describe('Suite', function() { }); it('has a status of failed if any expectations have failed', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); suite.addExpectationResult(false, {}); expect(suite.getResult().status).toBe('failed'); }); it('retrieves a result with updated status', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); expect(suite.getResult().status).toBe('passed'); }); it('retrieves a result with pending status', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); suite.pend(); expect(suite.getResult().status).toBe('pending'); }); it('throws an ExpectationFailed when receiving a failed expectation when throwOnExpectationFailure is set', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ throwOnExpectationFailure: true }); expect(function() { suite.addExpectationResult(false, { message: 'failed' }); - }).toThrowError(jasmineUnderTest.errors.ExpectationFailed); + }).toThrowError(jasmineUnderTest.private.errors.ExpectationFailed); expect(suite.getResult().status).toBe('failed'); expect(suite.result.failedExpectations).toEqual([ @@ -147,16 +147,18 @@ describe('Suite', function() { }); it('does not add an additional failure when an expectation fails', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); - suite.handleException(new jasmineUnderTest.errors.ExpectationFailed()); + suite.handleException( + new jasmineUnderTest.private.errors.ExpectationFailed() + ); expect(suite.getResult().failedExpectations).toEqual([]); }); it('forwards late expectation failures to onLateError', function() { const onLateError = jasmine.createSpy('onLateError'); - const suite = new jasmineUnderTest.Suite({ onLateError }); + const suite = new privateUnderTest.Suite({ onLateError }); const data = { matcherName: '', passed: false, @@ -178,7 +180,7 @@ describe('Suite', function() { it('does not forward non-late expectation failures to onLateError', function() { const onLateError = jasmine.createSpy('onLateError'); - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ onLateError }); const data = { @@ -197,7 +199,7 @@ describe('Suite', function() { it('forwards late handleException calls to onLateError', function() { const onLateError = jasmine.createSpy('onLateError'); - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ onLateError }); const error = new Error('oops'); @@ -215,7 +217,7 @@ describe('Suite', function() { it('does not forward non-late handleException calls to onLateError', function() { const onLateError = jasmine.createSpy('onLateError'); - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ onLateError }); const error = new Error('oops'); @@ -227,7 +229,7 @@ describe('Suite', function() { }); it('clears the reportedDone flag when reset', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ queueableFn: { fn: function() {} } }); suite.reportedDone = true; @@ -238,7 +240,7 @@ describe('Suite', function() { }); it('calls timer to compute duration', function() { - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ env: env, id: 456, description: 'I am a suite', @@ -251,19 +253,19 @@ describe('Suite', function() { describe('#sharedUserContext', function() { beforeEach(function() { - this.suite = new jasmineUnderTest.Suite({}); + this.suite = new privateUnderTest.Suite({}); }); it('returns a UserContext', function() { expect(this.suite.sharedUserContext().constructor).toBe( - jasmineUnderTest.UserContext + privateUnderTest.UserContext ); }); }); describe('attr.autoCleanClosures', function() { function arrangeSuite(attrs) { - const suite = new jasmineUnderTest.Suite(attrs); + const suite = new privateUnderTest.Suite(attrs); suite.beforeAll(function() {}); suite.beforeEach(function() {}); suite.afterEach(function() {}); @@ -301,21 +303,21 @@ describe('Suite', function() { describe('#reset', function() { it('should reset the "pending" status', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); suite.pend(); suite.reset(); expect(suite.getResult().status).toBe('passed'); }); it('should not reset the "pending" status when the suite was excluded', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); suite.exclude(); suite.reset(); expect(suite.getResult().status).toBe('pending'); }); it('should also reset the children', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); const child1 = jasmine.createSpyObj(['reset']); const child2 = jasmine.createSpyObj(['reset']); suite.addChild(child1); @@ -328,7 +330,7 @@ describe('Suite', function() { }); it('should reset the failedExpectations', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); suite.handleException(new Error()); suite.reset(); @@ -342,7 +344,7 @@ describe('Suite', function() { describe('#onMultipleDone', function() { it('reports a special error when it is the top suite', function() { const onLateError = jasmine.createSpy('onLateError'); - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ onLateError, parentSuite: null }); @@ -359,7 +361,7 @@ describe('Suite', function() { it('reports an error including the suite name when it is a normal suite', function() { const onLateError = jasmine.createSpy('onLateError'); - const suite = new jasmineUnderTest.Suite({ + const suite = new privateUnderTest.Suite({ onLateError, description: 'the suite', parentSuite: { @@ -381,7 +383,7 @@ describe('Suite', function() { describe('#hasChildWithDescription', function() { it('returns true if there is a child with the given description', function() { - const subject = new jasmineUnderTest.Suite({}); + const subject = new privateUnderTest.Suite({}); const description = 'a spec'; subject.addChild({ description }); @@ -389,15 +391,15 @@ describe('Suite', function() { }); it('returns false if there is no child with the given description', function() { - const subject = new jasmineUnderTest.Suite({}); + const subject = new privateUnderTest.Suite({}); subject.addChild({ description: 'a different spec' }); expect(subject.hasChildWithDescription('a spec')).toBeFalse(); }); it('does not recurse into child suites', function() { - const subject = new jasmineUnderTest.Suite({}); - const childSuite = new jasmineUnderTest.Suite({}); + const subject = new privateUnderTest.Suite({}); + const childSuite = new privateUnderTest.Suite({}); subject.addChild(childSuite); const description = 'a spec'; childSuite.addChild(description); @@ -408,7 +410,7 @@ describe('Suite', function() { describe('#setSuiteProperty', function() { it('throws if the key is not structured-cloneable', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); expect(function() { suite.setSuiteProperty(new Promise(() => {}), ''); @@ -416,7 +418,7 @@ describe('Suite', function() { }); it('throws if the value is not structured-cloneable', function() { - const suite = new jasmineUnderTest.Suite({}); + const suite = new privateUnderTest.Suite({}); expect(function() { suite.setSuiteProperty('k', new Promise(() => {})); diff --git a/spec/core/TreeProcessorSpec.js b/spec/core/TreeProcessorSpec.js index dc89e515..ceabd5fc 100644 --- a/spec/core/TreeProcessorSpec.js +++ b/spec/core/TreeProcessorSpec.js @@ -28,7 +28,7 @@ describe('TreeProcessor', function() { it('processes a single leaf', function() { const leaf = new Leaf(), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: leaf, runnableIds: [leaf.id] }); @@ -40,7 +40,7 @@ describe('TreeProcessor', function() { it('processes a single pending leaf', function() { const leaf = new Leaf({ markedPending: true }), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: leaf, runnableIds: [leaf.id] }); @@ -52,7 +52,7 @@ describe('TreeProcessor', function() { it('processes a single non-specified leaf', function() { const leaf = new Leaf(), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: leaf, runnableIds: [] }); @@ -64,7 +64,7 @@ describe('TreeProcessor', function() { it('processes a single excluded leaf', function() { const leaf = new Leaf(), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: leaf, runnableIds: [leaf.id], excludeNode: function() { @@ -80,7 +80,7 @@ describe('TreeProcessor', function() { it('processes a tree with a single leaf with the root specified', function() { const leaf = new Leaf(), parent = new Node({ children: [leaf] }), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: parent, runnableIds: [parent.id] }); @@ -95,7 +95,7 @@ describe('TreeProcessor', function() { it('processes a tree with a single pending leaf, with the root specified', function() { const leaf = new Leaf({ markedPending: true }), parent = new Node({ children: [leaf] }), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: parent, runnableIds: [parent.id] }); @@ -111,7 +111,7 @@ describe('TreeProcessor', function() { const specified = new Leaf(); const nonSpecified = new Leaf(); const root = new Node({ children: [nonSpecified, specified] }); - const processor = new jasmineUnderTest.TreeProcessor({ + const processor = new privateUnderTest.TreeProcessor({ tree: root, runnableIds: [specified.id] }); @@ -128,7 +128,7 @@ describe('TreeProcessor', function() { const leaf1 = new Leaf(); const node = new Node({ children: [leaf1] }); const root = new Node({ children: [node] }); - const processor = new jasmineUnderTest.TreeProcessor({ + const processor = new privateUnderTest.TreeProcessor({ tree: root, runnableIds: [] }); @@ -158,7 +158,7 @@ describe('TreeProcessor', function() { children: [childless, pendingNode] }), root = new Node({ children: [parent, parentOfPendings] }), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: root, runnableIds: [root.id] }); @@ -203,7 +203,7 @@ describe('TreeProcessor', function() { leaf3 = new Leaf(), reentered = new Node({ noReenter: true, children: [leaf1, leaf2] }), root = new Node({ children: [reentered, leaf3] }), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: root, runnableIds: [leaf1.id, leaf3.id, leaf2.id] }); @@ -221,7 +221,7 @@ describe('TreeProcessor', function() { const leaf3 = new Leaf(); const reentered = new Node({ children: [leaf1, leaf2] }); const root = new Node({ children: [reentered, leaf3] }); - const processor = new jasmineUnderTest.TreeProcessor({ + const processor = new privateUnderTest.TreeProcessor({ tree: root, runnableIds: [leaf1.id, leaf3.id, leaf2.id] }); @@ -241,7 +241,7 @@ describe('TreeProcessor', function() { leaf3 = new Leaf(), noReentry = new Node({ noReenter: true }), root = new Node({ children: [noReentry] }), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: root, runnableIds: [leaf2.id, leaf1.id, leaf3.id] }); @@ -252,7 +252,7 @@ describe('TreeProcessor', function() { it("does not throw if a node which can't be re-entered is run directly", function() { const noReentry = new Node({ noReenter: true }), root = new Node({ children: [noReentry] }), - processor = new jasmineUnderTest.TreeProcessor({ + processor = new privateUnderTest.TreeProcessor({ tree: root, runnableIds: [root.id] }); @@ -288,7 +288,7 @@ describe('TreeProcessor', function() { ] }); const runQueue = jasmine.createSpy('runQueue'); - const processor = new jasmineUnderTest.TreeProcessor({ + const processor = new privateUnderTest.TreeProcessor({ tree: root, runnableIds: [root.id], runQueue, diff --git a/spec/core/TreeRunnerSpec.js b/spec/core/TreeRunnerSpec.js index ee53c123..634098df 100644 --- a/spec/core/TreeRunnerSpec.js +++ b/spec/core/TreeRunnerSpec.js @@ -2,7 +2,7 @@ describe('TreeRunner', function() { describe('spec execution', function() { it('starts the timer, reports the spec started, and updates run state at the start of the queue', async function() { const timer = jasmine.createSpyObj('timer', ['start']); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ id: 'spec1', queueableFn: {}, timer @@ -38,7 +38,7 @@ describe('TreeRunner', function() { it('stops the timer, updates run state, and reports the spec done at the end of the queue', async function() { const timer = jasmine.createSpyObj('timer', ['start', 'elapsed']); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ id: 'spec1', queueableFn: {}, timer @@ -82,7 +82,7 @@ describe('TreeRunner', function() { expect(after).not.toHaveBeenCalled(); }) }; - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: queueableFn, beforeAndAfterFns: function() { return { befores: [before], afters: [after] }; @@ -106,7 +106,7 @@ describe('TreeRunner', function() { spec.pend(); } }; - spec = new jasmineUnderTest.Spec({ queueableFn }); + spec = new privateUnderTest.Spec({ queueableFn }); const { runQueue, suiteRunQueueArgs } = runSingleSpecSuite(spec); suiteRunQueueArgs.queueableFns[0].fn(); @@ -127,7 +127,7 @@ describe('TreeRunner', function() { spec.pend('some reason'); } }; - spec = new jasmineUnderTest.Spec({ queueableFn }); + spec = new privateUnderTest.Spec({ queueableFn }); const { runQueue, suiteRunQueueArgs } = runSingleSpecSuite(spec); suiteRunQueueArgs.queueableFns[0].fn(); @@ -142,7 +142,7 @@ describe('TreeRunner', function() { }); it('passes failSpecWithNoExp to Spec#executionFinished', async function() { - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ id: 'spec1', queueableFn: {} }); @@ -168,8 +168,8 @@ describe('TreeRunner', function() { describe('Suite execution', function() { it('reports the duration of the suite', async function() { const timer = jasmine.createSpyObj('timer', ['start', 'elapsed']); - const topSuite = new jasmineUnderTest.Suite({ id: 'topSuite' }); - const suite = new jasmineUnderTest.Suite({ + const topSuite = new privateUnderTest.Suite({ id: 'topSuite' }); + const suite = new privateUnderTest.Suite({ id: 'suite1', parentSuite: topSuite, timer @@ -189,13 +189,13 @@ describe('TreeRunner', function() { }; const runQueue = jasmine.createSpy('runQueue'); const reportDispatcher = mockReportDispatcher(); - const subject = new jasmineUnderTest.TreeRunner({ + const subject = new privateUnderTest.TreeRunner({ executionTree, runQueue, globalErrors: mockGlobalErrors(), runableResources: mockRunableResources(), reportDispatcher, - currentRunableTracker: new jasmineUnderTest.CurrentRunableTracker(), + currentRunableTracker: new privateUnderTest.CurrentRunableTracker(), getConfig() { return {}; }, @@ -226,12 +226,12 @@ describe('TreeRunner', function() { }); it('returns false if a suite failed', async function() { - const topSuite = new jasmineUnderTest.Suite({ id: 'topSuite' }); - const failingSuite = new jasmineUnderTest.Suite({ + const topSuite = new privateUnderTest.Suite({ id: 'topSuite' }); + const failingSuite = new privateUnderTest.Suite({ id: 'failingSuite', parentSuite: topSuite }); - const passingSuite = new jasmineUnderTest.Suite({ + const passingSuite = new privateUnderTest.Suite({ id: 'passingSuite', parentSuite: topSuite }); @@ -249,13 +249,13 @@ describe('TreeRunner', function() { }; const runQueue = jasmine.createSpy('runQueue'); const reportDispatcher = mockReportDispatcher(); - const subject = new jasmineUnderTest.TreeRunner({ + const subject = new privateUnderTest.TreeRunner({ executionTree, runQueue, globalErrors: mockGlobalErrors(), runableResources: mockRunableResources(), reportDispatcher, - currentRunableTracker: new jasmineUnderTest.CurrentRunableTracker(), + currentRunableTracker: new privateUnderTest.CurrentRunableTracker(), getConfig() { return {}; }, @@ -290,13 +290,13 @@ describe('TreeRunner', function() { }); it('reports children when there is a beforeAll failure', async function() { - const topSuite = new jasmineUnderTest.Suite({ id: 'topSuite' }); - const suite = new jasmineUnderTest.Suite({ + const topSuite = new privateUnderTest.Suite({ id: 'topSuite' }); + const suite = new privateUnderTest.Suite({ id: 'suite', parentSuite: topSuite }); suite.beforeAll({ fn() {} }); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ id: 'spec', parentSuite: suite, queueableFn: { fn() {} } @@ -320,13 +320,13 @@ describe('TreeRunner', function() { const reportChildrenOfBeforeAllFailure = jasmine .createSpy('reportChildrenOfBeforeAllFailure') .and.returnValue(Promise.resolve()); - const subject = new jasmineUnderTest.TreeRunner({ + const subject = new privateUnderTest.TreeRunner({ executionTree, runQueue, globalErrors: mockGlobalErrors(), runableResources: mockRunableResources(), reportDispatcher, - currentRunableTracker: new jasmineUnderTest.CurrentRunableTracker(), + currentRunableTracker: new privateUnderTest.CurrentRunableTracker(), reportChildrenOfBeforeAllFailure, getConfig() { return {}; @@ -356,12 +356,12 @@ describe('TreeRunner', function() { }); it('throws if the wrong suite is completed', async function() { - const topSuite = new jasmineUnderTest.Suite({ id: 'topSuite' }); - const suite = new jasmineUnderTest.Suite({ + const topSuite = new privateUnderTest.Suite({ id: 'topSuite' }); + const suite = new privateUnderTest.Suite({ id: 'suite', parentSuite: topSuite }); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ id: 'spec', parentSuite: suite, queueableFn: { fn() {} } @@ -380,13 +380,13 @@ describe('TreeRunner', function() { }; const runQueue = jasmine.createSpy('runQueue'); const reportDispatcher = mockReportDispatcher(); - const subject = new jasmineUnderTest.TreeRunner({ + const subject = new privateUnderTest.TreeRunner({ executionTree, runQueue, globalErrors: mockGlobalErrors(), runableResources: mockRunableResources(), reportDispatcher, - currentRunableTracker: new jasmineUnderTest.CurrentRunableTracker(), + currentRunableTracker: new privateUnderTest.CurrentRunableTracker(), getConfig() { return {}; }, @@ -412,7 +412,7 @@ describe('TreeRunner', function() { }); it('does not remove before and after fns from the top suite', async function() { - const topSuite = new jasmineUnderTest.Suite({ id: 'topSuite' }); + const topSuite = new privateUnderTest.Suite({ id: 'topSuite' }); spyOn(topSuite, 'cleanupBeforeAfter'); const executionTree = { topSuite, @@ -424,13 +424,13 @@ describe('TreeRunner', function() { } }; const runQueue = jasmine.createSpy('runQueue'); - const subject = new jasmineUnderTest.TreeRunner({ + const subject = new privateUnderTest.TreeRunner({ executionTree, runQueue, globalErrors: mockGlobalErrors(), runableResources: mockRunableResources(), reportDispatcher: mockReportDispatcher(), - currentRunableTracker: new jasmineUnderTest.CurrentRunableTracker(), + currentRunableTracker: new privateUnderTest.CurrentRunableTracker(), getConfig() { return {}; } @@ -460,7 +460,7 @@ describe('TreeRunner', function() { expect(after).not.toHaveBeenCalled(); }) }; - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn, beforeAndAfterFns: function() { return { befores: [before], afters: [after] }; @@ -504,13 +504,13 @@ describe('TreeRunner', function() { }); it('works for beforeAll when the detectLateRejectionHandling param is true', async function() { - const topSuite = new jasmineUnderTest.Suite({ id: 'topSuite' }); - const suite = new jasmineUnderTest.Suite({ + const topSuite = new privateUnderTest.Suite({ id: 'topSuite' }); + const suite = new privateUnderTest.Suite({ id: 'suite', parentSuite: topSuite }); suite.beforeAll(function() {}); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn() {} }, parentSuite: suite }); @@ -530,14 +530,14 @@ describe('TreeRunner', function() { const reportDispatcher = mockReportDispatcher(); const globalErrors = mockGlobalErrors(); const setTimeout = jasmine.createSpy('setTimeout'); - const subject = new jasmineUnderTest.TreeRunner({ + const subject = new privateUnderTest.TreeRunner({ executionTree, runQueue, globalErrors, runableResources: mockRunableResources(), reportDispatcher, setTimeout, - currentRunableTracker: new jasmineUnderTest.CurrentRunableTracker(), + currentRunableTracker: new privateUnderTest.CurrentRunableTracker(), getConfig() { return { detectLateRejectionHandling: true }; }, @@ -573,13 +573,13 @@ describe('TreeRunner', function() { }); it('works for afterAll when the detectLateRejectionHandling param is true', async function() { - const topSuite = new jasmineUnderTest.Suite({ id: 'topSuite' }); - const suite = new jasmineUnderTest.Suite({ + const topSuite = new privateUnderTest.Suite({ id: 'topSuite' }); + const suite = new privateUnderTest.Suite({ id: 'suite', parentSuite: topSuite }); suite.afterAll(function() {}); - const spec = new jasmineUnderTest.Spec({ + const spec = new privateUnderTest.Spec({ queueableFn: { fn() {} }, parentSuite: suite }); @@ -599,14 +599,14 @@ describe('TreeRunner', function() { const reportDispatcher = mockReportDispatcher(); const globalErrors = mockGlobalErrors(); const setTimeout = jasmine.createSpy('setTimeout'); - const subject = new jasmineUnderTest.TreeRunner({ + const subject = new privateUnderTest.TreeRunner({ executionTree, runQueue, globalErrors, runableResources: mockRunableResources(), reportDispatcher, setTimeout, - currentRunableTracker: new jasmineUnderTest.CurrentRunableTracker(), + currentRunableTracker: new privateUnderTest.CurrentRunableTracker(), getConfig() { return { detectLateRejectionHandling: true }; }, @@ -645,7 +645,7 @@ describe('TreeRunner', function() { function runSingleSpecSuite(spec, optionalConfig) { const topSuiteId = 'suite1'; spec.parentSuiteId = topSuiteId; - const topSuite = new jasmineUnderTest.Suite({ id: topSuiteId }); + const topSuite = new privateUnderTest.Suite({ id: topSuiteId }); topSuite.addChild(spec); const executionTree = { topSuite, @@ -661,8 +661,8 @@ describe('TreeRunner', function() { const runableResources = mockRunableResources(); const globalErrors = mockGlobalErrors(); const setTimeout = jasmine.createSpy('setTimeout'); - const currentRunableTracker = new jasmineUnderTest.CurrentRunableTracker(); - const subject = new jasmineUnderTest.TreeRunner({ + const currentRunableTracker = new privateUnderTest.CurrentRunableTracker(); + const subject = new privateUnderTest.TreeRunner({ executionTree, runQueue, globalErrors, @@ -696,10 +696,10 @@ describe('TreeRunner', function() { function mockReportDispatcher() { const reportDispatcher = jasmine.createSpyObj( 'reportDispatcher', - jasmineUnderTest.reporterEvents + privateUnderTest.reporterEvents ); - for (const k of jasmineUnderTest.reporterEvents) { + for (const k of privateUnderTest.reporterEvents) { reportDispatcher[k].and.returnValue(Promise.resolve()); } diff --git a/spec/core/UserContextSpec.js b/spec/core/UserContextSpec.js index 99caa37c..71836550 100644 --- a/spec/core/UserContextSpec.js +++ b/spec/core/UserContextSpec.js @@ -1,6 +1,6 @@ describe('UserContext', function() { it('Behaves just like an plain object', function() { - const context = new jasmineUnderTest.UserContext(), + const context = new privateUnderTest.UserContext(), properties = []; for (const prop in context) { @@ -15,9 +15,9 @@ describe('UserContext', function() { describe('.fromExisting', function() { describe('when using an already built context as model', function() { beforeEach(function() { - this.context = new jasmineUnderTest.UserContext(); + this.context = new privateUnderTest.UserContext(); this.context.key = 'value'; - this.cloned = jasmineUnderTest.UserContext.fromExisting(this.context); + this.cloned = privateUnderTest.UserContext.fromExisting(this.context); }); it('returns a cloned object', function() { @@ -34,7 +34,7 @@ describe('UserContext', function() { this.context = {}; this.value = 'value'; this.context.key = this.value; - this.cloned = jasmineUnderTest.UserContext.fromExisting(this.context); + this.cloned = privateUnderTest.UserContext.fromExisting(this.context); }); it('returns an object with the same attributes', function() { @@ -46,7 +46,7 @@ describe('UserContext', function() { }); it('returns an UserContext', function() { - expect(this.cloned.constructor).toBe(jasmineUnderTest.UserContext); + expect(this.cloned.constructor).toBe(privateUnderTest.UserContext); }); }); }); diff --git a/spec/core/UtilSpec.js b/spec/core/UtilSpec.js index 5ec6b36b..6a0abc0a 100644 --- a/spec/core/UtilSpec.js +++ b/spec/core/UtilSpec.js @@ -1,33 +1,33 @@ describe('util', function() { - describe('isArray_', function() { + describe('isArray', function() { it('should return true if the argument is an array', function() { - expect(jasmineUnderTest.isArray_([])).toBe(true); - expect(jasmineUnderTest.isArray_(['a'])).toBe(true); + expect(privateUnderTest.isArray([])).toBe(true); + expect(privateUnderTest.isArray(['a'])).toBe(true); }); it('should return false if the argument is not an array', function() { - expect(jasmineUnderTest.isArray_(undefined)).toBe(false); - expect(jasmineUnderTest.isArray_({})).toBe(false); - expect(jasmineUnderTest.isArray_(function() {})).toBe(false); - expect(jasmineUnderTest.isArray_('foo')).toBe(false); - expect(jasmineUnderTest.isArray_(5)).toBe(false); - expect(jasmineUnderTest.isArray_(null)).toBe(false); + expect(privateUnderTest.isArray(undefined)).toBe(false); + expect(privateUnderTest.isArray({})).toBe(false); + expect(privateUnderTest.isArray(function() {})).toBe(false); + expect(privateUnderTest.isArray('foo')).toBe(false); + expect(privateUnderTest.isArray(5)).toBe(false); + expect(privateUnderTest.isArray(null)).toBe(false); }); }); - describe('isObject_', function() { + describe('isObject', function() { it('should return true if the argument is an object', function() { - expect(jasmineUnderTest.isObject_({})).toBe(true); - expect(jasmineUnderTest.isObject_({ an: 'object' })).toBe(true); + expect(privateUnderTest.isObject({})).toBe(true); + expect(privateUnderTest.isObject({ an: 'object' })).toBe(true); }); it('should return false if the argument is not an object', function() { - expect(jasmineUnderTest.isObject_(undefined)).toBe(false); - expect(jasmineUnderTest.isObject_([])).toBe(false); - expect(jasmineUnderTest.isObject_(function() {})).toBe(false); - expect(jasmineUnderTest.isObject_('foo')).toBe(false); - expect(jasmineUnderTest.isObject_(5)).toBe(false); - expect(jasmineUnderTest.isObject_(null)).toBe(false); + expect(privateUnderTest.isObject(undefined)).toBe(false); + expect(privateUnderTest.isObject([])).toBe(false); + expect(privateUnderTest.isObject(function() {})).toBe(false); + expect(privateUnderTest.isObject('foo')).toBe(false); + expect(privateUnderTest.isObject(5)).toBe(false); + expect(privateUnderTest.isObject(null)).toBe(false); }); }); @@ -45,119 +45,121 @@ describe('util', function() { describe('isPromise', function() { it('should return true when passed a native promise', function() { - expect(jasmineUnderTest.isPromise(mockNativePromise)).toBe(true); + expect(privateUnderTest.isPromise(mockNativePromise)).toBe(true); }); it('should return false for promise like objects', function() { - expect(jasmineUnderTest.isPromise(mockPromiseLikeObject)).toBe(false); + expect(privateUnderTest.isPromise(mockPromiseLikeObject)).toBe(false); }); it('should return false for strings', function() { - expect(jasmineUnderTest.isPromise('hello')).toBe(false); + expect(privateUnderTest.isPromise('hello')).toBe(false); }); it('should return false for numbers', function() { - expect(jasmineUnderTest.isPromise(3)).toBe(false); + expect(privateUnderTest.isPromise(3)).toBe(false); }); it('should return false for null', function() { - expect(jasmineUnderTest.isPromise(null)).toBe(false); + expect(privateUnderTest.isPromise(null)).toBe(false); }); it('should return false for undefined', function() { - expect(jasmineUnderTest.isPromise(undefined)).toBe(false); + expect(privateUnderTest.isPromise(undefined)).toBe(false); }); it('should return false for arrays', function() { - expect(jasmineUnderTest.isPromise([])).toBe(false); + expect(privateUnderTest.isPromise([])).toBe(false); }); it('should return false for objects', function() { - expect(jasmineUnderTest.isPromise({})).toBe(false); + expect(privateUnderTest.isPromise({})).toBe(false); }); it('should return false for boolean values', function() { - expect(jasmineUnderTest.isPromise(true)).toBe(false); + expect(privateUnderTest.isPromise(true)).toBe(false); }); }); describe('isPromiseLike', function() { it('should return true when passed a native promise', function() { - expect(jasmineUnderTest.isPromiseLike(mockNativePromise)).toBe(true); + expect(privateUnderTest.isPromiseLike(mockNativePromise)).toBe(true); }); it('should return true for promise like objects', function() { - expect(jasmineUnderTest.isPromiseLike(mockPromiseLikeObject)).toBe( + expect(privateUnderTest.isPromiseLike(mockPromiseLikeObject)).toBe( true ); }); it('should return false if then is not a function', function() { expect( - jasmineUnderTest.isPromiseLike({ then: { its: 'Not a function :O' } }) + privateUnderTest.isPromiseLike({ + then: { its: 'Not a function :O' } + }) ).toBe(false); }); it('should return false for strings', function() { - expect(jasmineUnderTest.isPromiseLike('hello')).toBe(false); + expect(privateUnderTest.isPromiseLike('hello')).toBe(false); }); it('should return false for numbers', function() { - expect(jasmineUnderTest.isPromiseLike(3)).toBe(false); + expect(privateUnderTest.isPromiseLike(3)).toBe(false); }); it('should return false for null', function() { - expect(jasmineUnderTest.isPromiseLike(null)).toBe(false); + expect(privateUnderTest.isPromiseLike(null)).toBe(false); }); it('should return false for undefined', function() { - expect(jasmineUnderTest.isPromiseLike(undefined)).toBe(false); + expect(privateUnderTest.isPromiseLike(undefined)).toBe(false); }); it('should return false for arrays', function() { - expect(jasmineUnderTest.isPromiseLike([])).toBe(false); + expect(privateUnderTest.isPromiseLike([])).toBe(false); }); it('should return false for objects', function() { - expect(jasmineUnderTest.isPromiseLike({})).toBe(false); + expect(privateUnderTest.isPromiseLike({})).toBe(false); }); it('should return false for boolean values', function() { - expect(jasmineUnderTest.isPromiseLike(true)).toBe(false); + expect(privateUnderTest.isPromiseLike(true)).toBe(false); }); }); }); describe('cloneArgs', function() { it('clones primitives as-is', function() { - expect(jasmineUnderTest.util.cloneArgs([true, false])).toEqual([ + expect(privateUnderTest.util.cloneArgs([true, false])).toEqual([ true, false ]); - expect(jasmineUnderTest.util.cloneArgs([0, 1])).toEqual([0, 1]); - expect(jasmineUnderTest.util.cloneArgs(['str'])).toEqual(['str']); + expect(privateUnderTest.util.cloneArgs([0, 1])).toEqual([0, 1]); + expect(privateUnderTest.util.cloneArgs(['str'])).toEqual(['str']); }); it('clones Regexp objects as-is', function() { const regex = /match/; - expect(jasmineUnderTest.util.cloneArgs([regex])).toEqual([regex]); + expect(privateUnderTest.util.cloneArgs([regex])).toEqual([regex]); }); it('clones Date objects as-is', function() { const date = new Date(2022, 1, 1); - expect(jasmineUnderTest.util.cloneArgs([date])).toEqual([date]); + expect(privateUnderTest.util.cloneArgs([date])).toEqual([date]); }); it('clones null and undefined', function() { - expect(jasmineUnderTest.util.cloneArgs([null])).toEqual([null]); - expect(jasmineUnderTest.util.cloneArgs([undefined])).toEqual([undefined]); + expect(privateUnderTest.util.cloneArgs([null])).toEqual([null]); + expect(privateUnderTest.util.cloneArgs([undefined])).toEqual([undefined]); }); }); describe('getPropertyDescriptor', function() { it('get property descriptor from object', function() { const obj = { prop: 1 }, - actual = jasmineUnderTest.util.getPropertyDescriptor(obj, 'prop'), + actual = privateUnderTest.util.getPropertyDescriptor(obj, 'prop'), expected = Object.getOwnPropertyDescriptor(obj, 'prop'); expect(actual).toEqual(expected); @@ -165,7 +167,7 @@ describe('util', function() { it('get property descriptor from object property', function() { const proto = { prop: 1 }, - actual = jasmineUnderTest.util.getPropertyDescriptor(proto, 'prop'), + actual = privateUnderTest.util.getPropertyDescriptor(proto, 'prop'), expected = Object.getOwnPropertyDescriptor(proto, 'prop'); expect(actual).toEqual(expected); @@ -176,8 +178,8 @@ describe('util', function() { it('returns the file containing jasmine.util', function() { // Chrome sometimes reports foo.js as foo.js/, so tolerate // a trailing slash if present. - expect(jasmineUnderTest.util.jasmineFile()).toMatch(/util.js\/?$/); - expect(jasmine.util.jasmineFile()).toMatch(/jasmine.js\/?$/); + expect(privateUnderTest.util.jasmineFile()).toMatch(/util.js\/?$/); + expect(jasmine.private.util.jasmineFile()).toMatch(/jasmine.js\/?$/); }); }); }); diff --git a/spec/core/asymmetric_equality/AnySpec.js b/spec/core/asymmetric_equality/AnySpec.js index e23d93fd..d4382b60 100644 --- a/spec/core/asymmetric_equality/AnySpec.js +++ b/spec/core/asymmetric_equality/AnySpec.js @@ -1,73 +1,73 @@ describe('Any', function() { it('matches a string', function() { - const any = new jasmineUnderTest.Any(String); + const any = new privateUnderTest.Any(String); expect(any.asymmetricMatch('foo')).toBe(true); }); it('matches a number', function() { - const any = new jasmineUnderTest.Any(Number); + const any = new privateUnderTest.Any(Number); expect(any.asymmetricMatch(1)).toBe(true); }); it('matches a function', function() { - const any = new jasmineUnderTest.Any(Function); + const any = new privateUnderTest.Any(Function); expect(any.asymmetricMatch(function() {})).toBe(true); }); it('matches an Object', function() { - const any = new jasmineUnderTest.Any(Object); + const any = new privateUnderTest.Any(Object); expect(any.asymmetricMatch({})).toBe(true); }); it('matches a Boolean', function() { - const any = new jasmineUnderTest.Any(Boolean); + const any = new privateUnderTest.Any(Boolean); expect(any.asymmetricMatch(true)).toBe(true); }); it('matches a Map', function() { - const any = new jasmineUnderTest.Any(Map); + const any = new privateUnderTest.Any(Map); expect(any.asymmetricMatch(new Map())).toBe(true); }); it('matches a Set', function() { - const any = new jasmineUnderTest.Any(Set); + const any = new privateUnderTest.Any(Set); expect(any.asymmetricMatch(new Set())).toBe(true); }); it('matches a TypedArray', function() { - const any = new jasmineUnderTest.Any(Uint32Array); + const any = new privateUnderTest.Any(Uint32Array); expect(any.asymmetricMatch(new Uint32Array([]))).toBe(true); }); it('matches a Symbol', function() { - const any = new jasmineUnderTest.Any(Symbol); + const any = new privateUnderTest.Any(Symbol); expect(any.asymmetricMatch(Symbol())).toBe(true); }); it('matches another constructed object', function() { const Thing = function() {}, - any = new jasmineUnderTest.Any(Thing); + any = new privateUnderTest.Any(Thing); expect(any.asymmetricMatch(new Thing())).toBe(true); }); it('does not treat null as an Object', function() { - const any = new jasmineUnderTest.Any(Object); + const any = new privateUnderTest.Any(Object); expect(any.asymmetricMatch(null)).toBe(false); }); it("jasmineToString's itself", function() { - const any = new jasmineUnderTest.Any(Number); + const any = new privateUnderTest.Any(Number); expect(any.jasmineToString()).toEqual(''); expect(any.jasmineToString()).toEqual(''); @@ -76,7 +76,7 @@ describe('Any', function() { describe('when called without an argument', function() { it('tells the user to pass a constructor or use jasmine.anything()', function() { expect(function() { - new jasmineUnderTest.Any(); + new privateUnderTest.Any(); }).toThrowError(TypeError, /constructor.*anything/); }); }); diff --git a/spec/core/asymmetric_equality/AnythingSpec.js b/spec/core/asymmetric_equality/AnythingSpec.js index a894995a..4cdb1888 100644 --- a/spec/core/asymmetric_equality/AnythingSpec.js +++ b/spec/core/asymmetric_equality/AnythingSpec.js @@ -1,67 +1,67 @@ describe('Anything', function() { it('matches a string', function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch('foo')).toBe(true); }); it('matches a number', function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch(42)).toBe(true); }); it('matches an object', function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch({ foo: 'bar' })).toBe(true); }); it('matches an array', function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch([1, 2, 3])).toBe(true); }); it('matches a Map', function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch(new Map())).toBe(true); }); it('matches a Set', function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch(new Set())).toBe(true); }); it('matches a TypedArray', function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch(new Uint32Array([]))).toBe(true); }); it('matches a Symbol', function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch(Symbol())).toBe(true); }); it("doesn't match undefined", function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch()).toBe(false); expect(anything.asymmetricMatch(undefined)).toBe(false); }); it("doesn't match null", function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.asymmetricMatch(null)).toBe(false); }); it("jasmineToString's itself", function() { - const anything = new jasmineUnderTest.Anything(); + const anything = new privateUnderTest.Anything(); expect(anything.jasmineToString()).toEqual(''); }); diff --git a/spec/core/asymmetric_equality/ArrayContainingSpec.js b/spec/core/asymmetric_equality/ArrayContainingSpec.js index 96b77143..2c5dccd9 100644 --- a/spec/core/asymmetric_equality/ArrayContainingSpec.js +++ b/spec/core/asymmetric_equality/ArrayContainingSpec.js @@ -1,12 +1,12 @@ describe('ArrayContaining', function() { it('matches any actual to an empty array', function() { - const containing = new jasmineUnderTest.ArrayContaining([]); + const containing = new privateUnderTest.ArrayContaining([]); expect(containing.asymmetricMatch('foo')).toBe(true); }); it('does not work when not passed an array', function() { - const containing = new jasmineUnderTest.ArrayContaining('foo'); + const containing = new privateUnderTest.ArrayContaining('foo'); expect(function() { containing.asymmetricMatch([]); @@ -14,36 +14,36 @@ describe('ArrayContaining', function() { }); it('matches when the item is in the actual', function() { - const containing = new jasmineUnderTest.ArrayContaining(['foo']); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ArrayContaining(['foo']); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(['foo'], matchersUtil)).toBe(true); }); it('matches when additional items are in the actual', function() { - const containing = new jasmineUnderTest.ArrayContaining(['foo']); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ArrayContaining(['foo']); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(['foo', 'bar'], matchersUtil)).toBe(true); }); it('does not match when the item is not in the actual', function() { - const containing = new jasmineUnderTest.ArrayContaining(['foo']); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ArrayContaining(['foo']); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(['bar'], matchersUtil)).toBe(false); }); it('does not match when the actual is not an array', function() { - const containing = new jasmineUnderTest.ArrayContaining(['foo']); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ArrayContaining(['foo']); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch('foo', matchersUtil)).toBe(false); }); it('jasmineToStrings itself', function() { const sample = [], - matcher = new jasmineUnderTest.ArrayContaining(sample), + matcher = new privateUnderTest.ArrayContaining(sample), pp = jasmine.createSpy('pp').and.returnValue('sample'); expect(matcher.jasmineToString(pp)).toEqual( @@ -64,8 +64,8 @@ describe('ArrayContaining', function() { return true; } }; - const containing = new jasmineUnderTest.ArrayContaining(['fooVal']); - const matchersUtil = new jasmineUnderTest.MatchersUtil({ + const containing = new privateUnderTest.ArrayContaining(['fooVal']); + const matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester] }); diff --git a/spec/core/asymmetric_equality/ArrayWithExactContentsSpec.js b/spec/core/asymmetric_equality/ArrayWithExactContentsSpec.js index d2197bbf..644f005d 100644 --- a/spec/core/asymmetric_equality/ArrayWithExactContentsSpec.js +++ b/spec/core/asymmetric_equality/ArrayWithExactContentsSpec.js @@ -1,13 +1,13 @@ describe('ArrayWithExactContents', function() { it('matches an array with the same items in a different order', function() { - const matcher = new jasmineUnderTest.ArrayWithExactContents(['a', 2, /a/]); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matcher = new privateUnderTest.ArrayWithExactContents(['a', 2, /a/]); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matcher.asymmetricMatch([2, 'a', /a/], matchersUtil)).toBe(true); }); it('does not work when not passed an array', function() { - const matcher = new jasmineUnderTest.ArrayWithExactContents('foo'); + const matcher = new privateUnderTest.ArrayWithExactContents('foo'); expect(function() { matcher.asymmetricMatch([]); @@ -15,8 +15,8 @@ describe('ArrayWithExactContents', function() { }); it('does not match when an item is missing', function() { - const matcher = new jasmineUnderTest.ArrayWithExactContents(['a', 2, /a/]); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matcher = new privateUnderTest.ArrayWithExactContents(['a', 2, /a/]); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matcher.asymmetricMatch(['a', 2], matchersUtil)).toBe(false); expect(matcher.asymmetricMatch(['a', 2, undefined], matchersUtil)).toBe( @@ -25,15 +25,15 @@ describe('ArrayWithExactContents', function() { }); it('does not match when there is an extra item', function() { - const matcher = new jasmineUnderTest.ArrayWithExactContents(['a']); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matcher = new privateUnderTest.ArrayWithExactContents(['a']); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matcher.asymmetricMatch(['a', 2], matchersUtil)).toBe(false); }); it('jasmineToStrings itself', function() { const sample = [], - matcher = new jasmineUnderTest.ArrayWithExactContents(sample), + matcher = new privateUnderTest.ArrayWithExactContents(sample), pp = jasmine.createSpy('pp').and.returnValue('sample'); expect(matcher.jasmineToString(pp)).toEqual( @@ -54,8 +54,8 @@ describe('ArrayWithExactContents', function() { return true; } }; - const matcher = new jasmineUnderTest.ArrayWithExactContents(['fooVal']); - const matchersUtil = new jasmineUnderTest.MatchersUtil({ + const matcher = new privateUnderTest.ArrayWithExactContents(['fooVal']); + const matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester] }); diff --git a/spec/core/asymmetric_equality/EmptySpec.js b/spec/core/asymmetric_equality/EmptySpec.js index 25a467c5..910dd768 100644 --- a/spec/core/asymmetric_equality/EmptySpec.js +++ b/spec/core/asymmetric_equality/EmptySpec.js @@ -1,20 +1,20 @@ describe('Empty', function() { it('matches an empty object', function() { - const empty = new jasmineUnderTest.Empty(); + const empty = new privateUnderTest.Empty(); expect(empty.asymmetricMatch({})).toBe(true); expect(empty.asymmetricMatch({ undefined: false })).toBe(false); }); it('matches an empty array', function() { - const empty = new jasmineUnderTest.Empty(); + const empty = new privateUnderTest.Empty(); expect(empty.asymmetricMatch([])).toBe(true); expect(empty.asymmetricMatch([1, 12, 3])).toBe(false); }); it('matches an empty string', function() { - const empty = new jasmineUnderTest.Empty(); + const empty = new privateUnderTest.Empty(); expect(empty.asymmetricMatch('')).toBe(true); expect(empty.asymmetricMatch('')).toBe(true); @@ -22,7 +22,7 @@ describe('Empty', function() { }); it('matches an empty map', function() { - const empty = new jasmineUnderTest.Empty(); + const empty = new privateUnderTest.Empty(); const fullMap = new Map(); fullMap.set('thing', 2); @@ -31,7 +31,7 @@ describe('Empty', function() { }); it('matches an empty set', function() { - const empty = new jasmineUnderTest.Empty(); + const empty = new privateUnderTest.Empty(); const fullSet = new Set(); fullSet.add(3); @@ -40,7 +40,7 @@ describe('Empty', function() { }); it('matches an empty typed array', function() { - const empty = new jasmineUnderTest.Empty(); + const empty = new privateUnderTest.Empty(); expect(empty.asymmetricMatch(new Int16Array())).toBe(true); expect(empty.asymmetricMatch(new Int16Array([1, 2]))).toBe(false); diff --git a/spec/core/asymmetric_equality/FalsySpec.js b/spec/core/asymmetric_equality/FalsySpec.js index 01312d26..9d3e1efe 100644 --- a/spec/core/asymmetric_equality/FalsySpec.js +++ b/spec/core/asymmetric_equality/FalsySpec.js @@ -1,6 +1,6 @@ describe('Falsy', function() { it('is true for an empty string', function() { - const falsy = new jasmineUnderTest.Falsy(); + const falsy = new privateUnderTest.Falsy(); expect(falsy.asymmetricMatch('')).toBe(true); expect(falsy.asymmetricMatch('')).toBe(true); @@ -8,7 +8,7 @@ describe('Falsy', function() { }); it('is false for a number that is 0', function() { - const falsy = new jasmineUnderTest.Falsy(Number); + const falsy = new privateUnderTest.Falsy(Number); expect(falsy.asymmetricMatch(1)).toBe(false); expect(falsy.asymmetricMatch(0)).toBe(true); @@ -17,20 +17,20 @@ describe('Falsy', function() { }); it('is true for a null or undefined', function() { - const falsy = new jasmineUnderTest.Falsy(Function); + const falsy = new privateUnderTest.Falsy(Function); expect(falsy.asymmetricMatch(null)).toBe(true); expect(falsy.asymmetricMatch(undefined)).toBe(true); }); it('is true for NaN', function() { - const falsy = new jasmineUnderTest.Falsy(Object); + const falsy = new privateUnderTest.Falsy(Object); expect(falsy.asymmetricMatch(NaN)).toBe(true); }); it('is true for a false Boolean', function() { - const falsy = new jasmineUnderTest.Falsy(Boolean); + const falsy = new privateUnderTest.Falsy(Boolean); expect(falsy.asymmetricMatch(false)).toBe(true); expect(falsy.asymmetricMatch(true)).toBe(false); diff --git a/spec/core/asymmetric_equality/IsSpec.js b/spec/core/asymmetric_equality/IsSpec.js index c2554aab..e34abc18 100644 --- a/spec/core/asymmetric_equality/IsSpec.js +++ b/spec/core/asymmetric_equality/IsSpec.js @@ -1,28 +1,28 @@ describe('Is', function() { it('passes for primitives that are ===', function() { - const exactly = new jasmineUnderTest.Is(17); + const exactly = new privateUnderTest.Is(17); expect(exactly.asymmetricMatch(17)).toBeTrue(); }); it('fails for primitives that are not ===', function() { - const exactly = new jasmineUnderTest.Is(42); + const exactly = new privateUnderTest.Is(42); expect(exactly.asymmetricMatch('42')).toBeFalse(); }); it('passes for the same object instance', function() { const obj = {}; - const exactly = new jasmineUnderTest.Is(obj); + const exactly = new privateUnderTest.Is(obj); expect(exactly.asymmetricMatch(obj)).toBeTrue(); }); it('fails for different object instances, even if they are deep value equal', function() { - const exactly = new jasmineUnderTest.Is({}); + const exactly = new privateUnderTest.Is({}); expect(exactly.asymmetricMatch({})).toBeFalse(); }); it('describes itself for use in diffs and pretty printing', function() { - const exactly = new jasmineUnderTest.Is({ foo: ['bar'] }); - const pp = jasmineUnderTest.basicPrettyPrinter_; + const exactly = new privateUnderTest.Is({ foo: ['bar'] }); + const pp = privateUnderTest.basicPrettyPrinter; expect(exactly.jasmineToString(pp)).toEqual( "" ); diff --git a/spec/core/asymmetric_equality/MapContainingSpec.js b/spec/core/asymmetric_equality/MapContainingSpec.js index 934084b9..c5cc0581 100644 --- a/spec/core/asymmetric_equality/MapContainingSpec.js +++ b/spec/core/asymmetric_equality/MapContainingSpec.js @@ -1,7 +1,7 @@ describe('MapContaining', function() { it('matches any actual map to an empty map', function() { const actualMap = new Map([['foo', 'bar']]); - const containing = new jasmineUnderTest.MapContaining(new Map()); + const containing = new privateUnderTest.MapContaining(new Map()); expect(containing.asymmetricMatch(actualMap)).toBe(true); }); @@ -17,8 +17,8 @@ describe('MapContaining', function() { [{ foo: 'bar' }, 'baz'], ['foo', [1, 2, 3]] ]); - const containing = new jasmineUnderTest.MapContaining(containingMap); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.MapContaining(containingMap); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(true); }); @@ -33,8 +33,8 @@ describe('MapContaining', function() { [{ foo: 'bar' }, 'baz'], ['foo', [1, 2, 3]] ]); - const containing = new jasmineUnderTest.MapContaining(containingMap); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.MapContaining(containingMap); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(false); }); @@ -43,8 +43,8 @@ describe('MapContaining', function() { const actualMap = new Map([['foo', [1, 2, 3]], [{ foo: 'bar' }, 'baz']]); const containingMap = new Map([[{ foo: 'bar' }, 'baz'], ['foo', [1, 2]]]); - const containing = new jasmineUnderTest.MapContaining(containingMap); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.MapContaining(containingMap); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(false); }); @@ -60,8 +60,8 @@ describe('MapContaining', function() { [jasmineUnderTest.stringMatching(/^foo\d/), 'bar'], ['baz', jasmineUnderTest.arrayContaining([2, 3])] ]); - const containing = new jasmineUnderTest.MapContaining(containingMap); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.MapContaining(containingMap); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(true); }); @@ -73,8 +73,8 @@ describe('MapContaining', function() { [jasmineUnderTest.stringMatching(/^foo\d/), 'bar'], ['baz', jasmineUnderTest.arrayContaining([2, 3])] ]); - const containing = new jasmineUnderTest.MapContaining(containingMap); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.MapContaining(containingMap); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(false); }); @@ -86,8 +86,8 @@ describe('MapContaining', function() { [jasmineUnderTest.stringMatching(/^foo\d/), 'bar'], ['baz', jasmineUnderTest.arrayContaining([4, 5])] ]); - const containing = new jasmineUnderTest.MapContaining(containingMap); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.MapContaining(containingMap); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(false); }); @@ -100,11 +100,11 @@ describe('MapContaining', function() { ]); const containingMap = new Map([ - ['foo', new jasmineUnderTest.MapContaining(new Map([['foo1', 1]]))], - [new jasmineUnderTest.MapContaining(new Map([[2, 'bar2']])), 'bar'] + ['foo', new privateUnderTest.MapContaining(new Map([['foo1', 1]]))], + [new privateUnderTest.MapContaining(new Map([[2, 'bar2']])), 'bar'] ]); - const containing = new jasmineUnderTest.MapContaining(containingMap); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.MapContaining(containingMap); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(true); }); @@ -117,10 +117,10 @@ describe('MapContaining', function() { : a === b; } const actualMap = new Map([['foo', -1]]); - const containing = new jasmineUnderTest.MapContaining( + const containing = new privateUnderTest.MapContaining( new Map([['foo', -2]]) ); - const matchersUtil = new jasmineUnderTest.MatchersUtil({ + const matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester] }); @@ -130,13 +130,13 @@ describe('MapContaining', function() { it('does not match when actual is not a map', function() { const containingMap = new Map([['foo', 'bar']]); expect( - new jasmineUnderTest.MapContaining(containingMap).asymmetricMatch('foo') + new privateUnderTest.MapContaining(containingMap).asymmetricMatch('foo') ).toBe(false); expect( - new jasmineUnderTest.MapContaining(containingMap).asymmetricMatch(-1) + new privateUnderTest.MapContaining(containingMap).asymmetricMatch(-1) ).toBe(false); expect( - new jasmineUnderTest.MapContaining(containingMap).asymmetricMatch({ + new privateUnderTest.MapContaining(containingMap).asymmetricMatch({ foo: 'bar' }) ).toBe(false); @@ -144,7 +144,7 @@ describe('MapContaining', function() { it('throws an error when sample is not a map', function() { expect(function() { - new jasmineUnderTest.MapContaining({ foo: 'bar' }).asymmetricMatch( + new privateUnderTest.MapContaining({ foo: 'bar' }).asymmetricMatch( new Map() ); }).toThrowError(/You must provide a map/); @@ -152,7 +152,7 @@ describe('MapContaining', function() { it('defines a `jasmineToString` method', function() { const sample = new Map(), - containing = new jasmineUnderTest.MapContaining(sample), + containing = new privateUnderTest.MapContaining(sample), pp = jasmine.createSpy('pp').and.returnValue('sample'); expect(containing.jasmineToString(pp)).toEqual( diff --git a/spec/core/asymmetric_equality/NotEmptySpec.js b/spec/core/asymmetric_equality/NotEmptySpec.js index 7494135f..527b1f16 100644 --- a/spec/core/asymmetric_equality/NotEmptySpec.js +++ b/spec/core/asymmetric_equality/NotEmptySpec.js @@ -1,20 +1,20 @@ describe('NotEmpty', function() { it('matches a non empty object', function() { - const notEmpty = new jasmineUnderTest.NotEmpty(); + const notEmpty = new privateUnderTest.NotEmpty(); expect(notEmpty.asymmetricMatch({ undefined: false })).toBe(true); expect(notEmpty.asymmetricMatch({})).toBe(false); }); it('matches a non empty array', function() { - const notEmpty = new jasmineUnderTest.NotEmpty(); + const notEmpty = new privateUnderTest.NotEmpty(); expect(notEmpty.asymmetricMatch([1, 12, 3])).toBe(true); expect(notEmpty.asymmetricMatch([])).toBe(false); }); it('matches a non empty string', function() { - const notEmpty = new jasmineUnderTest.NotEmpty(); + const notEmpty = new privateUnderTest.NotEmpty(); expect(notEmpty.asymmetricMatch('12312')).toBe(true); expect(notEmpty.asymmetricMatch('')).toBe(false); @@ -22,7 +22,7 @@ describe('NotEmpty', function() { }); it('matches a non empty map', function() { - const notEmpty = new jasmineUnderTest.NotEmpty(); + const notEmpty = new privateUnderTest.NotEmpty(); const fullMap = new Map(); fullMap.set('one', 1); const emptyMap = new Map(); @@ -32,7 +32,7 @@ describe('NotEmpty', function() { }); it('matches a non empty set', function() { - const notEmpty = new jasmineUnderTest.NotEmpty(); + const notEmpty = new privateUnderTest.NotEmpty(); const filledSet = new Set(); filledSet.add(1); const emptySet = new Set(); @@ -42,7 +42,7 @@ describe('NotEmpty', function() { }); it('matches a non empty typed array', function() { - const notEmpty = new jasmineUnderTest.NotEmpty(); + const notEmpty = new privateUnderTest.NotEmpty(); expect(notEmpty.asymmetricMatch(new Int16Array([1, 2, 3]))).toBe(true); expect(notEmpty.asymmetricMatch(new Int16Array())).toBe(false); diff --git a/spec/core/asymmetric_equality/ObjectContainingSpec.js b/spec/core/asymmetric_equality/ObjectContainingSpec.js index 98bf01b3..70327473 100644 --- a/spec/core/asymmetric_equality/ObjectContainingSpec.js +++ b/spec/core/asymmetric_equality/ObjectContainingSpec.js @@ -1,13 +1,13 @@ describe('ObjectContaining', function() { it('matches any object actual to an empty object', function() { - const containing = new jasmineUnderTest.ObjectContaining({}); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ObjectContaining({}); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch({ foo: 1 }, matchersUtil)).toBe(true); }); it('does not match when the actual is not an object', function() { - const containing = new jasmineUnderTest.ObjectContaining({}); + const containing = new privateUnderTest.ObjectContaining({}); [1, true, undefined, 'a string'].forEach(function(actual) { expect(containing.asymmetricMatch(actual)).toBe(false); @@ -15,7 +15,7 @@ describe('ObjectContaining', function() { }); it('does not match an empty object actual', function() { - const containing = new jasmineUnderTest.ObjectContaining('foo'); + const containing = new privateUnderTest.ObjectContaining('foo'); expect(function() { containing.asymmetricMatch({}); @@ -23,8 +23,8 @@ describe('ObjectContaining', function() { }); it('matches when the key/value pair is present in the actual', function() { - const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' }); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ObjectContaining({ foo: 'fooVal' }); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect( containing.asymmetricMatch({ foo: 'fooVal', bar: 'barVal' }, matchersUtil) @@ -32,8 +32,8 @@ describe('ObjectContaining', function() { }); it('does not match when the key/value pair is not present in the actual', function() { - const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' }); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ObjectContaining({ foo: 'fooVal' }); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect( containing.asymmetricMatch( @@ -44,8 +44,8 @@ describe('ObjectContaining', function() { }); it('does not match when the key is present but the value is different in the actual', function() { - const containing = new jasmineUnderTest.ObjectContaining({ foo: 'other' }); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ObjectContaining({ foo: 'other' }); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect( containing.asymmetricMatch({ foo: 'fooVal', bar: 'barVal' }, matchersUtil) @@ -54,7 +54,7 @@ describe('ObjectContaining', function() { it("jasmineToString's itself", function() { const sample = {}, - matcher = new jasmineUnderTest.ObjectContaining(sample), + matcher = new privateUnderTest.ObjectContaining(sample), pp = jasmine.createSpy('pp').and.returnValue('sample'); expect(matcher.jasmineToString(pp)).toEqual( @@ -64,10 +64,10 @@ describe('ObjectContaining', function() { }); it('matches recursively', function() { - const containing = new jasmineUnderTest.ObjectContaining({ - one: new jasmineUnderTest.ObjectContaining({ two: {} }) + const containing = new privateUnderTest.ObjectContaining({ + one: new privateUnderTest.ObjectContaining({ two: {} }) }); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch({ one: { two: {} } }, matchersUtil)).toBe( true @@ -75,10 +75,10 @@ describe('ObjectContaining', function() { }); it('matches when key is present with undefined value', function() { - const containing = new jasmineUnderTest.ObjectContaining({ + const containing = new privateUnderTest.ObjectContaining({ one: undefined }); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch({ one: undefined }, matchersUtil)).toBe( true @@ -86,17 +86,17 @@ describe('ObjectContaining', function() { }); it('does not match when key with undefined value is not present', function() { - const containing = new jasmineUnderTest.ObjectContaining({ + const containing = new privateUnderTest.ObjectContaining({ one: undefined }); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch({}, matchersUtil)).toBe(false); }); it('matches defined properties', function() { - const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' }); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ObjectContaining({ foo: 'fooVal' }); + const matchersUtil = new privateUnderTest.MatchersUtil(); const definedPropertyObject = {}; Object.defineProperty(definedPropertyObject, 'foo', { @@ -110,8 +110,8 @@ describe('ObjectContaining', function() { }); it('matches prototype properties', function() { - const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' }); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.ObjectContaining({ foo: 'fooVal' }); + const matchersUtil = new privateUnderTest.MatchersUtil(); const prototypeObject = { foo: 'fooVal' }; const obj = Object.create(prototypeObject); @@ -131,8 +131,8 @@ describe('ObjectContaining', function() { return true; } }; - const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' }); - const matchersUtil = new jasmineUnderTest.MatchersUtil({ + const containing = new privateUnderTest.ObjectContaining({ foo: 'fooVal' }); + const matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester] }); @@ -144,8 +144,8 @@ describe('ObjectContaining', function() { describe('valuesForDiff_', function() { describe('when other is not an object', function() { it('sets self to jasmineToString()', function() { - const containing = new jasmineUnderTest.ObjectContaining({}), - pp = jasmineUnderTest.makePrettyPrinter(), + const containing = new privateUnderTest.ObjectContaining({}), + pp = privateUnderTest.makePrettyPrinter(), result = containing.valuesForDiff_('a', pp); expect(result).toEqual({ @@ -159,11 +159,11 @@ describe('ObjectContaining', function() { it('includes keys that are present in both other and sample', function() { const sample = { a: 1, b: 2 }, other = { a: 3, b: 4 }, - containing = new jasmineUnderTest.ObjectContaining(sample), + containing = new privateUnderTest.ObjectContaining(sample), result = containing.valuesForDiff_(other); expect(result.self).not.toBeInstanceOf( - jasmineUnderTest.ObjectContaining + privateUnderTest.ObjectContaining ); expect(result).toEqual({ self: sample, @@ -174,11 +174,11 @@ describe('ObjectContaining', function() { it('includes keys that are present only in sample', function() { const sample = { a: 1, b: 2 }, other = { a: 3 }, - containing = new jasmineUnderTest.ObjectContaining(sample), + containing = new privateUnderTest.ObjectContaining(sample), result = containing.valuesForDiff_(other); expect(result.self).not.toBeInstanceOf( - jasmineUnderTest.ObjectContaining + privateUnderTest.ObjectContaining ); expect(containing.valuesForDiff_(other)).toEqual({ self: sample, @@ -192,11 +192,11 @@ describe('ObjectContaining', function() { it('omits keys that are present only in other', function() { const sample = { a: 1, b: 2 }, other = { a: 3, b: 4, c: 5 }, - containing = new jasmineUnderTest.ObjectContaining(sample), + containing = new privateUnderTest.ObjectContaining(sample), result = containing.valuesForDiff_(other); expect(result.self).not.toBeInstanceOf( - jasmineUnderTest.ObjectContaining + privateUnderTest.ObjectContaining ); expect(result).toEqual({ self: sample, diff --git a/spec/core/asymmetric_equality/SetContainingSpec.js b/spec/core/asymmetric_equality/SetContainingSpec.js index ab7654b6..6e48acfa 100644 --- a/spec/core/asymmetric_equality/SetContainingSpec.js +++ b/spec/core/asymmetric_equality/SetContainingSpec.js @@ -1,7 +1,7 @@ describe('SetContaining', function() { it('matches any actual set to an empty set', function() { const actualSet = new Set(['foo', 'bar']); - const containing = new jasmineUnderTest.SetContaining(new Set()); + const containing = new privateUnderTest.SetContaining(new Set()); expect(containing.asymmetricMatch(actualSet)).toBe(true); }); @@ -10,8 +10,8 @@ describe('SetContaining', function() { const actualSet = new Set([{ foo: 'bar' }, 'baz', [1, 2, 3]]); const containingSet = new Set([[1, 2, 3], { foo: 'bar' }]); - const containing = new jasmineUnderTest.SetContaining(containingSet); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.SetContaining(containingSet); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(true); }); @@ -20,8 +20,8 @@ describe('SetContaining', function() { const actualSet = new Set([{ foo: 'bar' }, 'baz', [1, 2, 3]]); const containingSet = new Set([[1, 2], { foo: 'bar' }]); - const containing = new jasmineUnderTest.SetContaining(containingSet); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.SetContaining(containingSet); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(false); }); @@ -33,8 +33,8 @@ describe('SetContaining', function() { jasmineUnderTest.stringMatching(/^foo\d/), jasmineUnderTest.arrayContaining([2, 3]) ]); - const containing = new jasmineUnderTest.SetContaining(containingSet); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.SetContaining(containingSet); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(true); }); @@ -46,8 +46,8 @@ describe('SetContaining', function() { jasmine.stringMatching(/^foo\d/), jasmine.arrayContaining([2, 3]) ]); - const containing = new jasmineUnderTest.SetContaining(containingSet); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.SetContaining(containingSet); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(false); }); @@ -56,11 +56,11 @@ describe('SetContaining', function() { const actualSet = new Set(['foo', new Set([1, 'bar', 2]), 'other']); const containingSet = new Set([ - new jasmineUnderTest.SetContaining(new Set(['bar'])), + new privateUnderTest.SetContaining(new Set(['bar'])), 'foo' ]); - const containing = new jasmineUnderTest.SetContaining(containingSet); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const containing = new privateUnderTest.SetContaining(containingSet); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(true); }); @@ -73,8 +73,8 @@ describe('SetContaining', function() { : a === b; } const actualSet = new Set(['foo', -1]); - const containing = new jasmineUnderTest.SetContaining(new Set([-2, 'foo'])); - const matchersUtil = new jasmineUnderTest.MatchersUtil({ + const containing = new privateUnderTest.SetContaining(new Set([-2, 'foo'])); + const matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester] }); @@ -84,19 +84,19 @@ describe('SetContaining', function() { it('does not match when actual is not a set', function() { const containingSet = new Set(['foo']); expect( - new jasmineUnderTest.SetContaining(containingSet).asymmetricMatch('foo') + new privateUnderTest.SetContaining(containingSet).asymmetricMatch('foo') ).toBe(false); expect( - new jasmineUnderTest.SetContaining(containingSet).asymmetricMatch(1) + new privateUnderTest.SetContaining(containingSet).asymmetricMatch(1) ).toBe(false); expect( - new jasmineUnderTest.SetContaining(containingSet).asymmetricMatch(['foo']) + new privateUnderTest.SetContaining(containingSet).asymmetricMatch(['foo']) ).toBe(false); }); it('throws an error when sample is not a set', function() { expect(function() { - new jasmineUnderTest.SetContaining({ foo: 'bar' }).asymmetricMatch( + new privateUnderTest.SetContaining({ foo: 'bar' }).asymmetricMatch( new Set() ); }).toThrowError(/You must provide a set/); @@ -104,7 +104,7 @@ describe('SetContaining', function() { it('defines a `jasmineToString` method', function() { const sample = new Set(), - containing = new jasmineUnderTest.SetContaining(sample), + containing = new privateUnderTest.SetContaining(sample), pp = jasmine.createSpy('pp').and.returnValue('sample'); expect(containing.jasmineToString(pp)).toEqual( diff --git a/spec/core/asymmetric_equality/StringContainingSpec.js b/spec/core/asymmetric_equality/StringContainingSpec.js index bae3b398..7bd7da54 100644 --- a/spec/core/asymmetric_equality/StringContainingSpec.js +++ b/spec/core/asymmetric_equality/StringContainingSpec.js @@ -1,6 +1,6 @@ describe('StringContaining', function() { it('searches for a provided substring when the expected is a String', function() { - const matcher = new jasmineUnderTest.StringContaining('foo'); + const matcher = new privateUnderTest.StringContaining('foo'); expect(matcher.asymmetricMatch('barfoobaz')).toBe(true); expect(matcher.asymmetricMatch('barbaz')).toBe(false); @@ -8,17 +8,17 @@ describe('StringContaining', function() { it('raises an Error when the expected is not a String', function() { expect(function() { - new jasmineUnderTest.StringContaining(/foo/); + new privateUnderTest.StringContaining(/foo/); }).toThrowError(/not a String/); }); it('fails when the actual is not a String', function() { - const matcher = new jasmineUnderTest.StringContaining('x'); + const matcher = new privateUnderTest.StringContaining('x'); expect(matcher.asymmetricMatch(['x'])).toBe(false); }); it("jasmineToString's itself", function() { - const matching = new jasmineUnderTest.StringContaining('foo'); + const matching = new privateUnderTest.StringContaining('foo'); expect(matching.jasmineToString()).toEqual( '' diff --git a/spec/core/asymmetric_equality/StringMatchingSpec.js b/spec/core/asymmetric_equality/StringMatchingSpec.js index cec1ebe1..dc444b98 100644 --- a/spec/core/asymmetric_equality/StringMatchingSpec.js +++ b/spec/core/asymmetric_equality/StringMatchingSpec.js @@ -1,13 +1,13 @@ describe('StringMatching', function() { it('matches a string against a provided regexp', function() { - const matcher = new jasmineUnderTest.StringMatching(/foo/); + const matcher = new privateUnderTest.StringMatching(/foo/); expect(matcher.asymmetricMatch('barfoobaz')).toBe(true); expect(matcher.asymmetricMatch('barbaz')).toBe(false); }); it('matches a string against provided string', function() { - const matcher = new jasmineUnderTest.StringMatching('foo'); + const matcher = new privateUnderTest.StringMatching('foo'); expect(matcher.asymmetricMatch('barfoobaz')).toBe(true); expect(matcher.asymmetricMatch('barbaz')).toBe(false); @@ -15,12 +15,12 @@ describe('StringMatching', function() { it('raises an Error when the expected is not a String or RegExp', function() { expect(function() { - new jasmineUnderTest.StringMatching({}); + new privateUnderTest.StringMatching({}); }).toThrowError(/not a String or a RegExp/); }); it("jasmineToString's itself", function() { - const matching = new jasmineUnderTest.StringMatching(/^foo/); + const matching = new privateUnderTest.StringMatching(/^foo/); expect(matching.jasmineToString()).toEqual( '' diff --git a/spec/core/asymmetric_equality/TruthySpec.js b/spec/core/asymmetric_equality/TruthySpec.js index 755503f4..266b24d3 100644 --- a/spec/core/asymmetric_equality/TruthySpec.js +++ b/spec/core/asymmetric_equality/TruthySpec.js @@ -1,13 +1,13 @@ describe('Truthy', function() { it('is true for a non empty string', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch('foo')).toBe(true); expect(truthy.asymmetricMatch('')).toBe(false); }); it('is true for a number that is not 0', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch(1)).toBe(true); expect(truthy.asymmetricMatch(0)).toBe(false); @@ -16,44 +16,44 @@ describe('Truthy', function() { }); it('is true for a function', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch(function() {})).toBe(true); }); it('is true for an Object', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch({})).toBe(true); }); it('is true for a truthful Boolean', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch(true)).toBe(true); expect(truthy.asymmetricMatch(false)).toBe(false); }); it('is true for an empty object', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch({})).toBe(true); }); it('is true for an empty array', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch([])).toBe(true); }); it('is true for a date', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch(new Date())).toBe(true); }); it('is true for a infiniti', function() { - const truthy = new jasmineUnderTest.Truthy(); + const truthy = new privateUnderTest.Truthy(); expect(truthy.asymmetricMatch(Infinity)).toBe(true); expect(truthy.asymmetricMatch(-Infinity)).toBe(true); diff --git a/spec/core/baseSpec.js b/spec/core/baseSpec.js index a656d3f4..132dab6e 100644 --- a/spec/core/baseSpec.js +++ b/spec/core/baseSpec.js @@ -1,5 +1,5 @@ describe('base helpers', function() { - describe('isError_', function() { + describe('isError', function() { it('correctly handles WebSocket events', function(done) { if (typeof jasmine.getGlobal().WebSocket === 'undefined') { pending('Environment does not provide WebSocket'); @@ -19,7 +19,7 @@ describe('base helpers', function() { const int = setInterval(function() { if (obj() || left === 0) { - const result = jasmineUnderTest.isError_(obj()); + const result = privateUnderTest.isError(obj()); expect(result).toBe(false); clearInterval(int); done(); @@ -32,11 +32,11 @@ describe('base helpers', function() { it('returns true for an Error subclass', function() { function MyError() {} MyError.prototype = new Error(); - expect(jasmineUnderTest.isError_(new MyError())).toBe(true); + expect(privateUnderTest.isError(new MyError())).toBe(true); }); it('returns true for an un-thrown Error with no message in this environment', function() { - expect(jasmineUnderTest.isError_(new Error())).toBe(true); + expect(privateUnderTest.isError(new Error())).toBe(true); }); it('returns true for an Error that originated from another frame', function() { @@ -50,102 +50,102 @@ describe('base helpers', function() { try { const error = iframe.contentWindow.eval('new Error()'); - expect(jasmineUnderTest.isError_(error)).toBe(true); + expect(privateUnderTest.isError(error)).toBe(true); } finally { document.body.removeChild(iframe); } }); it('returns false for a falsy value', function() { - expect(jasmineUnderTest.isError_(undefined)).toBe(false); + expect(privateUnderTest.isError(undefined)).toBe(false); }); it('returns false for a non-Error object', function() { - expect(jasmineUnderTest.isError_({})).toBe(false); + expect(privateUnderTest.isError({})).toBe(false); }); }); describe('isAsymmetricEqualityTester_', function() { it('returns false when the argument is falsy', function() { - expect(jasmineUnderTest.isAsymmetricEqualityTester_(null)).toBe(false); + expect(privateUnderTest.isAsymmetricEqualityTester(null)).toBe(false); }); it('returns false when the argument does not have a asymmetricMatch property', function() { const obj = {}; - expect(jasmineUnderTest.isAsymmetricEqualityTester_(obj)).toBe(false); + expect(privateUnderTest.isAsymmetricEqualityTester(obj)).toBe(false); }); it("returns false when the argument's asymmetricMatch is not a function", function() { const obj = { asymmetricMatch: 'yes' }; - expect(jasmineUnderTest.isAsymmetricEqualityTester_(obj)).toBe(false); + expect(privateUnderTest.isAsymmetricEqualityTester(obj)).toBe(false); }); it("returns true when the argument's asymmetricMatch is a function", function() { const obj = { asymmetricMatch: function() {} }; - expect(jasmineUnderTest.isAsymmetricEqualityTester_(obj)).toBe(true); + expect(privateUnderTest.isAsymmetricEqualityTester(obj)).toBe(true); }); }); describe('isSet', function() { it('returns true when the object is a Set', function() { - expect(jasmineUnderTest.isSet(new Set())).toBe(true); + expect(privateUnderTest.isSet(new Set())).toBe(true); }); it('returns false when the object is not a Set', function() { - expect(jasmineUnderTest.isSet({})).toBe(false); + expect(privateUnderTest.isSet({})).toBe(false); }); }); describe('isURL', function() { it('returns true when the object is a URL', function() { - expect(jasmineUnderTest.isURL(new URL('http://localhost/'))).toBe(true); + expect(privateUnderTest.isURL(new URL('http://localhost/'))).toBe(true); }); it('returns false when the object is not a URL', function() { - expect(jasmineUnderTest.isURL({})).toBe(false); + expect(privateUnderTest.isURL({})).toBe(false); }); }); - describe('isIterable_', function() { + describe('isIterable', function() { it('returns true when the object is an Array', function() { - expect(jasmineUnderTest.isIterable_([])).toBe(true); + expect(privateUnderTest.isIterable([])).toBe(true); }); it('returns true when the object is a Set', function() { - expect(jasmineUnderTest.isIterable_(new Set())).toBe(true); + expect(privateUnderTest.isIterable(new Set())).toBe(true); }); it('returns true when the object is a Map', function() { - expect(jasmineUnderTest.isIterable_(new Map())).toBe(true); + expect(privateUnderTest.isIterable(new Map())).toBe(true); }); it('returns true when the object implements @@iterator', function() { const myIterable = { [Symbol.iterator]: function() {} }; - expect(jasmineUnderTest.isIterable_(myIterable)).toBe(true); + expect(privateUnderTest.isIterable(myIterable)).toBe(true); }); it('returns false when the object does not implement @@iterator', function() { - expect(jasmineUnderTest.isIterable_({})).toBe(false); + expect(privateUnderTest.isIterable({})).toBe(false); }); }); - describe('isPending_', function() { + describe('isPending', function() { it('returns a promise that resolves to true when the promise is pending', function() { const promise = new Promise(function() {}); - return expectAsync(jasmineUnderTest.isPending_(promise)).toBeResolvedTo( + return expectAsync(privateUnderTest.isPending(promise)).toBeResolvedTo( true ); }); it('returns a promise that resolves to false when the promise is resolved', function() { const promise = Promise.resolve(); - return expectAsync(jasmineUnderTest.isPending_(promise)).toBeResolvedTo( + return expectAsync(privateUnderTest.isPending(promise)).toBeResolvedTo( false ); }); it('returns a promise that resolves to false when the promise is rejected', function() { const promise = Promise.reject(new Error('nope')); - return expectAsync(jasmineUnderTest.isPending_(promise)).toBeResolvedTo( + return expectAsync(privateUnderTest.isPending(promise)).toBeResolvedTo( false ); }); diff --git a/spec/core/buildExpectationResultSpec.js b/spec/core/buildExpectationResultSpec.js index 88b4cc19..9d31afd3 100644 --- a/spec/core/buildExpectationResultSpec.js +++ b/spec/core/buildExpectationResultSpec.js @@ -1,13 +1,13 @@ describe('buildExpectationResult', function() { it('defaults to passed', function() { - const result = jasmineUnderTest.buildExpectationResult({ + const result = privateUnderTest.buildExpectationResult({ passed: 'some-value' }); expect(result.passed).toBe('some-value'); }); it('message defaults to Passed for passing specs', function() { - const result = jasmineUnderTest.buildExpectationResult({ + const result = privateUnderTest.buildExpectationResult({ passed: true, message: 'some-value' }); @@ -15,7 +15,7 @@ describe('buildExpectationResult', function() { }); it('message returns the message for failing expectations', function() { - const result = jasmineUnderTest.buildExpectationResult({ + const result = privateUnderTest.buildExpectationResult({ passed: false, message: 'some-value' }); @@ -24,7 +24,7 @@ describe('buildExpectationResult', function() { describe('When the error property is provided', function() { it('sets the message to the formatted error', function() { - const result = jasmineUnderTest.buildExpectationResult({ + const result = privateUnderTest.buildExpectationResult({ passed: false, error: { message: 'foo', fileName: 'somefile.js' } }); @@ -33,7 +33,7 @@ describe('buildExpectationResult', function() { }); it('delegates stack formatting to the provided formatter', function() { - const result = jasmineUnderTest.buildExpectationResult({ + const result = privateUnderTest.buildExpectationResult({ passed: false, error: { stack: 'foo', extra: 'wombat' } }); @@ -46,7 +46,7 @@ describe('buildExpectationResult', function() { describe('When the errorForStack property is provided', function() { it('builds the stack trace using errorForStack instead of Error', function() { - const result = jasmineUnderTest.buildExpectationResult({ + const result = privateUnderTest.buildExpectationResult({ passed: false, errorForStack: { stack: 'foo' }, error: { stack: 'bar' } @@ -57,7 +57,7 @@ describe('buildExpectationResult', function() { }); it('matcherName returns passed matcherName', function() { - const result = jasmineUnderTest.buildExpectationResult({ + const result = privateUnderTest.buildExpectationResult({ matcherName: 'some-value' }); expect(result.matcherName).toBe('some-value'); @@ -78,7 +78,7 @@ describe('buildExpectationResult', function() { expect(error.code).toEqual('ERR_ASSERTION'); expect(error.operator).toEqual('=='); - const result = jasmineUnderTest.buildExpectationResult({ + const result = privateUnderTest.buildExpectationResult({ passed: false, matcherName: '', error: error diff --git a/spec/core/formatErrorMsgSpec.js b/spec/core/formatErrorMsgSpec.js index aae60be1..4457aef5 100644 --- a/spec/core/formatErrorMsgSpec.js +++ b/spec/core/formatErrorMsgSpec.js @@ -1,12 +1,12 @@ describe('formatErrorMsg', function() { it('should format an error with a domain', function() { - const formator = jasmineUnderTest.formatErrorMsg('api'); + const formator = privateUnderTest.formatErrorMsg('api'); expect(formator('message')).toBe('api : message'); expect(formator('message2')).toBe('api : message2'); }); it('should format an error with a domain and usage', function() { - const formator = jasmineUnderTest.formatErrorMsg('api', 'with a param'); + const formator = privateUnderTest.formatErrorMsg('api', 'with a param'); expect(formator('message')).toBe('api : message\nUsage: with a param'); expect(formator('message2')).toBe('api : message2\nUsage: with a param'); }); diff --git a/spec/core/integration/AsymmetricEqualityTestersSpec.js b/spec/core/integration/AsymmetricEqualityTestersSpec.js index 9fb4d6ca..08910b26 100644 --- a/spec/core/integration/AsymmetricEqualityTestersSpec.js +++ b/spec/core/integration/AsymmetricEqualityTestersSpec.js @@ -1,7 +1,7 @@ describe('Asymmetric equality testers (Integration)', function() { function verifyPasses(expectations) { it('passes', async function() { - const env = new jasmineUnderTest.Env(); + const env = new privateUnderTest.Env(); env.it('a spec', function() { expectations(env); }); @@ -30,7 +30,7 @@ describe('Asymmetric equality testers (Integration)', function() { function verifyFails(expectations) { it('fails', async function() { - const env = new jasmineUnderTest.Env(); + const env = new privateUnderTest.Env(); env.it('a spec', function() { expectations(env); }); diff --git a/spec/core/integration/CustomAsyncMatchersSpec.js b/spec/core/integration/CustomAsyncMatchersSpec.js index 1c167cfb..3b930e41 100644 --- a/spec/core/integration/CustomAsyncMatchersSpec.js +++ b/spec/core/integration/CustomAsyncMatchersSpec.js @@ -2,7 +2,7 @@ describe('Custom Async Matchers (Integration)', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ random: false }); }); @@ -107,7 +107,7 @@ describe('Custom Async Matchers (Integration)', function() { const specExpectations = function() { expect(matcherFactorySpy).toHaveBeenCalledWith( - jasmine.any(jasmineUnderTest.MatchersUtil) + jasmine.any(privateUnderTest.MatchersUtil) ); }; diff --git a/spec/core/integration/CustomMatchersSpec.js b/spec/core/integration/CustomMatchersSpec.js index e56f8a04..081b245b 100644 --- a/spec/core/integration/CustomMatchersSpec.js +++ b/spec/core/integration/CustomMatchersSpec.js @@ -2,7 +2,7 @@ describe('Custom Matchers (Integration)', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ random: false }); }); @@ -230,7 +230,7 @@ describe('Custom Matchers (Integration)', function() { await env.execute(); expect(matcherFactorySpy).toHaveBeenCalledWith( - jasmine.any(jasmineUnderTest.MatchersUtil) + jasmine.any(privateUnderTest.MatchersUtil) ); }); diff --git a/spec/core/integration/CustomObjectFormatterSpec.js b/spec/core/integration/CustomObjectFormatterSpec.js index 284ad87c..488a8768 100644 --- a/spec/core/integration/CustomObjectFormatterSpec.js +++ b/spec/core/integration/CustomObjectFormatterSpec.js @@ -2,7 +2,7 @@ describe('Custom object formatters', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ random: false }); }); diff --git a/spec/core/integration/CustomSpyStrategiesSpec.js b/spec/core/integration/CustomSpyStrategiesSpec.js index 5fdd3e1c..66422116 100644 --- a/spec/core/integration/CustomSpyStrategiesSpec.js +++ b/spec/core/integration/CustomSpyStrategiesSpec.js @@ -2,7 +2,7 @@ describe('Custom Spy Strategies (Integration)', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ random: false }); }); diff --git a/spec/core/integration/DefaultSpyStrategySpec.js b/spec/core/integration/DefaultSpyStrategySpec.js index a42dce60..a5fef892 100644 --- a/spec/core/integration/DefaultSpyStrategySpec.js +++ b/spec/core/integration/DefaultSpyStrategySpec.js @@ -2,7 +2,7 @@ describe('Default Spy Strategy (Integration)', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ random: false }); }); diff --git a/spec/core/integration/DeprecationSpec.js b/spec/core/integration/DeprecationSpec.js index cbb95b2f..aa8bf710 100644 --- a/spec/core/integration/DeprecationSpec.js +++ b/spec/core/integration/DeprecationSpec.js @@ -3,7 +3,7 @@ describe('Deprecation (integration)', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { diff --git a/spec/core/integration/EnvSpec.js b/spec/core/integration/EnvSpec.js index 688ab1c0..55e8fd67 100644 --- a/spec/core/integration/EnvSpec.js +++ b/spec/core/integration/EnvSpec.js @@ -4,7 +4,7 @@ describe('Env integration', function() { beforeEach(function() { specHelpers.registerIntegrationMatchers(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { @@ -199,7 +199,7 @@ describe('Env integration', function() { } else { secondSpecContext = this; } - expect(this).toEqual(new jasmineUnderTest.UserContext()); + expect(this).toEqual(new privateUnderTest.UserContext()); }); env.it('sync spec', function() { @@ -229,7 +229,7 @@ describe('Env integration', function() { env.beforeEach(function() { specContext = this; - expect(this).toEqual(new jasmineUnderTest.UserContext()); + expect(this).toEqual(new privateUnderTest.UserContext()); }); env.it('sync spec', function(underTestCallback) { @@ -1110,7 +1110,7 @@ describe('Env integration', function() { ); env.cleanup_(); - env = new jasmineUnderTest.Env({ + env = new privateUnderTest.Env({ global: { setTimeout: globalSetTimeout, clearTimeout: clearTimeout, @@ -1175,7 +1175,7 @@ describe('Env integration', function() { env.cleanup_(); // explicitly pass in timing functions so we can make sure that clear stack always works // no matter how long the suite in the spec is - env = new jasmineUnderTest.Env({ + env = new privateUnderTest.Env({ global: { setTimeout: function(cb, t) { const stack = new Error().stack; @@ -1271,7 +1271,9 @@ describe('Env integration', function() { await env.execute(); expect(reporter.specDone).toHaveBeenCalledTimes(1); const event = reporter.specDone.calls.argsFor(0)[0]; - jasmine.debugLog('Spec result: ' + jasmine.basicPrettyPrinter_(event)); + jasmine.debugLog( + 'Spec result: ' + jasmine.private.basicPrettyPrinter(event) + ); expect(event).toEqual(jasmine.objectContaining({ status: 'passed' })); jasmine.clock().tick(1); @@ -2335,7 +2337,7 @@ describe('Env integration', function() { }); it('throws an exception if you try to getSpecProperty outside of a spec', async function() { - const env = new jasmineUnderTest.Env(); + const env = new privateUnderTest.Env(); let exception; env.describe('a suite', function() { @@ -2356,7 +2358,7 @@ describe('Env integration', function() { }); it('reports test properties on specs', async function() { - const env = new jasmineUnderTest.Env(), + const env = new privateUnderTest.Env(), reporter = jasmine.createSpyObj('reporter', ['suiteDone', 'specDone']); reporter.specDone.and.callFake(function(e) { @@ -2389,7 +2391,7 @@ describe('Env integration', function() { }); it('throws an exception if you try to setSpecProperty outside of a spec', async function() { - const env = new jasmineUnderTest.Env(); + const env = new privateUnderTest.Env(); let exception; env.describe('a suite', function() { @@ -2410,7 +2412,7 @@ describe('Env integration', function() { }); it('reports test properties on suites', async function() { - const env = new jasmineUnderTest.Env(), + const env = new privateUnderTest.Env(), reporter = jasmine.createSpyObj('reporter', [ 'jasmineDone', 'suiteDone', @@ -2437,7 +2439,7 @@ describe('Env integration', function() { }); it('throws an exception if you try to setSuiteProperty outside of a suite', function(done) { - const env = new jasmineUnderTest.Env(); + const env = new privateUnderTest.Env(); try { env.setSuiteProperty('a', 'Bee'); @@ -2776,7 +2778,7 @@ describe('Env integration', function() { spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); const reporter = jasmine.createSpyObj('reporter', [ 'jasmineDone', 'suiteDone', @@ -2877,7 +2879,7 @@ describe('Env integration', function() { }); it('should report deprecation stack with an error object', async function() { - const exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(), + const exceptionFormatter = new privateUnderTest.ExceptionFormatter(), reporter = jasmine.createSpyObj('reporter', [ 'jasmineDone', 'suiteDone', @@ -3167,7 +3169,7 @@ describe('Env integration', function() { }); it('supports asymmetric equality testers that take a matchersUtil', async function() { - const env = new jasmineUnderTest.Env(); + const env = new privateUnderTest.Env(); env.it('spec using custom asymmetric equality tester', function() { const customEqualityFn = function(a, b) { @@ -3224,17 +3226,17 @@ describe('Env integration', function() { }); it('is resolved after the stack is cleared', function(done) { - const realClearStack = jasmineUnderTest.getClearStack( + const realClearStack = privateUnderTest.getClearStack( jasmineUnderTest.getGlobal() ), clearStackSpy = jasmine .createSpy('clearStack') .and.callFake(realClearStack); - spyOn(jasmineUnderTest, 'getClearStack').and.returnValue(clearStackSpy); + spyOn(privateUnderTest, 'getClearStack').and.returnValue(clearStackSpy); // Create a new env that has the clearStack defined above env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.describe('suite', function() { env.it('spec', function() {}); @@ -3262,7 +3264,7 @@ describe('Env integration', function() { jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 123456; // a distinctive value - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.describe('suite', function() { env.it('spec', function() {}); @@ -3333,17 +3335,17 @@ describe('Env integration', function() { }); it('is called after the stack is cleared', async function() { - const realClearStack = jasmineUnderTest.getClearStack( + const realClearStack = privateUnderTest.getClearStack( jasmineUnderTest.getGlobal() ), clearStackSpy = jasmine .createSpy('clearStack') .and.callFake(realClearStack); - spyOn(jasmineUnderTest, 'getClearStack').and.returnValue(clearStackSpy); + spyOn(privateUnderTest, 'getClearStack').and.returnValue(clearStackSpy); // Create a new env that has the clearStack defined above env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.describe('suite', function() { env.it('spec', function() {}); @@ -3371,7 +3373,7 @@ describe('Env integration', function() { jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 123456; // a distinctive value - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.describe('suite', function() { env.it('spec', function() {}); diff --git a/spec/core/integration/GlobalErrorHandlingSpec.js b/spec/core/integration/GlobalErrorHandlingSpec.js index 55e5ac47..ef60ea5e 100644 --- a/spec/core/integration/GlobalErrorHandlingSpec.js +++ b/spec/core/integration/GlobalErrorHandlingSpec.js @@ -4,7 +4,7 @@ describe('Global error handling (integration)', function() { beforeEach(function() { specHelpers.registerIntegrationMatchers(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { @@ -28,7 +28,7 @@ describe('Global error handling (integration)', function() { spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); const reporter = jasmine.createSpyObj('reporter', [ 'jasmineDone', 'suiteDone', @@ -85,12 +85,12 @@ describe('Global error handling (integration)', function() { onerror: originalOnerror }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); - const globalErrors = new jasmineUnderTest.GlobalErrors(global); + const globalErrors = new privateUnderTest.GlobalErrors(global); const onerror = jasmine.createSpy('onerror'); globalErrors.pushListener(onerror); env.cleanup_(); - env = new jasmineUnderTest.Env({ + env = new privateUnderTest.Env({ suppressLoadErrors: true, GlobalErrors: function() { return globalErrors; @@ -129,7 +129,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); const reporter = jasmine.createSpyObj('fakeReporter', [ 'specDone', 'suiteDone' @@ -170,10 +170,10 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); - const realClearStack = jasmineUnderTest.getClearStack(global); + const realClearStack = privateUnderTest.getClearStack(global); const clearStackCallbacks = {}; let clearStackCallCount = 0; - spyOn(jasmineUnderTest, 'getClearStack').and.returnValue(function(fn) { + spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) { clearStackCallCount++; if (clearStackCallbacks[clearStackCallCount]) { @@ -184,7 +184,7 @@ describe('Global error handling (integration)', function() { }); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); let suiteErrors = []; env.addReporter({ @@ -234,7 +234,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); const reporter = jasmine.createSpyObj('fakeReporter', [ 'specDone', 'suiteDone' @@ -287,10 +287,10 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); - const realClearStack = jasmineUnderTest.getClearStack(global); + const realClearStack = privateUnderTest.getClearStack(global); const clearStackCallbacks = {}; let clearStackCallCount = 0; - spyOn(jasmineUnderTest, 'getClearStack').and.returnValue(function(fn) { + spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) { clearStackCallCount++; if (clearStackCallbacks[clearStackCallCount]) { @@ -301,7 +301,7 @@ describe('Global error handling (integration)', function() { }); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); let suiteErrors = []; env.addReporter({ @@ -355,7 +355,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); spyOn(console, 'error'); @@ -398,12 +398,12 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); - const realClearStack = jasmineUnderTest.getClearStack(global); + const realClearStack = privateUnderTest.getClearStack(global); let clearStackCallCount = 0; let jasmineDone = false; const expectedErrors = []; const expectedErrorsAfterJasmineDone = []; - spyOn(jasmineUnderTest, 'getClearStack').and.returnValue(function(fn) { + spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) { clearStackCallCount++; const msg = `Error in clearStack #${clearStackCallCount}`; @@ -419,7 +419,7 @@ describe('Global error handling (integration)', function() { spyOn(console, 'error'); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); const receivedErrors = []; function logErrors(event) { @@ -473,7 +473,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); const reporter = jasmine.createSpyObj('fakeReporter', [ 'specDone', 'suiteDone' @@ -516,10 +516,10 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); - const realClearStack = jasmineUnderTest.getClearStack(global); + const realClearStack = privateUnderTest.getClearStack(global); const clearStackCallbacks = {}; let clearStackCallCount = 0; - spyOn(jasmineUnderTest, 'getClearStack').and.returnValue(function(fn) { + spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) { clearStackCallCount++; if (clearStackCallbacks[clearStackCallCount]) { @@ -530,7 +530,7 @@ describe('Global error handling (integration)', function() { }); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); let suiteErrors = []; env.addReporter({ @@ -580,7 +580,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); const reporter = jasmine.createSpyObj('fakeReporter', [ 'specDone', 'suiteDone' @@ -635,10 +635,10 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); - const realClearStack = jasmineUnderTest.getClearStack(global); + const realClearStack = privateUnderTest.getClearStack(global); const clearStackCallbacks = {}; let clearStackCallCount = 0; - spyOn(jasmineUnderTest, 'getClearStack').and.returnValue(function(fn) { + spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) { clearStackCallCount++; if (clearStackCallbacks[clearStackCallCount]) { @@ -649,7 +649,7 @@ describe('Global error handling (integration)', function() { }); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); let suiteErrors = []; env.addReporter({ @@ -703,7 +703,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); spyOn(console, 'error'); @@ -748,12 +748,12 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); - const realClearStack = jasmineUnderTest.getClearStack(global); + const realClearStack = privateUnderTest.getClearStack(global); let clearStackCallCount = 0; let jasmineDone = false; const expectedErrors = []; const expectedErrorsAfterJasmineDone = []; - spyOn(jasmineUnderTest, 'getClearStack').and.returnValue(function(fn) { + spyOn(privateUnderTest, 'getClearStack').and.returnValue(function(fn) { clearStackCallCount++; const reason = `Error in clearStack #${clearStackCallCount}`; const expectedMsg = `Unhandled promise rejection: ${reason} thrown`; @@ -770,7 +770,7 @@ describe('Global error handling (integration)', function() { spyOn(console, 'error'); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); const receivedErrors = []; function logErrors(event) { @@ -833,7 +833,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ detectLateRejectionHandling: true }); reporter = jasmine.createSpyObj('fakeReporter', [ @@ -980,7 +980,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ detectLateRejectionHandling: true }); const reporter = jasmine.createSpyObj('fakeReporter', [ 'specDone', @@ -1026,7 +1026,7 @@ describe('Global error handling (integration)', function() { }; spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global); env.cleanup_(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ autoCleanClosures: false }); const reporter = jasmine.createSpyObj('fakeReporter', ['specDone']); diff --git a/spec/core/integration/MatchersSpec.js b/spec/core/integration/MatchersSpec.js index 323114bd..f1987b69 100755 --- a/spec/core/integration/MatchersSpec.js +++ b/spec/core/integration/MatchersSpec.js @@ -2,7 +2,7 @@ describe('Matchers (Integration)', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { @@ -143,7 +143,7 @@ describe('Matchers (Integration)', function() { function verifyFailsWithCustomObjectFormattersAsync(config) { it('uses custom object formatters', async function() { - const env = new jasmineUnderTest.Env(); + const env = new privateUnderTest.Env(); env.it('a spec', function() { env.addCustomObjectFormatter(config.formatter); return config.expectations(env); diff --git a/spec/core/integration/ParallelSpec.js b/spec/core/integration/ParallelSpec.js index 4381c225..4921478c 100644 --- a/spec/core/integration/ParallelSpec.js +++ b/spec/core/integration/ParallelSpec.js @@ -2,7 +2,7 @@ describe('Support for parallel execution', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { diff --git a/spec/core/integration/SpecRunningSpec.js b/spec/core/integration/SpecRunningSpec.js index 06ae0552..932c6788 100644 --- a/spec/core/integration/SpecRunningSpec.js +++ b/spec/core/integration/SpecRunningSpec.js @@ -3,7 +3,7 @@ describe('spec running', function() { beforeEach(function() { specHelpers.registerIntegrationMatchers(); - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); env.configure({ random: false }); }); diff --git a/spec/core/jasmineNamespaceSpec.js b/spec/core/jasmineNamespaceSpec.js new file mode 100644 index 00000000..95c7c0ed --- /dev/null +++ b/spec/core/jasmineNamespaceSpec.js @@ -0,0 +1,77 @@ +describe('The jasmine namespace', function() { + it('includes all expected properties', function() { + const actualKeys = new Set(Object.keys(jasmineUnderTest)); + // toEqual doesn't generate diffs for set comparisons. Check this way + // instead so we get readable failure output. + expect(setDifference(expectedKeys(), actualKeys)).toEqual(new Set()); + }); + + it('does not include any unexpected properties', function() { + const actualKeys = new Set(Object.keys(jasmineUnderTest)); + // toEqual doesn't generate diffs for set comparisons. Check this way + // instead so we get readable failure output. + expect(setDifference(actualKeys, expectedKeys())).toEqual(new Set()); + }); + + function expectedKeys() { + // Does not include properties added by requireInterface(), since that isn't + // called by defineJasmineUnderTest.js/nodeDefineJasmineUnderTest.js. + const result = new Set([ + 'MAX_PRETTY_PRINT_ARRAY_LENGTH', + 'MAX_PRETTY_PRINT_CHARS', + 'MAX_PRETTY_PRINT_DEPTH', + 'debugLog', + 'getEnv', + 'isSpy', + 'ParallelReportDispatcher', + 'private', + 'spyOnGlobalErrorsAsync', + 'Timer', + 'version', + + // Asymmetric equality testers + 'any', + 'anything', + 'arrayContaining', + 'arrayWithExactContents', + 'empty', + 'falsy', + 'is', + 'mapContaining', + 'notEmpty', + 'objectContaining', + 'setContaining', + 'stringContaining', + 'stringMatching', + 'truthy', + + // Currently undocumented but used in browser boot files, so it's + // effectively public + 'getGlobal' + ]); + + if (typeof window !== 'undefined') { + // jasmine-html.js + result.add('HtmlReporter'); + result.add('HtmlSpecFilter'); + result.add('HtmlExactSpecFilter'); + result.add('QueryString'); + } + + return result; + } + + // Can't use Set#difference yet because it isn't available in Node <22, + // Firefox <108, or Safari <17. + function setDifference(a, b) { + const result = new Set(); + + for (const v of a) { + if (!b.has(v)) { + result.add(v); + } + } + + return result; + } +}); diff --git a/spec/core/matchers/DiffBuilderSpec.js b/spec/core/matchers/DiffBuilderSpec.js index f134f214..f5bf1fa5 100644 --- a/spec/core/matchers/DiffBuilderSpec.js +++ b/spec/core/matchers/DiffBuilderSpec.js @@ -1,6 +1,6 @@ describe('DiffBuilder', function() { it('records the actual and expected objects', function() { - const diffBuilder = new jasmineUnderTest.DiffBuilder(); + const diffBuilder = new privateUnderTest.DiffBuilder(); diffBuilder.setRoots({ x: 'actual' }, { x: 'expected' }); diffBuilder.recordMismatch(); @@ -10,7 +10,7 @@ describe('DiffBuilder', function() { }); it('prints the path at which the difference was found', function() { - const diffBuilder = new jasmineUnderTest.DiffBuilder(); + const diffBuilder = new privateUnderTest.DiffBuilder(); diffBuilder.setRoots({ foo: { x: 'actual' } }, { foo: { x: 'expected' } }); diffBuilder.withPath('foo', function() { @@ -23,7 +23,7 @@ describe('DiffBuilder', function() { }); it('prints multiple messages, separated by newlines', function() { - const diffBuilder = new jasmineUnderTest.DiffBuilder(); + const diffBuilder = new privateUnderTest.DiffBuilder(); diffBuilder.setRoots({ foo: 1, bar: 3 }, { foo: 2, bar: 4 }); diffBuilder.withPath('foo', function() { @@ -40,7 +40,7 @@ describe('DiffBuilder', function() { }); it('allows customization of the message', function() { - const diffBuilder = new jasmineUnderTest.DiffBuilder(); + const diffBuilder = new privateUnderTest.DiffBuilder(); diffBuilder.setRoots({ x: 'bar' }, { x: 'foo' }); function darthVaderFormatter(actual, expected, path) { @@ -68,7 +68,7 @@ describe('DiffBuilder', function() { const prettyPrinter = function(val) { return '|' + val + '|'; }, - diffBuilder = new jasmineUnderTest.DiffBuilder({ + diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }); prettyPrinter.customFormat_ = function() {}; @@ -86,7 +86,7 @@ describe('DiffBuilder', function() { it('passes the injected pretty-printer to the diff formatter', function() { const diffFormatter = jasmine.createSpy('diffFormatter'), prettyPrinter = function() {}, - diffBuilder = new jasmineUnderTest.DiffBuilder({ + diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }); prettyPrinter.customFormat_ = function() {}; @@ -112,8 +112,8 @@ describe('DiffBuilder', function() { return '[number:' + x + ']'; } }; - const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]); - const diffBuilder = new jasmineUnderTest.DiffBuilder({ + const prettyPrinter = privateUnderTest.makePrettyPrinter([formatter]); + const diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }); @@ -131,8 +131,8 @@ describe('DiffBuilder', function() { return '[thing with a=' + x.a + ', b=' + JSON.stringify(x.b) + ']'; } }; - const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]); - const diffBuilder = new jasmineUnderTest.DiffBuilder({ + const prettyPrinter = privateUnderTest.makePrettyPrinter([formatter]); + const diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }); const expectedMsg = @@ -167,8 +167,8 @@ describe('DiffBuilder', function() { return '[number:' + x + ']'; } }; - const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]); - const diffBuilder = new jasmineUnderTest.DiffBuilder({ + const prettyPrinter = privateUnderTest.makePrettyPrinter([formatter]); + const diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }); @@ -186,8 +186,8 @@ describe('DiffBuilder', function() { return '[number:' + x + ']'; } }; - const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]); - const diffBuilder = new jasmineUnderTest.DiffBuilder({ + const prettyPrinter = privateUnderTest.makePrettyPrinter([formatter]); + const diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }); @@ -205,8 +205,8 @@ describe('DiffBuilder', function() { return '[number:' + x + ']'; } }; - const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]); - const diffBuilder = new jasmineUnderTest.DiffBuilder({ + const prettyPrinter = privateUnderTest.makePrettyPrinter([formatter]); + const diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }); @@ -219,8 +219,8 @@ describe('DiffBuilder', function() { }); it('builds diffs involving asymmetric equality testers that implement valuesForDiff_ at the root', function() { - const prettyPrinter = jasmineUnderTest.makePrettyPrinter([]), - diffBuilder = new jasmineUnderTest.DiffBuilder({ + const prettyPrinter = privateUnderTest.makePrettyPrinter([]), + diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }), expectedMsg = @@ -243,8 +243,8 @@ describe('DiffBuilder', function() { }); it('builds diffs involving asymmetric equality testers that implement valuesForDiff_ below the root', function() { - const prettyPrinter = jasmineUnderTest.makePrettyPrinter([]), - diffBuilder = new jasmineUnderTest.DiffBuilder({ + const prettyPrinter = privateUnderTest.makePrettyPrinter([]), + diffBuilder = new privateUnderTest.DiffBuilder({ prettyPrinter: prettyPrinter }), expectedMsg = diff --git a/spec/core/matchers/MismatchTreeSpec.js b/spec/core/matchers/MismatchTreeSpec.js index ad35ed84..28ef8220 100644 --- a/spec/core/matchers/MismatchTreeSpec.js +++ b/spec/core/matchers/MismatchTreeSpec.js @@ -2,25 +2,25 @@ describe('MismatchTree', function() { describe('#add', function() { describe('When the path is empty', function() { it('flags the root node as mismatched', function() { - const tree = new jasmineUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath([])); + const tree = new privateUnderTest.MismatchTree(); + tree.add(new privateUnderTest.ObjectPath([])); expect(tree.isMismatch).toBe(true); }); }); describe('When the path is not empty', function() { it('flags the node as mismatched', function() { - const tree = new jasmineUnderTest.MismatchTree(); + const tree = new privateUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath(['a', 'b'])); + tree.add(new privateUnderTest.ObjectPath(['a', 'b'])); expect(tree.child('a').child('b').isMismatch).toBe(true); }); it('does not flag ancestors as mismatched', function() { - const tree = new jasmineUnderTest.MismatchTree(); + const tree = new privateUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath(['a', 'b'])); + tree.add(new privateUnderTest.ObjectPath(['a', 'b'])); expect(tree.isMismatch).toBe(false); expect(tree.child('a').isMismatch).toBe(false); @@ -28,9 +28,9 @@ describe('MismatchTree', function() { }); it('stores the formatter on only the target node', function() { - const tree = new jasmineUnderTest.MismatchTree(); + const tree = new privateUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']), formatter); + tree.add(new privateUnderTest.ObjectPath(['a', 'b']), formatter); expect(tree.formatter).toBeFalsy(); expect(tree.child('a').formatter).toBeFalsy(); @@ -38,9 +38,9 @@ describe('MismatchTree', function() { }); it('stores the path to the node', function() { - const tree = new jasmineUnderTest.MismatchTree(); + const tree = new privateUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']), formatter); + tree.add(new privateUnderTest.ObjectPath(['a', 'b']), formatter); expect(tree.child('a').child('b').path.components).toEqual(['a', 'b']); }); @@ -48,37 +48,37 @@ describe('MismatchTree', function() { describe('#traverse', function() { it('calls the callback for all nodes that are or contain mismatches', function() { - const tree = new jasmineUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']), formatter); - tree.add(new jasmineUnderTest.ObjectPath(['c'])); + const tree = new privateUnderTest.MismatchTree(); + tree.add(new privateUnderTest.ObjectPath(['a', 'b']), formatter); + tree.add(new privateUnderTest.ObjectPath(['c'])); const visit = jasmine.createSpy('visit').and.returnValue(true); tree.traverse(visit); expect(visit).toHaveBeenCalledWith( - new jasmineUnderTest.ObjectPath([]), + new privateUnderTest.ObjectPath([]), false, undefined ); expect(visit).toHaveBeenCalledWith( - new jasmineUnderTest.ObjectPath(['a']), + new privateUnderTest.ObjectPath(['a']), false, undefined ); expect(visit).toHaveBeenCalledWith( - new jasmineUnderTest.ObjectPath(['a', 'b']), + new privateUnderTest.ObjectPath(['a', 'b']), true, formatter ); expect(visit).toHaveBeenCalledWith( - new jasmineUnderTest.ObjectPath(['c']), + new privateUnderTest.ObjectPath(['c']), true, undefined ); }); it('does not call the callback if there are no mismatches', function() { - const tree = new jasmineUnderTest.MismatchTree(); + const tree = new privateUnderTest.MismatchTree(); const visit = jasmine.createSpy('visit'); tree.traverse(visit); @@ -87,8 +87,8 @@ describe('MismatchTree', function() { }); it('visits parents before children', function() { - const tree = new jasmineUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath(['a', 'b'])); + const tree = new privateUnderTest.MismatchTree(); + tree.add(new privateUnderTest.ObjectPath(['a', 'b'])); const visited = []; tree.traverse(function(path) { @@ -97,16 +97,16 @@ describe('MismatchTree', function() { }); expect(visited).toEqual([ - new jasmineUnderTest.ObjectPath([]), - new jasmineUnderTest.ObjectPath(['a']), - new jasmineUnderTest.ObjectPath(['a', 'b']) + new privateUnderTest.ObjectPath([]), + new privateUnderTest.ObjectPath(['a']), + new privateUnderTest.ObjectPath(['a', 'b']) ]); }); it('visits children in the order they were recorded', function() { - const tree = new jasmineUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath(['length'])); - tree.add(new jasmineUnderTest.ObjectPath([1])); + const tree = new privateUnderTest.MismatchTree(); + tree.add(new privateUnderTest.ObjectPath(['length'])); + tree.add(new privateUnderTest.ObjectPath([1])); const visited = []; tree.traverse(function(path) { @@ -115,15 +115,15 @@ describe('MismatchTree', function() { }); expect(visited).toEqual([ - new jasmineUnderTest.ObjectPath([]), - new jasmineUnderTest.ObjectPath(['length']), - new jasmineUnderTest.ObjectPath([1]) + new privateUnderTest.ObjectPath([]), + new privateUnderTest.ObjectPath(['length']), + new privateUnderTest.ObjectPath([1]) ]); }); it('does not visit children if the callback returns falsy', function() { - const tree = new jasmineUnderTest.MismatchTree(); - tree.add(new jasmineUnderTest.ObjectPath(['a', 'b'])); + const tree = new privateUnderTest.MismatchTree(); + tree.add(new privateUnderTest.ObjectPath(['a', 'b'])); const visited = []; tree.traverse(function(path) { @@ -132,8 +132,8 @@ describe('MismatchTree', function() { }); expect(visited).toEqual([ - new jasmineUnderTest.ObjectPath([]), - new jasmineUnderTest.ObjectPath(['a']) + new privateUnderTest.ObjectPath([]), + new privateUnderTest.ObjectPath(['a']) ]); }); }); diff --git a/spec/core/matchers/NullDiffBuilderSpec.js b/spec/core/matchers/NullDiffBuilderSpec.js index 41fb1f97..8c782f81 100644 --- a/spec/core/matchers/NullDiffBuilderSpec.js +++ b/spec/core/matchers/NullDiffBuilderSpec.js @@ -1,7 +1,7 @@ describe('NullDiffBuilder', function() { it('responds to withPath() by calling the passed function', function() { const spy = jasmine.createSpy('callback'); - jasmineUnderTest.NullDiffBuilder().withPath('does not matter', spy); + privateUnderTest.NullDiffBuilder().withPath('does not matter', spy); expect(spy).toHaveBeenCalled(); }); }); diff --git a/spec/core/matchers/ObjectPathSpec.js b/spec/core/matchers/ObjectPathSpec.js index 80938f5a..4bf9356c 100644 --- a/spec/core/matchers/ObjectPathSpec.js +++ b/spec/core/matchers/ObjectPathSpec.js @@ -1,5 +1,5 @@ describe('ObjectPath', function() { - const ObjectPath = jasmineUnderTest.ObjectPath; + const ObjectPath = privateUnderTest.ObjectPath; it('represents the path to a node in an object tree', function() { expect(new ObjectPath(['foo', 'bar']).toString()).toEqual('$.foo.bar'); diff --git a/spec/core/matchers/async/toBePendingSpec.js b/spec/core/matchers/async/toBePendingSpec.js index 86cb5eb0..4445677e 100644 --- a/spec/core/matchers/async/toBePendingSpec.js +++ b/spec/core/matchers/async/toBePendingSpec.js @@ -1,7 +1,7 @@ describe('toBePending', function() { it('passes if the actual promise is pending', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBePending(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBePending(matchersUtil), actual = new Promise(function() {}); return matcher.compare(actual).then(function(result) { @@ -10,8 +10,8 @@ describe('toBePending', function() { }); it('fails if the actual promise is resolved', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBePending(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBePending(matchersUtil), actual = Promise.resolve(); return matcher.compare(actual).then(function(result) { @@ -20,8 +20,8 @@ describe('toBePending', function() { }); it('fails if the actual promise is rejected', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBePending(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBePending(matchersUtil), actual = Promise.reject(new Error('promise was rejected')); return matcher.compare(actual).then(function(result) { @@ -30,8 +30,8 @@ describe('toBePending', function() { }); it('fails if actual is not a promise', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBePending(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBePending(matchersUtil), actual = 'not a promise'; function f() { diff --git a/spec/core/matchers/async/toBeRejectedSpec.js b/spec/core/matchers/async/toBeRejectedSpec.js index 83c6bb17..fc52c67c 100644 --- a/spec/core/matchers/async/toBeRejectedSpec.js +++ b/spec/core/matchers/async/toBeRejectedSpec.js @@ -1,7 +1,7 @@ describe('toBeRejected', function() { it('passes if the actual is rejected', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBeRejected(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBeRejected(matchersUtil), actual = Promise.reject('AsyncExpectationSpec rejection'); return matcher.compare(actual).then(function(result) { @@ -10,8 +10,8 @@ describe('toBeRejected', function() { }); it('fails if the actual is resolved', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBeRejected(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBeRejected(matchersUtil), actual = Promise.resolve(); return matcher.compare(actual).then(function(result) { @@ -20,8 +20,8 @@ describe('toBeRejected', function() { }); it('fails if actual is not a promise', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBeRejected(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBeRejected(matchersUtil), actual = 'not a promise'; function f() { diff --git a/spec/core/matchers/async/toBeRejectedWithErrorSpec.js b/spec/core/matchers/async/toBeRejectedWithErrorSpec.js index ae36dae7..da6967ec 100644 --- a/spec/core/matchers/async/toBeRejectedWithErrorSpec.js +++ b/spec/core/matchers/async/toBeRejectedWithErrorSpec.js @@ -1,9 +1,9 @@ describe('#toBeRejectedWithError', function() { it('passes when Error type matches', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new TypeError('foo')); @@ -20,10 +20,10 @@ describe('#toBeRejectedWithError', function() { }); it('passes when Error type and message matches', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new TypeError('foo')); @@ -40,10 +40,10 @@ describe('#toBeRejectedWithError', function() { }); it('passes when Error matches and is exactly Error', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new Error()); @@ -60,10 +60,10 @@ describe('#toBeRejectedWithError', function() { }); it('passes when Error message matches a string', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new Error('foo')); @@ -80,10 +80,10 @@ describe('#toBeRejectedWithError', function() { }); it('passes when Error message matches a RegExp', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new Error('foo')); @@ -100,10 +100,10 @@ describe('#toBeRejectedWithError', function() { }); it('passes when Error message is empty', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new Error()); @@ -120,10 +120,10 @@ describe('#toBeRejectedWithError', function() { }); it('passes when no arguments', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new Error()); @@ -140,10 +140,10 @@ describe('#toBeRejectedWithError', function() { }); it('fails when resolved', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.resolve(new Error('foo')); @@ -159,10 +159,10 @@ describe('#toBeRejectedWithError', function() { }); it('fails when rejected with non Error type', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject('foo'); @@ -179,10 +179,10 @@ describe('#toBeRejectedWithError', function() { }); it('fails when Error type mismatches', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new Error('foo')); @@ -199,10 +199,10 @@ describe('#toBeRejectedWithError', function() { }); it('fails when Error message mismatches', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = Promise.reject(new Error('foo')); @@ -219,10 +219,10 @@ describe('#toBeRejectedWithError', function() { }); it('fails if actual is not a promise', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError( + matcher = privateUnderTest.asyncMatchers.toBeRejectedWithError( matchersUtil ), actual = 'not a promise'; diff --git a/spec/core/matchers/async/toBeRejectedWithSpec.js b/spec/core/matchers/async/toBeRejectedWithSpec.js index 02661e47..20a7d97b 100644 --- a/spec/core/matchers/async/toBeRejectedWithSpec.js +++ b/spec/core/matchers/async/toBeRejectedWithSpec.js @@ -1,7 +1,7 @@ describe('#toBeRejectedWith', function() { it('should return true if the promise is rejected with the expected value', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), actual = Promise.reject({ error: 'PEBCAK' }); return matcher.compare(actual, { error: 'PEBCAK' }).then(function(result) { @@ -10,8 +10,8 @@ describe('#toBeRejectedWith', function() { }); it('should fail if the promise resolves', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), actual = Promise.resolve(); return matcher.compare(actual, '').then(function(result) { @@ -20,10 +20,10 @@ describe('#toBeRejectedWith', function() { }); it('should fail if the promise is rejected with a different value', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), actual = Promise.reject('A Bad Apple'); return matcher.compare(actual, 'Some Cool Thing').then(function(result) { @@ -38,10 +38,10 @@ describe('#toBeRejectedWith', function() { }); it('should build its error correctly when negated', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), actual = Promise.reject(true); return matcher.compare(actual, true).then(function(result) { @@ -60,10 +60,10 @@ describe('#toBeRejectedWith', function() { return true; } ], - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: customEqualityTesters }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), actual = Promise.reject('actual'); return matcher.compare(actual, 'expected').then(function(result) { @@ -72,10 +72,10 @@ describe('#toBeRejectedWith', function() { }); it('fails if actual is not a promise', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil), actual = 'not a promise'; function f() { diff --git a/spec/core/matchers/async/toBeResolvedSpec.js b/spec/core/matchers/async/toBeResolvedSpec.js index 6d6a784d..5d34af95 100644 --- a/spec/core/matchers/async/toBeResolvedSpec.js +++ b/spec/core/matchers/async/toBeResolvedSpec.js @@ -1,7 +1,7 @@ describe('toBeResolved', function() { it('passes if the actual is resolved', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBeResolved(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBeResolved(matchersUtil), actual = Promise.resolve(); return matcher.compare(actual).then(function(result) { @@ -10,10 +10,10 @@ describe('toBeResolved', function() { }); it('fails if the actual is rejected', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter([]) + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter([]) }), - matcher = jasmineUnderTest.asyncMatchers.toBeResolved(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeResolved(matchersUtil), actual = Promise.reject(new Error('AsyncExpectationSpec rejection')); return matcher.compare(actual).then(function(result) { @@ -27,8 +27,8 @@ describe('toBeResolved', function() { }); it('fails if actual is not a promise', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBeResolved(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBeResolved(matchersUtil), actual = 'not a promise'; function f() { diff --git a/spec/core/matchers/async/toBeResolvedToSpec.js b/spec/core/matchers/async/toBeResolvedToSpec.js index a0c8ee6b..e0f1f57d 100644 --- a/spec/core/matchers/async/toBeResolvedToSpec.js +++ b/spec/core/matchers/async/toBeResolvedToSpec.js @@ -1,7 +1,7 @@ describe('#toBeResolvedTo', function() { it('passes if the promise is resolved to the expected value', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), actual = Promise.resolve({ foo: 42 }); return matcher.compare(actual, { foo: 42 }).then(function(result) { @@ -10,10 +10,10 @@ describe('#toBeResolvedTo', function() { }); it('fails if the promise is rejected', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), actual = Promise.reject(new Error('AsyncExpectationSpec error')); return matcher.compare(actual, '').then(function(result) { @@ -29,10 +29,10 @@ describe('#toBeResolvedTo', function() { }); it('fails if the promise is resolved to a different value', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), actual = Promise.resolve({ foo: 17 }); return matcher.compare(actual, { foo: 42 }).then(function(result) { @@ -47,10 +47,10 @@ describe('#toBeResolvedTo', function() { }); it('builds its message correctly when negated', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), actual = Promise.resolve(true); return matcher.compare(actual, true).then(function(result) { @@ -69,11 +69,11 @@ describe('#toBeResolvedTo', function() { return true; } ], - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: customEqualityTesters, - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), actual = Promise.resolve('actual'); return matcher.compare(actual, 'expected').then(function(result) { @@ -82,10 +82,10 @@ describe('#toBeResolvedTo', function() { }); it('fails if actual is not a promise', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), + matcher = privateUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil), actual = 'not a promise'; function f() { diff --git a/spec/core/matchers/matchersUtilSpec.js b/spec/core/matchers/matchersUtilSpec.js index 747fca59..98656b37 100644 --- a/spec/core/matchers/matchersUtilSpec.js +++ b/spec/core/matchers/matchersUtilSpec.js @@ -1,79 +1,79 @@ describe('matchersUtil', function() { it('exposes the injected pretty-printer as .pp', function() { const pp = function() {}, - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }); + matchersUtil = new privateUnderTest.MatchersUtil({ pp: pp }); expect(matchersUtil.pp).toBe(pp); }); describe('equals', function() { it('passes for literals that are triple-equal', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(null, null)).toBe(true); expect(matchersUtil.equals(void 0, void 0)).toBe(true); }); it('fails for things that are not equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals({ a: 'foo' }, 1)).toBe(false); }); it('passes for Strings that are equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals('foo', 'foo')).toBe(true); }); it('fails for Strings that are not equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals('foo', 'bar')).toBe(false); }); it('passes for Numbers that are equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(123, 123)).toBe(true); }); it('fails for Numbers that are not equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(123, 456)).toBe(false); }); it('fails for a Number and a String that have equivalent values', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(123, '123')).toBe(false); }); it('passes for Dates that are equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect( matchersUtil.equals(new Date('Jan 1, 1970'), new Date('Jan 1, 1970')) ).toBe(true); }); it('fails for Dates that are not equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect( matchersUtil.equals(new Date('Jan 1, 1970'), new Date('Feb 3, 1991')) ).toBe(false); }); it('passes for Booleans that are equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(true, true)).toBe(true); }); it('fails for Booleans that are not equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(true, false)).toBe(false); }); it('passes for RegExps that are equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(/foo/, /foo/)).toBe(true); }); it('fails for RegExps that are not equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(/foo/, /bar/)).toBe(false); expect( matchersUtil.equals(new RegExp('foo', 'i'), new RegExp('foo')) @@ -81,32 +81,32 @@ describe('matchersUtil', function() { }); it('passes for Arrays that are equivalent', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals([1, 2], [1, 2])).toBe(true); }); it('passes for Arrays that are equivalent, with elements added by changing length', function() { const foo = [], - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); foo.length = 1; expect(matchersUtil.equals(foo, [undefined])).toBe(true); }); it('fails for Arrays that have different lengths', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals([1, 2], [1, 2, 3])).toBe(false); }); it('fails for Arrays that have different elements', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals([1, 2, 3], [1, 5, 3])).toBe(false); }); it('fails for Arrays whose contents are equivalent, but have differing properties', function() { const one = [1, 2, 3], two = [1, 2, 3], - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); one.foo = 'bar'; two.foo = 'baz'; @@ -117,7 +117,7 @@ describe('matchersUtil', function() { it('passes for Arrays with equivalent contents and properties', function() { const one = [1, 2, 3], two = [1, 2, 3], - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); one.foo = 'bar'; two.foo = 'bar'; @@ -126,7 +126,7 @@ describe('matchersUtil', function() { }); it('handles symbol keys in Arrays', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), + const matchersUtil = new privateUnderTest.MatchersUtil(), sym = Symbol('foo'), arr1 = []; let arr2 = []; @@ -148,21 +148,21 @@ describe('matchersUtil', function() { }); it('passes for Errors that are the same type and have the same message', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(new Error('foo'), new Error('foo'))).toBe( true ); }); it('fails for Errors that are the same type and have different messages', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(new Error('foo'), new Error('bar'))).toBe( false ); }); it('fails for objects with different constructors', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); function One() {} function Two() {} @@ -170,17 +170,17 @@ describe('matchersUtil', function() { }); it('passes for Objects that are equivalent (simple case)', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals({ a: 'foo' }, { a: 'foo' })).toBe(true); }); it('fails for Objects that are not equivalent (simple case)', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals({ a: 'foo' }, { a: 'bar' })).toBe(false); }); it('passes for Objects that are equivalent (deep case)', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect( matchersUtil.equals( { a: 'foo', b: { c: 'bar' } }, @@ -190,7 +190,7 @@ describe('matchersUtil', function() { }); it('fails for Objects that are not equivalent (deep case)', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect( matchersUtil.equals( { a: 'foo', b: { c: 'baz' } }, @@ -202,7 +202,7 @@ describe('matchersUtil', function() { it('passes for Objects that are equivalent (with cycles)', function() { const actual = { a: 'foo' }, expected = { a: 'foo' }, - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); actual.b = actual; expected.b = actual; @@ -213,7 +213,7 @@ describe('matchersUtil', function() { it('fails for Objects that are not equivalent (with cycles)', function() { const actual = { a: 'foo' }, expected = { a: 'bar' }, - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); actual.b = actual; expected.b = actual; @@ -224,7 +224,7 @@ describe('matchersUtil', function() { it('fails for Objects that have the same number of keys, but different keys/values', function() { const expected = { a: undefined }, actual = { b: 1 }, - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(actual, expected)).toBe(false); }); @@ -232,7 +232,7 @@ describe('matchersUtil', function() { it('fails when comparing an empty object to an empty array (issue #114)', function() { const emptyObject = {}, emptyArray = [], - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(emptyObject, emptyArray)).toBe(false); expect(matchersUtil.equals(emptyArray, emptyObject)).toBe(false); @@ -241,7 +241,7 @@ describe('matchersUtil', function() { it('passes for equivalent frozen objects (GitHub issue #266)', function() { const a = { foo: 1 }, b = { foo: 1 }, - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); Object.freeze(a); Object.freeze(b); @@ -252,7 +252,7 @@ describe('matchersUtil', function() { it('passes for equivalent Promises (GitHub issue #1314)', function() { const p1 = new Promise(function() {}), p2 = new Promise(function() {}), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(p1, p1)).toBe(true); expect(matchersUtil.equals(p1, p2)).toBe(false); @@ -267,7 +267,7 @@ describe('matchersUtil', function() { it('passes for equivalent DOM nodes', function() { const a = document.createElement('div'); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); a.setAttribute('test-attr', 'attr-value'); a.appendChild(document.createTextNode('test')); @@ -280,7 +280,7 @@ describe('matchersUtil', function() { }); it('passes for equivalent objects from different frames', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const iframe = document.createElement('iframe'); document.body.appendChild(iframe); iframe.contentWindow.eval('window.testObject = {}'); @@ -291,7 +291,7 @@ describe('matchersUtil', function() { }); it('fails for DOM nodes with different attributes or child nodes', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a = document.createElement('div'); a.setAttribute('test-attr', 'attr-value'); a.appendChild(document.createTextNode('test')); @@ -321,7 +321,7 @@ describe('matchersUtil', function() { }); it('passes for equivalent objects from different vm contexts', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const vm = require('vm'); const sandbox = { obj: null @@ -332,7 +332,7 @@ describe('matchersUtil', function() { }); it('passes for equivalent arrays from different vm contexts', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const vm = require('vm'); const sandbox = { arr: null @@ -345,8 +345,8 @@ describe('matchersUtil', function() { it('passes when Any is used', function() { const number = 3, - anyNumber = new jasmineUnderTest.Any(Number), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + anyNumber = new privateUnderTest.Any(Number), + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(number, anyNumber)).toBe(true); expect(matchersUtil.equals(anyNumber, number)).toBe(true); @@ -354,8 +354,8 @@ describe('matchersUtil', function() { it('fails when Any is compared to something unexpected', function() { const number = 3, - anyString = new jasmineUnderTest.Any(String), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + anyString = new privateUnderTest.Any(String), + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(number, anyString)).toBe(false); expect(matchersUtil.equals(anyString, number)).toBe(false); @@ -366,19 +366,19 @@ describe('matchersUtil', function() { foo: 3, bar: 7 }, - containing = new jasmineUnderTest.ObjectContaining({ foo: 3 }), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + containing = new privateUnderTest.ObjectContaining({ foo: 3 }), + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(obj, containing)).toBe(true); expect(matchersUtil.equals(containing, obj)).toBe(true); }); it('passes when MapContaining is used', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const obj = new Map(); obj.set(1, 2); obj.set('foo', 'bar'); - const containing = new jasmineUnderTest.MapContaining(new Map()); + const containing = new privateUnderTest.MapContaining(new Map()); containing.sample.set('foo', 'bar'); expect(matchersUtil.equals(obj, containing)).toBe(true); @@ -386,11 +386,11 @@ describe('matchersUtil', function() { }); it('passes when SetContaining is used', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const obj = new Set(); obj.add(1); obj.add('foo'); - const containing = new jasmineUnderTest.SetContaining(new Set()); + const containing = new privateUnderTest.SetContaining(new Set()); containing.sample.add(1); expect(matchersUtil.equals(obj, containing)).toBe(true); @@ -403,7 +403,7 @@ describe('matchersUtil', function() { return true; } }, - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(false, tester)).toBe(true); expect(matchersUtil.equals(tester, false)).toBe(true); @@ -415,7 +415,7 @@ describe('matchersUtil', function() { return false; } }, - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(true, tester)).toBe(false); expect(matchersUtil.equals(tester, true)).toBe(false); @@ -423,10 +423,10 @@ describe('matchersUtil', function() { it('passes when ArrayContaining is used', function() { const arr = ['foo', 'bar'], - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); expect( - matchersUtil.equals(arr, new jasmineUnderTest.ArrayContaining(['bar'])) + matchersUtil.equals(arr, new privateUnderTest.ArrayContaining(['bar'])) ).toBe(true); }); @@ -434,7 +434,7 @@ describe('matchersUtil', function() { const tester = function() { return true; }, - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester], pp: function() {} }); @@ -443,7 +443,7 @@ describe('matchersUtil', function() { }); it('passes for two empty Objects', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals({}, {})).toBe(true); }); @@ -453,7 +453,7 @@ describe('matchersUtil', function() { }; it('passes for two empty Objects', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ + const matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester], pp: function() {} }); @@ -465,7 +465,7 @@ describe('matchersUtil', function() { const tester = function() { return false; }, - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester], pp: function() {} }); @@ -482,7 +482,7 @@ describe('matchersUtil', function() { symmetricTester = function() { return false; }, - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [symmetricTester()], pp: function() {} }); @@ -492,9 +492,9 @@ describe('matchersUtil', function() { }); it('passes when an Any is compared to an Any that checks for the same type', function() { - const any1 = new jasmineUnderTest.Any(Function), - any2 = new jasmineUnderTest.Any(Function), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + const any1 = new privateUnderTest.Any(Function), + any2 = new privateUnderTest.Any(Function), + matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(any1, any2)).toBe(true); }); @@ -502,7 +502,7 @@ describe('matchersUtil', function() { it('passes for null prototype objects with same properties', function() { const objA = Object.create(null), objB = Object.create(null), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); objA.name = 'test'; objB.name = 'test'; @@ -513,7 +513,7 @@ describe('matchersUtil', function() { it('fails for null prototype objects with different properties', function() { const objA = Object.create(null), objB = Object.create(null), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); objA.name = 'test'; objB.test = 'name'; @@ -522,12 +522,12 @@ describe('matchersUtil', function() { }); it('passes when comparing two empty sets', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(new Set(), new Set())).toBe(true); }); it('passes when comparing identical sets', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const setA = new Set(); setA.add(6); setA.add(5); @@ -539,7 +539,7 @@ describe('matchersUtil', function() { }); it('passes when comparing identical sets with different insertion order and simple elements', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const setA = new Set(); setA.add(3); setA.add(6); @@ -551,7 +551,7 @@ describe('matchersUtil', function() { }); it('passes when comparing identical sets with different insertion order and complex elements 1', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const setA1 = new Set(); setA1.add(['a', 3]); setA1.add([6, 1]); @@ -576,7 +576,7 @@ describe('matchersUtil', function() { }); it('passes when comparing identical sets with different insertion order and complex elements 2', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const setA = new Set(); setA.add([[1, 2], [3, 4]]); setA.add([[5, 6], [7, 8]]); @@ -588,7 +588,7 @@ describe('matchersUtil', function() { }); it('fails for sets with different elements', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const setA = new Set(); setA.add(6); setA.add(3); @@ -602,7 +602,7 @@ describe('matchersUtil', function() { }); it('fails for sets of different size', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const setA = new Set(); setA.add(6); setA.add(3); @@ -615,12 +615,12 @@ describe('matchersUtil', function() { }); it('passes when comparing two empty maps', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(new Map(), new Map())).toBe(true); }); it('passes when comparing identical maps', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const mapA = new Map(); mapA.set(6, 5); const mapB = new Map(); @@ -629,7 +629,7 @@ describe('matchersUtil', function() { }); it('passes when comparing identical maps with different insertion order', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const mapA = new Map(); mapA.set('a', 3); mapA.set(6, 1); @@ -640,7 +640,7 @@ describe('matchersUtil', function() { }); it('fails for maps with different elements', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const mapA = new Map(); mapA.set(6, 3); mapA.set(5, 1); @@ -652,7 +652,7 @@ describe('matchersUtil', function() { }); it('fails for maps of different size', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const mapA = new Map(); mapA.set(6, 3); const mapB = new Map(); @@ -662,7 +662,7 @@ describe('matchersUtil', function() { }); it('passes when comparing two identical URLs', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect( matchersUtil.equals( @@ -673,7 +673,7 @@ describe('matchersUtil', function() { }); it('fails when comparing two different URLs', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), + const matchersUtil = new privateUnderTest.MatchersUtil(), url1 = new URL('http://localhost/1'); expect(matchersUtil.equals(url1, new URL('http://localhost/2'))).toBe( @@ -699,7 +699,7 @@ describe('matchersUtil', function() { it('passes for ArrayBuffers with same length and content', function() { const buffer1 = new ArrayBuffer(4); const buffer2 = new ArrayBuffer(4); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(buffer1, buffer2)).toBe(true); }); @@ -708,13 +708,13 @@ describe('matchersUtil', function() { const buffer2 = new ArrayBuffer(4); const array1 = new Uint8Array(buffer1); array1[0] = 1; - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.equals(buffer1, buffer2)).toBe(false); }); describe('Typed arrays', function() { it('fails for typed arrays of same length and contents but different types', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a1 = new Int8Array(1); const a2 = new Uint8Array(1); a1[0] = a2[0] = 0; @@ -737,23 +737,23 @@ describe('matchersUtil', function() { it( 'passes for ' + typeName + 's with same length and content', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a1 = new TypedArrayCtor(2); const a2 = new TypedArrayCtor(2); a1[0] = a2[0] = 0; a1[1] = a2[1] = 1; - const diffBuilder = new jasmineUnderTest.DiffBuilder(); + const diffBuilder = new privateUnderTest.DiffBuilder(); expect(matchersUtil.equals(a1, a2, diffBuilder)).toBe(true); jasmine.debugLog('Diff: ' + diffBuilder.getMessage()); } ); it('fails for ' + typeName + 's with different length', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a1 = new TypedArrayCtor(2); const a2 = new TypedArrayCtor(1); a1[0] = a1[1] = a2[0] = 0; - const diffBuilder = new jasmineUnderTest.DiffBuilder(); + const diffBuilder = new privateUnderTest.DiffBuilder(); expect(matchersUtil.equals(a1, a2, diffBuilder)).toBe(false); jasmine.debugLog('Diff: ' + diffBuilder.getMessage()); }); @@ -761,19 +761,19 @@ describe('matchersUtil', function() { it( 'fails for ' + typeName + 's with same length but different content', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a1 = new TypedArrayCtor(1); const a2 = new TypedArrayCtor(1); a1[0] = 0; a2[0] = 1; - const diffBuilder = new jasmineUnderTest.DiffBuilder(); + const diffBuilder = new privateUnderTest.DiffBuilder(); expect(matchersUtil.equals(a1, a2, diffBuilder)).toBe(false); jasmine.debugLog('Diff: ' + diffBuilder.getMessage()); } ); it('checks nonstandard properties of ' + typeName, function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a1 = new TypedArrayCtor(1); const a2 = new TypedArrayCtor(1); a1[0] = a2[0] = 0; @@ -784,7 +784,7 @@ describe('matchersUtil', function() { it('works with custom equality testers with ' + typeName, function() { const a1 = new TypedArrayCtor(1); const a2 = new TypedArrayCtor(1); - const matchersUtil = new jasmineUnderTest.MatchersUtil({ + const matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [ function() { return true; @@ -812,7 +812,7 @@ describe('matchersUtil', function() { 'passes for ' + typeName + 's with same length and content', function() { const TypedArrayCtor = requireType(); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a1 = new TypedArrayCtor(2); const a2 = new TypedArrayCtor(2); a1[0] = a2[0] = BigInt(0); @@ -823,7 +823,7 @@ describe('matchersUtil', function() { it('fails for ' + typeName + 's with different length', function() { const TypedArrayCtor = requireType(); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a1 = new TypedArrayCtor(2); const a2 = new TypedArrayCtor(1); a1[0] = a1[1] = a2[0] = BigInt(0); @@ -834,7 +834,7 @@ describe('matchersUtil', function() { 'fails for ' + typeName + 's with same length but different content', function() { const TypedArrayCtor = requireType(); - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const a1 = new TypedArrayCtor(2); const a2 = new TypedArrayCtor(2); a1[0] = a1[1] = a2[0] = BigInt(0); @@ -922,7 +922,7 @@ describe('matchersUtil', function() { 'withPath', 'setRoots' ]), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); diffBuilder.withPath.and.callFake(function(p, block) { block(); @@ -950,7 +950,7 @@ describe('matchersUtil', function() { 'withPath', 'setRoots' ]), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + matchersUtil = new privateUnderTest.MatchersUtil(); diffBuilder.withPath.and.callFake(function(p, block) { block(); @@ -967,8 +967,8 @@ describe('matchersUtil', function() { }); it('uses a diffBuilder if one is provided as the third argument', function() { - const diffBuilder = new jasmineUnderTest.DiffBuilder(), - matchersUtil = new jasmineUnderTest.MatchersUtil(); + const diffBuilder = new privateUnderTest.DiffBuilder(), + matchersUtil = new privateUnderTest.MatchersUtil(); spyOn(diffBuilder, 'recordMismatch'); spyOn(diffBuilder, 'withPath').and.callThrough(); @@ -988,27 +988,27 @@ describe('matchersUtil', function() { describe('contains', function() { it('passes when expected is a substring of actual', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.contains('ABC', 'BC')).toBe(true); }); it('fails when expected is a not substring of actual', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.contains('ABC', 'X')).toBe(false); }); it('passes when expected is an element in an actual array', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.contains(['foo', 'bar'], 'foo')).toBe(true); }); it('fails when expected is not an element in an actual array', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.contains(['foo', 'bar'], 'baz')).toBe(false); }); it('passes with mixed-element arrays', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.contains(['foo', { some: 'bar' }], 'foo')).toBe(true); expect( matchersUtil.contains(['foo', { some: 'bar' }], { some: 'bar' }) @@ -1019,7 +1019,7 @@ describe('matchersUtil', function() { const customTester = function() { return true; }, - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [customTester], pp: function() {} }); @@ -1028,18 +1028,18 @@ describe('matchersUtil', function() { }); it('fails when actual is undefined', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.contains(undefined, 'A')).toBe(false); }); it('fails when actual is null', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.contains(null, 'A')).toBe(false); }); it('works with array-like objects that implement iterable', function() { let capturedArgs = null; - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); function testFunction() { capturedArgs = arguments; @@ -1056,14 +1056,14 @@ describe('matchersUtil', function() { 1: 'b', length: 2 }; - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); expect(matchersUtil.contains(arrayLike, 'b')).toBe(true); expect(matchersUtil.contains(arrayLike, 'c')).toBe(false); }); it('passes for set members', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const setItem = { foo: 'bar' }; const set = new Set(); set.add(setItem); @@ -1072,7 +1072,7 @@ describe('matchersUtil', function() { }); it('passes for objects that equal to a set member', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(); + const matchersUtil = new privateUnderTest.MatchersUtil(); const set = new Set(); set.add({ foo: 'bar' }); @@ -1084,8 +1084,8 @@ describe('matchersUtil', function() { it('builds an English sentence for a failure case', function() { const actual = 'foo', name = 'toBar', - pp = jasmineUnderTest.makePrettyPrinter(), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }), + pp = privateUnderTest.makePrettyPrinter(), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: pp }), message = matchersUtil.buildFailureMessage(name, false, actual); expect(message).toEqual("Expected 'foo' to bar."); @@ -1095,8 +1095,8 @@ describe('matchersUtil', function() { const actual = 'foo', name = 'toBar', isNot = true, - pp = jasmineUnderTest.makePrettyPrinter(), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }), + pp = privateUnderTest.makePrettyPrinter(), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: pp }), message = matchersUtil.buildFailureMessage(name, isNot, actual); expect(message).toEqual("Expected 'foo' not to bar."); @@ -1105,8 +1105,8 @@ describe('matchersUtil', function() { it('builds an English sentence for an arbitrary array of expected arguments', function() { const actual = 'foo', name = 'toBar', - pp = jasmineUnderTest.makePrettyPrinter(), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }), + pp = privateUnderTest.makePrettyPrinter(), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: pp }), message = matchersUtil.buildFailureMessage( name, false, @@ -1127,7 +1127,7 @@ describe('matchersUtil', function() { pp = function(value) { return '<' + value + '>'; }, - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: pp }), message = matchersUtil.buildFailureMessage( name, isNot, diff --git a/spec/core/matchers/nothingSpec.js b/spec/core/matchers/nothingSpec.js index 40beb9fe..4809255e 100644 --- a/spec/core/matchers/nothingSpec.js +++ b/spec/core/matchers/nothingSpec.js @@ -1,6 +1,6 @@ describe('nothing', function() { it('should pass', function() { - const matcher = jasmineUnderTest.matchers.nothing(), + const matcher = privateUnderTest.matchers.nothing(), result = matcher.compare(); expect(result.pass).toBe(true); diff --git a/spec/core/matchers/toBeCloseToSpec.js b/spec/core/matchers/toBeCloseToSpec.js index ceaa47e4..b019e7b0 100644 --- a/spec/core/matchers/toBeCloseToSpec.js +++ b/spec/core/matchers/toBeCloseToSpec.js @@ -1,6 +1,6 @@ describe('toBeCloseTo', function() { it('passes when within two decimal places by default', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); let result; result = matcher.compare(0, 0); @@ -14,7 +14,7 @@ describe('toBeCloseTo', function() { }); it('fails when not within two decimal places by default', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); let result; result = matcher.compare(0, 0.01); @@ -25,7 +25,7 @@ describe('toBeCloseTo', function() { }); it('accepts an optional precision argument', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); let result; result = matcher.compare(0, 0.1, 0); @@ -48,7 +48,7 @@ describe('toBeCloseTo', function() { }); it('fails when one of the arguments is null', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); expect(function() { matcher.compare(null, null); @@ -70,7 +70,7 @@ describe('toBeCloseTo', function() { }); it('rounds expected values', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); let result; result = matcher.compare(1.23, 1.229); @@ -98,7 +98,7 @@ describe('toBeCloseTo', function() { }); it('handles edge cases with rounding', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); let result; // these cases resulted in false negatives in version of V8 @@ -113,37 +113,37 @@ describe('toBeCloseTo', function() { describe('Infinity handling', function() { it('passes when the actual and expected are both Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); const result = matcher.compare(Infinity, Infinity, 0); expect(result.pass).toBe(true); }); it('passes when the actual and expected are both -Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); const result = matcher.compare(-Infinity, -Infinity, 0); expect(result.pass).toBe(true); }); it('fails when the actual is Infinity and the expected is -Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); const result = matcher.compare(Infinity, -Infinity, 0); expect(result.pass).toBe(false); }); it('fails when the actual is -Infinity and the expected is Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); const result = matcher.compare(-Infinity, Infinity, 0); expect(result.pass).toBe(false); }); it('fails when the actual is a number and the expected is Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); const result = matcher.compare(42, Infinity, 0); expect(result.pass).toBe(false); }); it('fails when the actual is a number and the expected is -Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBeCloseTo(); + const matcher = privateUnderTest.matchers.toBeCloseTo(); const result = matcher.compare(42, -Infinity, 0); expect(result.pass).toBe(false); }); diff --git a/spec/core/matchers/toBeDefinedSpec.js b/spec/core/matchers/toBeDefinedSpec.js index 9aa20288..90b3664d 100644 --- a/spec/core/matchers/toBeDefinedSpec.js +++ b/spec/core/matchers/toBeDefinedSpec.js @@ -1,12 +1,12 @@ describe('toBeDefined', function() { it('matches for defined values', function() { - const matcher = jasmineUnderTest.matchers.toBeDefined(); + const matcher = privateUnderTest.matchers.toBeDefined(); const result = matcher.compare('foo'); expect(result.pass).toBe(true); }); it('fails when matching undefined values', function() { - const matcher = jasmineUnderTest.matchers.toBeDefined(); + const matcher = privateUnderTest.matchers.toBeDefined(); const result = matcher.compare(void 0); expect(result.pass).toBe(false); }); diff --git a/spec/core/matchers/toBeFalseSpec.js b/spec/core/matchers/toBeFalseSpec.js index f4038e5c..191eb808 100644 --- a/spec/core/matchers/toBeFalseSpec.js +++ b/spec/core/matchers/toBeFalseSpec.js @@ -1,18 +1,18 @@ describe('toBeFalse', function() { it('passes for false', function() { - const matcher = jasmineUnderTest.matchers.toBeFalse(); + const matcher = privateUnderTest.matchers.toBeFalse(); const result = matcher.compare(false); expect(result.pass).toBe(true); }); it('fails for non-false', function() { - const matcher = jasmineUnderTest.matchers.toBeFalse(); + const matcher = privateUnderTest.matchers.toBeFalse(); const result = matcher.compare('foo'); expect(result.pass).toBe(false); }); it('fails for falsy', function() { - const matcher = jasmineUnderTest.matchers.toBeFalse(); + const matcher = privateUnderTest.matchers.toBeFalse(); const result = matcher.compare(undefined); expect(result.pass).toBe(false); }); diff --git a/spec/core/matchers/toBeFalsySpec.js b/spec/core/matchers/toBeFalsySpec.js index 4a516738..dcec4d01 100644 --- a/spec/core/matchers/toBeFalsySpec.js +++ b/spec/core/matchers/toBeFalsySpec.js @@ -1,6 +1,6 @@ describe('toBeFalsy', function() { it("passes for 'falsy' values", function() { - const matcher = jasmineUnderTest.matchers.toBeFalsy(); + const matcher = privateUnderTest.matchers.toBeFalsy(); let result; result = matcher.compare(false); @@ -23,7 +23,7 @@ describe('toBeFalsy', function() { }); it("fails for 'truthy' values", function() { - const matcher = jasmineUnderTest.matchers.toBeFalsy(); + const matcher = privateUnderTest.matchers.toBeFalsy(); let result; result = matcher.compare(true); diff --git a/spec/core/matchers/toBeGreaterThanOrEqualSpec.js b/spec/core/matchers/toBeGreaterThanOrEqualSpec.js index 7adda0e4..b91069f4 100644 --- a/spec/core/matchers/toBeGreaterThanOrEqualSpec.js +++ b/spec/core/matchers/toBeGreaterThanOrEqualSpec.js @@ -1,6 +1,6 @@ describe('toBeGreaterThanOrEqual', function() { it('passes when actual >= expected', function() { - const matcher = jasmineUnderTest.matchers.toBeGreaterThanOrEqual(); + const matcher = privateUnderTest.matchers.toBeGreaterThanOrEqual(); let result; result = matcher.compare(2, 1); @@ -17,7 +17,7 @@ describe('toBeGreaterThanOrEqual', function() { }); it('fails when actual < expected', function() { - const matcher = jasmineUnderTest.matchers.toBeGreaterThanOrEqual(); + const matcher = privateUnderTest.matchers.toBeGreaterThanOrEqual(); let result; result = matcher.compare(1, 2); diff --git a/spec/core/matchers/toBeGreaterThanSpec.js b/spec/core/matchers/toBeGreaterThanSpec.js index 1a2fb378..b070dc69 100644 --- a/spec/core/matchers/toBeGreaterThanSpec.js +++ b/spec/core/matchers/toBeGreaterThanSpec.js @@ -1,12 +1,12 @@ describe('toBeGreaterThan', function() { it('passes when actual > expected', function() { - const matcher = jasmineUnderTest.matchers.toBeGreaterThan(); + const matcher = privateUnderTest.matchers.toBeGreaterThan(); const result = matcher.compare(2, 1); expect(result.pass).toBe(true); }); it('fails when actual <= expected', function() { - const matcher = jasmineUnderTest.matchers.toBeGreaterThan(); + const matcher = privateUnderTest.matchers.toBeGreaterThan(); let result; result = matcher.compare(1, 1); diff --git a/spec/core/matchers/toBeInstanceOfSpec.js b/spec/core/matchers/toBeInstanceOfSpec.js index 13ba614a..7e5928ef 100644 --- a/spec/core/matchers/toBeInstanceOfSpec.js +++ b/spec/core/matchers/toBeInstanceOfSpec.js @@ -1,7 +1,7 @@ describe('toBeInstanceOf', function() { describe('when expecting Number', function() { it('passes for literal number', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(3, Number); expect(result).toEqual({ pass: true, @@ -10,8 +10,8 @@ describe('toBeInstanceOf', function() { }); it('passes for NaN', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toBeInstanceOf({ + pp: privateUnderTest.makePrettyPrinter() }); const result = matcher.compare(NaN, Number); expect(result).toEqual({ @@ -21,7 +21,7 @@ describe('toBeInstanceOf', function() { }); it('passes for Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(Infinity, Number); expect(result).toEqual({ pass: true, @@ -30,7 +30,7 @@ describe('toBeInstanceOf', function() { }); it('fails for a non-number', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare('foo', Number); expect(result).toEqual({ pass: false, @@ -41,7 +41,7 @@ describe('toBeInstanceOf', function() { describe('when expecting String', function() { it('passes for a string', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare('foo', String); expect(result).toEqual({ pass: true, @@ -50,7 +50,7 @@ describe('toBeInstanceOf', function() { }); it('fails for a non-string', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare({}, String); expect(result).toEqual({ pass: false, @@ -61,7 +61,7 @@ describe('toBeInstanceOf', function() { describe('when expecting Boolean', function() { it('passes for a boolean', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(true, Boolean); expect(result).toEqual({ pass: true, @@ -70,7 +70,7 @@ describe('toBeInstanceOf', function() { }); it('fails for a non-boolean', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare('false', Boolean); expect(result).toEqual({ pass: false, @@ -81,7 +81,7 @@ describe('toBeInstanceOf', function() { describe('when expecting RegExp', function() { it('passes for a literal regular expression', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(/foo/, RegExp); expect(result).toEqual({ pass: true, @@ -94,7 +94,7 @@ describe('toBeInstanceOf', function() { it('passes for a function', function() { const fn = function() {}; - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(fn, Function); expect(result).toEqual({ pass: true, @@ -108,7 +108,7 @@ describe('toBeInstanceOf', function() { return 'foo'; } - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(fn, Function); expect(result).toEqual({ pass: true, @@ -122,7 +122,7 @@ describe('toBeInstanceOf', function() { function Animal() {} it('passes for any object', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare({ foo: 'bar' }, Object); expect(result).toEqual({ pass: true, @@ -131,7 +131,7 @@ describe('toBeInstanceOf', function() { }); it('passes for an Error object', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(new Error('example'), Object); expect(result).toEqual({ pass: true, @@ -140,7 +140,7 @@ describe('toBeInstanceOf', function() { }); it('passes for a user-defined class', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(new Animal(), Object); expect(result).toEqual({ pass: true, @@ -149,7 +149,7 @@ describe('toBeInstanceOf', function() { }); it('fails for a non-object', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare('foo', Object); expect(result).toEqual({ pass: false, @@ -160,8 +160,8 @@ describe('toBeInstanceOf', function() { it('passes for objects with no constructor', function() { const object = Object.create(null); - const matcher = jasmineUnderTest.matchers.toBeInstanceOf({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toBeInstanceOf({ + pp: privateUnderTest.makePrettyPrinter() }); const result = matcher.compare(object, Object); expect(result).toEqual({ @@ -190,7 +190,7 @@ describe('toBeInstanceOf', function() { Cat.prototype.constructor = Cat; it('passes for instances of that class', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(new Animal(), Animal); expect(result).toEqual({ pass: true, @@ -199,7 +199,7 @@ describe('toBeInstanceOf', function() { }); it('passes for instances of a subclass', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(new Cat(), Animal); expect(result).toEqual({ pass: true, @@ -208,7 +208,7 @@ describe('toBeInstanceOf', function() { }); it('does not pass for sibling classes', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); const result = matcher.compare(new Dog(), Cat); expect(result).toEqual({ pass: false, @@ -218,7 +218,7 @@ describe('toBeInstanceOf', function() { }); it('raises an error if passed an invalid expected value', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf(); + const matcher = privateUnderTest.matchers.toBeInstanceOf(); expect(function() { matcher.compare({}, 'Error'); }).toThrowError( @@ -228,8 +228,8 @@ describe('toBeInstanceOf', function() { }); it('raises an error if missing an expected value', function() { - const matcher = jasmineUnderTest.matchers.toBeInstanceOf({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toBeInstanceOf({ + pp: privateUnderTest.makePrettyPrinter() }); expect(function() { matcher.compare({}, undefined); diff --git a/spec/core/matchers/toBeLessThanOrEqualSpec.js b/spec/core/matchers/toBeLessThanOrEqualSpec.js index 46777791..aacef891 100644 --- a/spec/core/matchers/toBeLessThanOrEqualSpec.js +++ b/spec/core/matchers/toBeLessThanOrEqualSpec.js @@ -1,6 +1,6 @@ describe('toBeLessThanOrEqual', function() { it('passes when actual <= expected', function() { - const matcher = jasmineUnderTest.matchers.toBeLessThanOrEqual(); + const matcher = privateUnderTest.matchers.toBeLessThanOrEqual(); let result; result = matcher.compare(1, 2); @@ -17,7 +17,7 @@ describe('toBeLessThanOrEqual', function() { }); it('fails when actual < expected', function() { - const matcher = jasmineUnderTest.matchers.toBeLessThanOrEqual(); + const matcher = privateUnderTest.matchers.toBeLessThanOrEqual(); let result; result = matcher.compare(2, 1); diff --git a/spec/core/matchers/toBeLessThanSpec.js b/spec/core/matchers/toBeLessThanSpec.js index 9b786375..b19ab6ff 100644 --- a/spec/core/matchers/toBeLessThanSpec.js +++ b/spec/core/matchers/toBeLessThanSpec.js @@ -1,12 +1,12 @@ describe('toBeLessThan', function() { it('passes when actual < expected', function() { - const matcher = jasmineUnderTest.matchers.toBeLessThan(); + const matcher = privateUnderTest.matchers.toBeLessThan(); const result = matcher.compare(1, 2); expect(result.pass).toBe(true); }); it('fails when actual <= expected', function() { - const matcher = jasmineUnderTest.matchers.toBeLessThan(); + const matcher = privateUnderTest.matchers.toBeLessThan(); let result; result = matcher.compare(1, 1); diff --git a/spec/core/matchers/toBeNaNSpec.js b/spec/core/matchers/toBeNaNSpec.js index b04c23f3..b7e0f51e 100644 --- a/spec/core/matchers/toBeNaNSpec.js +++ b/spec/core/matchers/toBeNaNSpec.js @@ -1,13 +1,13 @@ describe('toBeNaN', function() { it('passes for NaN with a custom .not fail', function() { - const matcher = jasmineUnderTest.matchers.toBeNaN(); + const matcher = privateUnderTest.matchers.toBeNaN(); const result = matcher.compare(Number.NaN); expect(result.pass).toBe(true); expect(result.message).toEqual('Expected actual not to be NaN.'); }); it('fails for anything not a NaN', function() { - const matcher = jasmineUnderTest.matchers.toBeNaN(); + const matcher = privateUnderTest.matchers.toBeNaN(); let result; result = matcher.compare(1); @@ -27,8 +27,8 @@ describe('toBeNaN', function() { }); it('has a custom message on failure', function() { - const matcher = jasmineUnderTest.matchers.toBeNaN({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toBeNaN({ + pp: privateUnderTest.makePrettyPrinter() }), result = matcher.compare(0); diff --git a/spec/core/matchers/toBeNegativeInfinitySpec.js b/spec/core/matchers/toBeNegativeInfinitySpec.js index 77cf0193..07fcdeb0 100644 --- a/spec/core/matchers/toBeNegativeInfinitySpec.js +++ b/spec/core/matchers/toBeNegativeInfinitySpec.js @@ -1,6 +1,6 @@ describe('toBeNegativeInfinity', function() { it("fails for anything that isn't -Infinity", function() { - const matcher = jasmineUnderTest.matchers.toBeNegativeInfinity(); + const matcher = privateUnderTest.matchers.toBeNegativeInfinity(); let result; result = matcher.compare(1); @@ -14,8 +14,8 @@ describe('toBeNegativeInfinity', function() { }); it('has a custom message on failure', function() { - const matcher = jasmineUnderTest.matchers.toBeNegativeInfinity({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toBeNegativeInfinity({ + pp: privateUnderTest.makePrettyPrinter() }), result = matcher.compare(0); @@ -23,7 +23,7 @@ describe('toBeNegativeInfinity', function() { }); it('succeeds for -Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBeNegativeInfinity(), + const matcher = privateUnderTest.matchers.toBeNegativeInfinity(), result = matcher.compare(Number.NEGATIVE_INFINITY); expect(result.pass).toBe(true); diff --git a/spec/core/matchers/toBeNullSpec.js b/spec/core/matchers/toBeNullSpec.js index cae7c03b..8bbe0545 100644 --- a/spec/core/matchers/toBeNullSpec.js +++ b/spec/core/matchers/toBeNullSpec.js @@ -1,12 +1,12 @@ describe('toBeNull', function() { it('passes for null', function() { - const matcher = jasmineUnderTest.matchers.toBeNull(); + const matcher = privateUnderTest.matchers.toBeNull(); const result = matcher.compare(null); expect(result.pass).toBe(true); }); it('fails for non-null', function() { - const matcher = jasmineUnderTest.matchers.toBeNull(); + const matcher = privateUnderTest.matchers.toBeNull(); const result = matcher.compare('foo'); expect(result.pass).toBe(false); }); diff --git a/spec/core/matchers/toBeNullishSpec.js b/spec/core/matchers/toBeNullishSpec.js index 5f70d1a8..2ce5ba07 100644 --- a/spec/core/matchers/toBeNullishSpec.js +++ b/spec/core/matchers/toBeNullishSpec.js @@ -1,55 +1,55 @@ describe('toBeNullish', function() { it('passes for null values', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare(null); expect(result.pass).toBe(true); }); it('passes for undefined values', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare(void 0); expect(result.pass).toBe(true); }); it('fails when matching defined values', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare('foo'); expect(result.pass).toBe(false); }); describe('falsy values', () => { it('fails for 0', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare(0); expect(result.pass).toBe(false); }); it('fails for -0', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare(-0); expect(result.pass).toBe(false); }); it('fails for empty string', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare(''); expect(result.pass).toBe(false); }); it('fails for false', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare(false); expect(result.pass).toBe(false); }); it('fails for NaN', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare(NaN); expect(result.pass).toBe(false); }); it('fails for 0n', function() { - const matcher = jasmineUnderTest.matchers.toBeNullish(); + const matcher = privateUnderTest.matchers.toBeNullish(); const result = matcher.compare(BigInt(0)); expect(result.pass).toBe(false); }); diff --git a/spec/core/matchers/toBePositiveInfinitySpec.js b/spec/core/matchers/toBePositiveInfinitySpec.js index 6e5835de..7588c84a 100644 --- a/spec/core/matchers/toBePositiveInfinitySpec.js +++ b/spec/core/matchers/toBePositiveInfinitySpec.js @@ -1,6 +1,6 @@ describe('toBePositiveInfinity', function() { it("fails for anything that isn't Infinity", function() { - const matcher = jasmineUnderTest.matchers.toBePositiveInfinity(); + const matcher = privateUnderTest.matchers.toBePositiveInfinity(); let result; result = matcher.compare(1); @@ -14,8 +14,8 @@ describe('toBePositiveInfinity', function() { }); it('has a custom message on failure', function() { - const matcher = jasmineUnderTest.matchers.toBePositiveInfinity({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toBePositiveInfinity({ + pp: privateUnderTest.makePrettyPrinter() }), result = matcher.compare(0); @@ -23,7 +23,7 @@ describe('toBePositiveInfinity', function() { }); it('succeeds for Infinity', function() { - const matcher = jasmineUnderTest.matchers.toBePositiveInfinity(), + const matcher = privateUnderTest.matchers.toBePositiveInfinity(), result = matcher.compare(Number.POSITIVE_INFINITY); expect(result.pass).toBe(true); diff --git a/spec/core/matchers/toBeSpec.js b/spec/core/matchers/toBeSpec.js index dfa1011f..e1fe6bee 100644 --- a/spec/core/matchers/toBeSpec.js +++ b/spec/core/matchers/toBeSpec.js @@ -1,16 +1,16 @@ describe('toBe', function() { it('passes with no message when actual === expected', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.matchers.toBe(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.matchers.toBe(matchersUtil), result = matcher.compare(1, 1); expect(result.pass).toBe(true); }); it('passes with a custom message when expected is an array', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.matchers.toBe(matchersUtil), + matcher = privateUnderTest.matchers.toBe(matchersUtil), array = [1]; const result = matcher.compare(array, array); @@ -21,10 +21,10 @@ describe('toBe', function() { }); it('passes with a custom message when expected is an object', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.matchers.toBe(matchersUtil), + matcher = privateUnderTest.matchers.toBe(matchersUtil), obj = { foo: 'bar' }; const result = matcher.compare(obj, obj); @@ -35,18 +35,18 @@ describe('toBe', function() { }); it('fails with no message when actual !== expected', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil(), - matcher = jasmineUnderTest.matchers.toBe(matchersUtil), + const matchersUtil = new privateUnderTest.MatchersUtil(), + matcher = privateUnderTest.matchers.toBe(matchersUtil), result = matcher.compare(1, 2); expect(result.pass).toBe(false); expect(result.message).toBeUndefined(); }); it('fails with a custom message when expected is an array', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.matchers.toBe(matchersUtil), + matcher = privateUnderTest.matchers.toBe(matchersUtil), result = matcher.compare([1], [1]); expect(result.pass).toBe(false); @@ -56,10 +56,10 @@ describe('toBe', function() { }); it('fails with a custom message when expected is an object', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.matchers.toBe(matchersUtil), + matcher = privateUnderTest.matchers.toBe(matchersUtil), result = matcher.compare({ foo: 'bar' }, { foo: 'bar' }); expect(result.pass).toBe(false); @@ -72,9 +72,9 @@ describe('toBe', function() { const formatter = function(x) { return '<' + x.foo + '>'; }, - prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: prettyPrinter }), - matcher = jasmineUnderTest.matchers.toBe(matchersUtil), + prettyPrinter = privateUnderTest.makePrettyPrinter([formatter]), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: prettyPrinter }), + matcher = privateUnderTest.matchers.toBe(matchersUtil), result = matcher.compare({ foo: 'bar' }, { foo: 'bar' }); expect(result.pass).toBe(false); diff --git a/spec/core/matchers/toBeTrueSpec.js b/spec/core/matchers/toBeTrueSpec.js index b7a0cb48..c648ff1e 100644 --- a/spec/core/matchers/toBeTrueSpec.js +++ b/spec/core/matchers/toBeTrueSpec.js @@ -1,12 +1,12 @@ describe('toBeTrue', function() { it('passes for true', function() { - const matcher = jasmineUnderTest.matchers.toBeTrue(); + const matcher = privateUnderTest.matchers.toBeTrue(); const result = matcher.compare(true); expect(result.pass).toBe(true); }); it('fails for non-true', function() { - const matcher = jasmineUnderTest.matchers.toBeTrue(); + const matcher = privateUnderTest.matchers.toBeTrue(); const result = matcher.compare('foo'); expect(result.pass).toBe(false); }); diff --git a/spec/core/matchers/toBeTruthySpec.js b/spec/core/matchers/toBeTruthySpec.js index a1e128f4..0b2da5ec 100644 --- a/spec/core/matchers/toBeTruthySpec.js +++ b/spec/core/matchers/toBeTruthySpec.js @@ -1,6 +1,6 @@ describe('toBeTruthy', function() { it("passes for 'truthy' values", function() { - const matcher = jasmineUnderTest.matchers.toBeTruthy(); + const matcher = privateUnderTest.matchers.toBeTruthy(); let result; result = matcher.compare(true); @@ -23,7 +23,7 @@ describe('toBeTruthy', function() { }); it("fails for 'falsy' values", function() { - const matcher = jasmineUnderTest.matchers.toBeTruthy(); + const matcher = privateUnderTest.matchers.toBeTruthy(); let result; result = matcher.compare(false); diff --git a/spec/core/matchers/toBeUndefinedSpec.js b/spec/core/matchers/toBeUndefinedSpec.js index 40adb4e2..41b08990 100644 --- a/spec/core/matchers/toBeUndefinedSpec.js +++ b/spec/core/matchers/toBeUndefinedSpec.js @@ -1,12 +1,12 @@ describe('toBeUndefined', function() { it('passes for undefined values', function() { - const matcher = jasmineUnderTest.matchers.toBeUndefined(); + const matcher = privateUnderTest.matchers.toBeUndefined(); const result = matcher.compare(void 0); expect(result.pass).toBe(true); }); it('fails when matching defined values', function() { - const matcher = jasmineUnderTest.matchers.toBeUndefined(); + const matcher = privateUnderTest.matchers.toBeUndefined(); const result = matcher.compare('foo'); expect(result.pass).toBe(false); }); diff --git a/spec/core/matchers/toContainSpec.js b/spec/core/matchers/toContainSpec.js index d35f557c..2980a09f 100644 --- a/spec/core/matchers/toContainSpec.js +++ b/spec/core/matchers/toContainSpec.js @@ -1,9 +1,9 @@ describe('toContain', function() { - it('delegates to jasmineUnderTest.matchersUtil.contains', function() { + it('delegates to privateUnderTest.MatchersUtil.contains', function() { const matchersUtil = { contains: jasmine.createSpy('delegated-contains').and.returnValue(true) }, - matcher = jasmineUnderTest.matchers.toContain(matchersUtil); + matcher = privateUnderTest.matchers.toContain(matchersUtil); const result = matcher.compare('ABC', 'B'); expect(matchersUtil.contains).toHaveBeenCalledWith('ABC', 'B'); @@ -14,10 +14,10 @@ describe('toContain', function() { const tester = function(a, b) { return a.toString() === b.toString(); }, - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester] }), - matcher = jasmineUnderTest.matchers.toContain(matchersUtil); + matcher = privateUnderTest.matchers.toContain(matchersUtil); const result = matcher.compare(['1', '2'], 2); expect(result.pass).toBe(true); diff --git a/spec/core/matchers/toEqualSpec.js b/spec/core/matchers/toEqualSpec.js index 16d24c71..fce13347 100644 --- a/spec/core/matchers/toEqualSpec.js +++ b/spec/core/matchers/toEqualSpec.js @@ -2,10 +2,10 @@ describe('toEqual', function() { 'use strict'; function compareEquals(actual, expected) { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.matchers.toEqual(matchersUtil); + matcher = privateUnderTest.matchers.toEqual(matchersUtil); const result = matcher.compare(actual, expected); @@ -18,9 +18,9 @@ describe('toEqual', function() { buildFailureMessage: function() { return 'does not matter'; }, - DiffBuilder: new jasmineUnderTest.DiffBuilder() + DiffBuilder: new privateUnderTest.DiffBuilder() }, - matcher = jasmineUnderTest.matchers.toEqual(matchersUtil); + matcher = privateUnderTest.matchers.toEqual(matchersUtil); const result = matcher.compare(1, 1); @@ -32,10 +32,10 @@ describe('toEqual', function() { const tester = function(a, b) { return a.toString() === b.toString(); }, - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: [tester] }), - matcher = jasmineUnderTest.matchers.toEqual(matchersUtil); + matcher = privateUnderTest.matchers.toEqual(matchersUtil); const result = matcher.compare(1, '1'); @@ -148,9 +148,9 @@ describe('toEqual', function() { const actual = { x: { y: 1, z: 2, f: 4 } }, expected = { x: { y: 1, z: 2, g: 3 } }, - pp = jasmineUnderTest.makePrettyPrinter([formatter]), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toEqual(matchersUtil), + pp = privateUnderTest.makePrettyPrinter([formatter]), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toEqual(matchersUtil), message = 'Expected $.x to have properties\n' + ' g: |3|\n' + @@ -169,9 +169,9 @@ describe('toEqual', function() { const actual = [{ foo: 4 }], expected = [{ foo: 5 }], - prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: prettyPrinter }), - matcher = jasmineUnderTest.matchers.toEqual(matchersUtil), + prettyPrinter = privateUnderTest.makePrettyPrinter([formatter]), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: prettyPrinter }), + matcher = privateUnderTest.matchers.toEqual(matchersUtil), message = 'Expected $[0].foo = |4| to equal |5|.'; expect(matcher.compare(actual, expected).message).toEqual(message); @@ -196,9 +196,9 @@ describe('toEqual', function() { bar: "shouldn't be pretty printed" } ], - prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: prettyPrinter }), - matcher = jasmineUnderTest.matchers.toEqual(matchersUtil), + prettyPrinter = privateUnderTest.makePrettyPrinter([formatter]), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: prettyPrinter }), + matcher = privateUnderTest.matchers.toEqual(matchersUtil), message = 'Expected $[0].foo = [thing with a=1, b=2] to equal [thing with a=5, b=2].\n' + "Expected $[0].bar = 'should not be pretty printed' to equal 'shouldn't be pretty printed'."; @@ -390,9 +390,9 @@ describe('toEqual', function() { const actual = { x: new Foo() }, expected = { x: new Bar() }, message = 'Expected $.x to be a kind of Bar, but was |[object Object]|.', - pp = jasmineUnderTest.makePrettyPrinter([formatter]), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toEqual(matchersUtil); + pp = privateUnderTest.makePrettyPrinter([formatter]), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toEqual(matchersUtil); expect(matcher.compare(actual, expected).message).toEqual(message); }); @@ -939,9 +939,9 @@ describe('toEqual', function() { const actual = [1, 1, 2, 3, 5], expected = [1, 1, 2, 3], - pp = jasmineUnderTest.makePrettyPrinter([formatter]), - matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toEqual(matchersUtil), + pp = privateUnderTest.makePrettyPrinter([formatter]), + matchersUtil = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toEqual(matchersUtil), message = 'Expected $.length = |5| to equal |4|.\n' + 'Unexpected $[4] = |5| in array.'; diff --git a/spec/core/matchers/toHaveBeenCalledBeforeSpec.js b/spec/core/matchers/toHaveBeenCalledBeforeSpec.js index 34e4c5cc..d620a837 100644 --- a/spec/core/matchers/toHaveBeenCalledBeforeSpec.js +++ b/spec/core/matchers/toHaveBeenCalledBeforeSpec.js @@ -1,10 +1,10 @@ describe('toHaveBeenCalledBefore', function() { it('throws an exception when the actual is not a spy', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() {}, - spy = new jasmineUnderTest.Env().createSpy('a spy'); + spy = new privateUnderTest.Env().createSpy('a spy'); expect(function() { matcher.compare(fn, spy); @@ -12,10 +12,10 @@ describe('toHaveBeenCalledBefore', function() { }); it('throws an exception when the expected is not a spy', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore({ + pp: privateUnderTest.makePrettyPrinter() }), - spy = new jasmineUnderTest.Env().createSpy('a spy'), + spy = new privateUnderTest.Env().createSpy('a spy'), fn = function() {}; expect(function() { @@ -24,9 +24,9 @@ describe('toHaveBeenCalledBefore', function() { }); it('fails when the actual was not called', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(), - firstSpy = new jasmineUnderTest.Spy('first spy'), - secondSpy = new jasmineUnderTest.Spy('second spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore(), + firstSpy = new privateUnderTest.Spy('first spy'), + secondSpy = new privateUnderTest.Spy('second spy'); secondSpy(); @@ -38,9 +38,9 @@ describe('toHaveBeenCalledBefore', function() { }); it('fails when the expected was not called', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(), - firstSpy = new jasmineUnderTest.Spy('first spy'), - secondSpy = new jasmineUnderTest.Spy('second spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore(), + firstSpy = new privateUnderTest.Spy('first spy'), + secondSpy = new privateUnderTest.Spy('second spy'); firstSpy(); @@ -52,9 +52,9 @@ describe('toHaveBeenCalledBefore', function() { }); it('fails when the actual is called after the expected', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(), - firstSpy = new jasmineUnderTest.Spy('first spy'), - secondSpy = new jasmineUnderTest.Spy('second spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore(), + firstSpy = new privateUnderTest.Spy('first spy'), + secondSpy = new privateUnderTest.Spy('second spy'); secondSpy(); firstSpy(); @@ -67,9 +67,9 @@ describe('toHaveBeenCalledBefore', function() { }); it('fails when the actual is called before and after the expected', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(), - firstSpy = new jasmineUnderTest.Spy('first spy'), - secondSpy = new jasmineUnderTest.Spy('second spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore(), + firstSpy = new privateUnderTest.Spy('first spy'), + secondSpy = new privateUnderTest.Spy('second spy'); firstSpy(); secondSpy(); @@ -83,9 +83,9 @@ describe('toHaveBeenCalledBefore', function() { }); it('fails when the expected is called before and after the actual', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(), - firstSpy = new jasmineUnderTest.Spy('first spy'), - secondSpy = new jasmineUnderTest.Spy('second spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore(), + firstSpy = new privateUnderTest.Spy('first spy'), + secondSpy = new privateUnderTest.Spy('second spy'); secondSpy(); firstSpy(); @@ -99,9 +99,9 @@ describe('toHaveBeenCalledBefore', function() { }); it('passes when the actual is called before the expected', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(), - firstSpy = new jasmineUnderTest.Spy('first spy'), - secondSpy = new jasmineUnderTest.Spy('second spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore(), + firstSpy = new privateUnderTest.Spy('first spy'), + secondSpy = new privateUnderTest.Spy('second spy'); firstSpy(); secondSpy(); @@ -114,9 +114,9 @@ describe('toHaveBeenCalledBefore', function() { }); it('set the correct calls as verified when passing', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(), - firstSpy = new jasmineUnderTest.Spy('first spy'), - secondSpy = new jasmineUnderTest.Spy('second spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledBefore(), + firstSpy = new privateUnderTest.Spy('first spy'), + secondSpy = new privateUnderTest.Spy('second spy'); firstSpy(); secondSpy(); diff --git a/spec/core/matchers/toHaveBeenCalledOnceWithSpec.js b/spec/core/matchers/toHaveBeenCalledOnceWithSpec.js index fb4bbc4b..d6aa854f 100644 --- a/spec/core/matchers/toHaveBeenCalledOnceWithSpec.js +++ b/spec/core/matchers/toHaveBeenCalledOnceWithSpec.js @@ -1,9 +1,9 @@ describe('toHaveBeenCalledOnceWith', function() { it('passes when the actual was called only once and with matching parameters', function() { - const pp = jasmineUnderTest.makePrettyPrinter(), - util = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + const pp = privateUnderTest.makePrettyPrinter(), + util = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toHaveBeenCalledOnceWith(util), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('a', 'b'); const result = matcher.compare(calledSpy, 'a', 'b'); @@ -20,13 +20,13 @@ describe('toHaveBeenCalledOnceWith', function() { return true; } ], - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: customEqualityTesters }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith( + matcher = privateUnderTest.matchers.toHaveBeenCalledOnceWith( matchersUtil ), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('a', 'b'); const result = matcher.compare(calledSpy, 'a', 'a'); @@ -35,10 +35,10 @@ describe('toHaveBeenCalledOnceWith', function() { }); it('fails when the actual was never called', function() { - const pp = jasmineUnderTest.makePrettyPrinter(), - util = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + const pp = privateUnderTest.makePrettyPrinter(), + util = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toHaveBeenCalledOnceWith(util), + calledSpy = new privateUnderTest.Spy('called-spy'); const result = matcher.compare(calledSpy, 'a', 'b'); @@ -49,10 +49,10 @@ describe('toHaveBeenCalledOnceWith', function() { }); it('fails when the actual was called once with different parameters', function() { - const pp = jasmineUnderTest.makePrettyPrinter(), - util = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + const pp = privateUnderTest.makePrettyPrinter(), + util = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toHaveBeenCalledOnceWith(util), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('a', 'c'); const result = matcher.compare(calledSpy, 'a', 'b'); @@ -64,10 +64,10 @@ describe('toHaveBeenCalledOnceWith', function() { }); it('fails when the actual was called multiple times with expected parameters', function() { - const pp = jasmineUnderTest.makePrettyPrinter(), - util = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + const pp = privateUnderTest.makePrettyPrinter(), + util = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toHaveBeenCalledOnceWith(util), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('a', 'b'); calledSpy('a', 'b'); @@ -80,10 +80,10 @@ describe('toHaveBeenCalledOnceWith', function() { }); it('fails when the actual was called multiple times (one of them - with expected parameters)', function() { - const pp = jasmineUnderTest.makePrettyPrinter(), - util = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + const pp = privateUnderTest.makePrettyPrinter(), + util = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toHaveBeenCalledOnceWith(util), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('a', 'b'); calledSpy('a', 'c'); @@ -96,9 +96,9 @@ describe('toHaveBeenCalledOnceWith', function() { }); it('throws an exception when the actual is not a spy', function() { - const pp = jasmineUnderTest.makePrettyPrinter(), - util = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util), + const pp = privateUnderTest.makePrettyPrinter(), + util = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toHaveBeenCalledOnceWith(util), fn = function() {}; expect(function() { @@ -107,10 +107,10 @@ describe('toHaveBeenCalledOnceWith', function() { }); it('set the correct calls as verified when passing', function() { - const pp = jasmineUnderTest.makePrettyPrinter(), - util = new jasmineUnderTest.MatchersUtil({ pp: pp }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + const pp = privateUnderTest.makePrettyPrinter(), + util = new privateUnderTest.MatchersUtil({ pp: pp }), + matcher = privateUnderTest.matchers.toHaveBeenCalledOnceWith(util), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('x'); diff --git a/spec/core/matchers/toHaveBeenCalledSpec.js b/spec/core/matchers/toHaveBeenCalledSpec.js index a12cde3f..93b72be3 100644 --- a/spec/core/matchers/toHaveBeenCalledSpec.js +++ b/spec/core/matchers/toHaveBeenCalledSpec.js @@ -1,7 +1,7 @@ describe('toHaveBeenCalled', function() { it('passes when the actual was called, with a custom .not fail message', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalled(), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalled(), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy(); @@ -13,16 +13,16 @@ describe('toHaveBeenCalled', function() { }); it('fails when the actual was not called', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalled(), - uncalledSpy = new jasmineUnderTest.Spy('uncalled spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalled(), + uncalledSpy = new privateUnderTest.Spy('uncalled spy'); const result = matcher.compare(uncalledSpy); expect(result.pass).toBe(false); }); it('throws an exception when the actual is not a spy', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalled({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toHaveBeenCalled({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() {}; @@ -32,8 +32,8 @@ describe('toHaveBeenCalled', function() { }); it('throws an exception when invoked with any arguments', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalled(), - spy = new jasmineUnderTest.Spy('sample spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalled(), + spy = new privateUnderTest.Spy('sample spy'); expect(function() { matcher.compare(spy, 'foo'); @@ -41,8 +41,8 @@ describe('toHaveBeenCalled', function() { }); it('has a custom message on failure', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalled(), - spy = new jasmineUnderTest.Spy('sample-spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalled(), + spy = new privateUnderTest.Spy('sample-spy'); const result = matcher.compare(spy); @@ -52,8 +52,8 @@ describe('toHaveBeenCalled', function() { }); it('set the correct calls as verified when passing', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalled(), - spy = new jasmineUnderTest.Spy('sample-spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalled(), + spy = new privateUnderTest.Spy('sample-spy'); spy(); diff --git a/spec/core/matchers/toHaveBeenCalledTimesSpec.js b/spec/core/matchers/toHaveBeenCalledTimesSpec.js index af1d1d26..7935d540 100644 --- a/spec/core/matchers/toHaveBeenCalledTimesSpec.js +++ b/spec/core/matchers/toHaveBeenCalledTimesSpec.js @@ -1,13 +1,13 @@ describe('toHaveBeenCalledTimes', function() { it('passes when the actual 0 matches the expected 0 ', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), - calledSpy = new jasmineUnderTest.Spy('called-spy'), + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes(), + calledSpy = new privateUnderTest.Spy('called-spy'), result = matcher.compare(calledSpy, 0); expect(result.pass).toBeTruthy(); }); it('passes when the actual matches the expected', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes(), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy(); const result = matcher.compare(calledSpy, 1); @@ -15,8 +15,8 @@ describe('toHaveBeenCalledTimes', function() { }); it('fails when expected numbers is not supplied', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), - spy = new jasmineUnderTest.Spy('spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes(), + spy = new privateUnderTest.Spy('spy'); spy(); expect(function() { @@ -27,16 +27,16 @@ describe('toHaveBeenCalledTimes', function() { }); it('fails when the actual was called less than the expected', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), - uncalledSpy = new jasmineUnderTest.Spy('uncalled spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes(), + uncalledSpy = new privateUnderTest.Spy('uncalled spy'); const result = matcher.compare(uncalledSpy, 2); expect(result.pass).toBe(false); }); it('fails when the actual was called more than expected', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), - uncalledSpy = new jasmineUnderTest.Spy('uncalled spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes(), + uncalledSpy = new privateUnderTest.Spy('uncalled spy'); uncalledSpy(); uncalledSpy(); @@ -46,8 +46,8 @@ describe('toHaveBeenCalledTimes', function() { }); it('throws an exception when the actual is not a spy', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() {}; @@ -57,8 +57,8 @@ describe('toHaveBeenCalledTimes', function() { }); it('has a custom message on failure that tells it was called only once', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), - spy = new jasmineUnderTest.Spy('sample-spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes(), + spy = new privateUnderTest.Spy('sample-spy'); spy(); spy(); spy(); @@ -73,8 +73,8 @@ describe('toHaveBeenCalledTimes', function() { }); it('has a custom message on failure that tells how many times it was called', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), - spy = new jasmineUnderTest.Spy('sample-spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes(), + spy = new privateUnderTest.Spy('sample-spy'); spy(); spy(); spy(); @@ -89,8 +89,8 @@ describe('toHaveBeenCalledTimes', function() { }); it('set the correct calls as verified when passing', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledTimes(), - spy = new jasmineUnderTest.Spy('sample-spy'); + const matcher = privateUnderTest.matchers.toHaveBeenCalledTimes(), + spy = new privateUnderTest.Spy('sample-spy'); spy(); spy(); diff --git a/spec/core/matchers/toHaveBeenCalledWithSpec.js b/spec/core/matchers/toHaveBeenCalledWithSpec.js index ac7f3ad4..e1ee60e1 100644 --- a/spec/core/matchers/toHaveBeenCalledWithSpec.js +++ b/spec/core/matchers/toHaveBeenCalledWithSpec.js @@ -3,10 +3,10 @@ describe('toHaveBeenCalledWith', function() { const matchersUtil = { contains: jasmine.createSpy('delegated-contains').and.returnValue(true), equals: jasmine.createSpy('delegated-equals').and.returnValue(true), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + matcher = privateUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('a', 'b'); const result = matcher.compare(calledSpy, 'a', 'b'); @@ -23,11 +23,11 @@ describe('toHaveBeenCalledWith', function() { return true; } ], - matchersUtil = new jasmineUnderTest.MatchersUtil({ + matchersUtil = new privateUnderTest.MatchersUtil({ customTesters: customEqualityTesters }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + matcher = privateUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('a', 'b'); const result = matcher.compare(calledSpy, 'a', 'b'); @@ -39,10 +39,10 @@ describe('toHaveBeenCalledWith', function() { contains: jasmine .createSpy('delegated-contains') .and.returnValue(false), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), - uncalledSpy = new jasmineUnderTest.Spy('uncalled spy'); + matcher = privateUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), + uncalledSpy = new privateUnderTest.Spy('uncalled spy'); const result = matcher.compare(uncalledSpy); expect(result.pass).toBe(false); @@ -52,11 +52,11 @@ describe('toHaveBeenCalledWith', function() { }); it('fails when the actual was called with different parameters', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), - calledSpy = new jasmineUnderTest.Spy('called spy'); + matcher = privateUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), + calledSpy = new privateUnderTest.Spy('called spy'); calledSpy('a'); calledSpy('c', 'd'); @@ -84,8 +84,8 @@ describe('toHaveBeenCalledWith', function() { }); it('throws an exception when the actual is not a spy', function() { - const matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toHaveBeenCalledWith({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() {}; @@ -98,10 +98,10 @@ describe('toHaveBeenCalledWith', function() { const matchersUtil = { contains: jasmine.createSpy('delegated-contains').and.returnValue(true), equals: jasmine.createSpy('delegated-equals').and.returnValue(true), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), - calledSpy = new jasmineUnderTest.Spy('called-spy'); + matcher = privateUnderTest.matchers.toHaveBeenCalledWith(matchersUtil), + calledSpy = new privateUnderTest.Spy('called-spy'); calledSpy('a', 'b'); matcher.compare(calledSpy, 'a', 'b'); diff --git a/spec/core/matchers/toHaveClassSpec.js b/spec/core/matchers/toHaveClassSpec.js index c997d3f6..0c9c566d 100644 --- a/spec/core/matchers/toHaveClassSpec.js +++ b/spec/core/matchers/toHaveClassSpec.js @@ -1,6 +1,6 @@ describe('toHaveClass', function() { it('fails for a DOM element that lacks the expected class', function() { - const matcher = jasmineUnderTest.matchers.toHaveClass(), + const matcher = privateUnderTest.matchers.toHaveClass(), result = matcher.compare( specHelpers.domHelpers.createElementWithClassName(''), 'foo' @@ -10,7 +10,7 @@ describe('toHaveClass', function() { }); it('passes for a DOM element that has the expected class', function() { - const matcher = jasmineUnderTest.matchers.toHaveClass(), + const matcher = privateUnderTest.matchers.toHaveClass(), el = specHelpers.domHelpers.createElementWithClassName('foo bar baz'); expect(matcher.compare(el, 'foo').pass).toBe(true); @@ -19,15 +19,15 @@ describe('toHaveClass', function() { }); it('fails for a DOM element that only has other classes', function() { - const matcher = jasmineUnderTest.matchers.toHaveClass(), + const matcher = privateUnderTest.matchers.toHaveClass(), el = specHelpers.domHelpers.createElementWithClassName('foo bar'); expect(matcher.compare(el, 'fo').pass).toBe(false); }); it('throws an exception when actual is not a DOM element', function() { - const matcher = jasmineUnderTest.matchers.toHaveClass({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toHaveClass({ + pp: privateUnderTest.makePrettyPrinter() }); expect(function() { diff --git a/spec/core/matchers/toHaveClassesSpec.js b/spec/core/matchers/toHaveClassesSpec.js index 0a55edc3..e31e6ad0 100644 --- a/spec/core/matchers/toHaveClassesSpec.js +++ b/spec/core/matchers/toHaveClassesSpec.js @@ -1,6 +1,6 @@ describe('toHaveClasses', function() { it('fails for a DOM element that lacks all the expected classes', function() { - const matcher = jasmineUnderTest.matchers.toHaveClasses(), + const matcher = privateUnderTest.matchers.toHaveClasses(), result = matcher.compare( specHelpers.domHelpers.createElementWithClassName(''), ['foo', 'bar'] @@ -10,22 +10,22 @@ describe('toHaveClasses', function() { }); it('passes for a DOM element that has all the expected classes', function() { - const matcher = jasmineUnderTest.matchers.toHaveClasses(), + const matcher = privateUnderTest.matchers.toHaveClasses(), el = specHelpers.domHelpers.createElementWithClassName('foo bar baz'); expect(matcher.compare(el, ['foo', 'bar']).pass).toBe(true); }); it('fails for a DOM element that only has some matching classes', function() { - const matcher = jasmineUnderTest.matchers.toHaveClasses(), + const matcher = privateUnderTest.matchers.toHaveClasses(), el = specHelpers.domHelpers.createElementWithClassName('foo bar'); expect(matcher.compare(el, ['foo', 'can']).pass).toBe(false); }); it('throws an exception when actual is not a DOM element', function() { - const matcher = jasmineUnderTest.matchers.toHaveClasses({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toHaveClasses({ + pp: privateUnderTest.makePrettyPrinter() }); expect(function() { diff --git a/spec/core/matchers/toHaveNoOtherSpyInteractionsSpec.js b/spec/core/matchers/toHaveNoOtherSpyInteractionsSpec.js index ddb669c4..96cc916e 100644 --- a/spec/core/matchers/toHaveNoOtherSpyInteractionsSpec.js +++ b/spec/core/matchers/toHaveNoOtherSpyInteractionsSpec.js @@ -1,6 +1,6 @@ describe('toHaveNoOtherSpyInteractions', function() { it('passes when there are no spy interactions', function() { - let matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -10,8 +10,8 @@ describe('toHaveNoOtherSpyInteractions', function() { }); it('passes when there are multiple spy interactions where checked by toHaveBeenCalled', function() { - let matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions(); - let toHaveBeenCalledMatcher = jasmineUnderTest.matchers.toHaveBeenCalled(); + let matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions(); + let toHaveBeenCalledMatcher = privateUnderTest.matchers.toHaveBeenCalled(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -26,10 +26,10 @@ describe('toHaveNoOtherSpyInteractions', function() { }); it('fails when there are spy interactions', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }); - let matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions( + let matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions( matchersUtil ); let spyObj = jasmineUnderTest @@ -47,10 +47,10 @@ describe('toHaveNoOtherSpyInteractions', function() { }); it('shows the right message is negated', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }); - let matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions( + let matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions( matchersUtil ); let spyObj = jasmineUnderTest @@ -70,7 +70,7 @@ describe('toHaveNoOtherSpyInteractions', function() { }); it('passes when only non-observed spy object interactions are interacted', function() { - let matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -86,7 +86,7 @@ describe('toHaveNoOtherSpyInteractions', function() { }); it('throws an error if a non-object is passed', function() { - let matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions(); expect(function() { matcher.compare(true); @@ -102,7 +102,7 @@ describe('toHaveNoOtherSpyInteractions', function() { }); it('throws an error if arguments are passed', function() { - let matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('mySpyObj', ['spyA', 'spyB']); @@ -113,7 +113,7 @@ describe('toHaveNoOtherSpyInteractions', function() { }); it('throws an error if the spy object has no spies', function() { - let matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions(); const spyObj = jasmineUnderTest .getEnv() .createSpyObj('mySpyObj', ['notSpy']); @@ -129,13 +129,13 @@ describe('toHaveNoOtherSpyInteractions', function() { }); it('handles multiple interactions with a single spy', function() { - const matchersUtil = new jasmineUnderTest.MatchersUtil({ - pp: jasmineUnderTest.makePrettyPrinter() + const matchersUtil = new privateUnderTest.MatchersUtil({ + pp: privateUnderTest.makePrettyPrinter() }), - matcher = jasmineUnderTest.matchers.toHaveNoOtherSpyInteractions( + matcher = privateUnderTest.matchers.toHaveNoOtherSpyInteractions( matchersUtil ), - toHaveBeenCalledWithMatcher = jasmineUnderTest.matchers.toHaveBeenCalledWith( + toHaveBeenCalledWithMatcher = privateUnderTest.matchers.toHaveBeenCalledWith( matchersUtil ), spyObj = jasmineUnderTest diff --git a/spec/core/matchers/toHaveSizeSpec.js b/spec/core/matchers/toHaveSizeSpec.js index 218b6178..0fddaa72 100644 --- a/spec/core/matchers/toHaveSizeSpec.js +++ b/spec/core/matchers/toHaveSizeSpec.js @@ -2,22 +2,22 @@ describe('toHaveSize', function() { 'use strict'; it('passes for an array whose length matches', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare([1, 2], 2); expect(result.pass).toBe(true); }); it('fails for an array whose length does not match', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare([1, 2, 3], 2); expect(result.pass).toBe(false); }); it('informs about the size of an array whose length does not match', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toHaveSize({ + pp: privateUnderTest.makePrettyPrinter() }), result = matcher.compare([1, 2, 3], 2); @@ -27,42 +27,42 @@ describe('toHaveSize', function() { }); it('passes for an object with the proper number of keys', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare({ a: 1, b: 2 }, 2); expect(result.pass).toBe(true); }); it('fails for an object with a different number of keys', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare({ a: 1, b: 2 }, 1); expect(result.pass).toBe(false); }); it('passes for an object with an explicit `length` property that matches', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare({ a: 1, b: 2, length: 5 }, 5); expect(result.pass).toBe(true); }); it('fails for an object with an explicit `length` property that does not match', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare({ a: 1, b: 2, length: 5 }, 1); expect(result.pass).toBe(false); }); it('passes for a string whose length matches', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare('ab', 2); expect(result.pass).toBe(true); }); it('fails for a string whose length does not match', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare('abc', 2); expect(result.pass).toBe(false); @@ -73,7 +73,7 @@ describe('toHaveSize', function() { map.set('a', 1); map.set('b', 2); - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare(map, 2); expect(result.pass).toBe(true); @@ -84,7 +84,7 @@ describe('toHaveSize', function() { map.set('a', 1); map.set('b', 2); - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare(map, 1); expect(result.pass).toBe(false); @@ -95,7 +95,7 @@ describe('toHaveSize', function() { set.add('a'); set.add('b'); - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare(set, 2); expect(result.pass).toBe(true); @@ -106,14 +106,14 @@ describe('toHaveSize', function() { set.add('a'); set.add('b'); - const matcher = jasmineUnderTest.matchers.toHaveSize(), + const matcher = privateUnderTest.matchers.toHaveSize(), result = matcher.compare(set, 1); expect(result.pass).toBe(false); }); it('throws an error for WeakSet', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(); + const matcher = privateUnderTest.matchers.toHaveSize(); expect(function() { matcher.compare(new WeakSet(), 2); @@ -121,7 +121,7 @@ describe('toHaveSize', function() { }); it('throws an error for WeakMap', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(); + const matcher = privateUnderTest.matchers.toHaveSize(); expect(function() { matcher.compare(new WeakMap(), 2); @@ -129,7 +129,7 @@ describe('toHaveSize', function() { }); it('throws an error for DataView', function() { - const matcher = jasmineUnderTest.matchers.toHaveSize(); + const matcher = privateUnderTest.matchers.toHaveSize(); expect(function() { matcher.compare(new DataView(new ArrayBuffer(128)), 2); diff --git a/spec/core/matchers/toHaveSpyInteractionsSpec.js b/spec/core/matchers/toHaveSpyInteractionsSpec.js index d5b71f83..69678b6e 100755 --- a/spec/core/matchers/toHaveSpyInteractionsSpec.js +++ b/spec/core/matchers/toHaveSpyInteractionsSpec.js @@ -1,6 +1,6 @@ describe('toHaveSpyInteractions', function() { it('passes when there are spy interactions', function() { - let matcher = jasmineUnderTest.matchers.toHaveSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -12,7 +12,7 @@ describe('toHaveSpyInteractions', function() { }); it('passes when there are multiple spy interactions', function() { - let matcher = jasmineUnderTest.matchers.toHaveSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -26,7 +26,7 @@ describe('toHaveSpyInteractions', function() { }); it('fails when there are no spy interactions', function() { - let matcher = jasmineUnderTest.matchers.toHaveSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -39,7 +39,7 @@ describe('toHaveSpyInteractions', function() { }); it('shows the right message is negated', function() { - let matcher = jasmineUnderTest.matchers.toHaveSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -55,7 +55,7 @@ describe('toHaveSpyInteractions', function() { }); it('fails when only non-observed spy object interactions are interacted', function() { - let matcher = jasmineUnderTest.matchers.toHaveSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -71,7 +71,7 @@ describe('toHaveSpyInteractions', function() { }); it('throws an error if a non-object is passed', function() { - let matcher = jasmineUnderTest.matchers.toHaveSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveSpyInteractions(); expect(function() { matcher.compare(true); @@ -87,7 +87,7 @@ describe('toHaveSpyInteractions', function() { }); it('throws an error if arguments are passed', function() { - let matcher = jasmineUnderTest.matchers.toHaveSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveSpyInteractions(); let spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['spyA', 'spyB']); @@ -98,7 +98,7 @@ describe('toHaveSpyInteractions', function() { }); it('throws an error if the spy object has no spies', function() { - let matcher = jasmineUnderTest.matchers.toHaveSpyInteractions(); + let matcher = privateUnderTest.matchers.toHaveSpyInteractions(); const spyObj = jasmineUnderTest .getEnv() .createSpyObj('NewClass', ['notSpy']); diff --git a/spec/core/matchers/toMatchSpec.js b/spec/core/matchers/toMatchSpec.js index 0dd4840b..c25ba51c 100644 --- a/spec/core/matchers/toMatchSpec.js +++ b/spec/core/matchers/toMatchSpec.js @@ -1,34 +1,34 @@ describe('toMatch', function() { it('passes when RegExps are equivalent', function() { - const matcher = jasmineUnderTest.matchers.toMatch(); + const matcher = privateUnderTest.matchers.toMatch(); const result = matcher.compare(/foo/, /foo/); expect(result.pass).toBe(true); }); it('fails when RegExps are not equivalent', function() { - const matcher = jasmineUnderTest.matchers.toMatch(); + const matcher = privateUnderTest.matchers.toMatch(); const result = matcher.compare(/bar/, /foo/); expect(result.pass).toBe(false); }); it('passes when the actual matches the expected string as a pattern', function() { - const matcher = jasmineUnderTest.matchers.toMatch(); + const matcher = privateUnderTest.matchers.toMatch(); const result = matcher.compare('foosball', 'foo'); expect(result.pass).toBe(true); }); it('fails when the actual matches the expected string as a pattern', function() { - const matcher = jasmineUnderTest.matchers.toMatch(); + const matcher = privateUnderTest.matchers.toMatch(); const result = matcher.compare('bar', 'foo'); expect(result.pass).toBe(false); }); it('throws an Error when the expected is not a String or RegExp', function() { - const matcher = jasmineUnderTest.matchers.toMatch(); + const matcher = privateUnderTest.matchers.toMatch(); expect(function() { matcher.compare('foo', { bar: 'baz' }); diff --git a/spec/core/matchers/toThrowErrorSpec.js b/spec/core/matchers/toThrowErrorSpec.js index c74c020d..6ba2edda 100644 --- a/spec/core/matchers/toThrowErrorSpec.js +++ b/spec/core/matchers/toThrowErrorSpec.js @@ -1,6 +1,6 @@ describe('toThrowError', function() { it('throws an error when the actual is not a function', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(); + const matcher = privateUnderTest.matchers.toThrowError(); expect(function() { matcher.compare({}); @@ -8,7 +8,7 @@ describe('toThrowError', function() { }); it('throws an error when the expected is not an Error, string, or RegExp', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(), + const matcher = privateUnderTest.matchers.toThrowError(), fn = function() { throw new Error('foo'); }; @@ -19,7 +19,7 @@ describe('toThrowError', function() { }); it('throws an error when the expected error type is not an Error', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(), + const matcher = privateUnderTest.matchers.toThrowError(), fn = function() { throw new Error('foo'); }; @@ -30,7 +30,7 @@ describe('toThrowError', function() { }); it('throws an error when the expected error message is not a string or RegExp', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(), + const matcher = privateUnderTest.matchers.toThrowError(), fn = function() { throw new Error('foo'); }; @@ -41,7 +41,7 @@ describe('toThrowError', function() { }); it('fails if actual does not throw at all', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(), + const matcher = privateUnderTest.matchers.toThrowError(), fn = function() { return true; }; @@ -53,8 +53,8 @@ describe('toThrowError', function() { }); it('fails if thrown is not an instanceof Error', function() { - const matcher = jasmineUnderTest.matchers.toThrowError({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrowError({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() { throw 4; @@ -85,7 +85,7 @@ describe('toThrowError', function() { pending('This test only runs in browsers.'); } - const matcher = jasmineUnderTest.matchers.toThrowError(); + const matcher = privateUnderTest.matchers.toThrowError(); iframe = document.body.appendChild(document.createElement('iframe')); iframe.src = 'about:blank'; const iframeDocument = iframe.contentWindow.document; @@ -103,8 +103,8 @@ describe('toThrowError', function() { }); it('fails with the correct message if thrown is a falsy value', function() { - const matcher = jasmineUnderTest.matchers.toThrowError({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrowError({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() { throw undefined; @@ -118,7 +118,7 @@ describe('toThrowError', function() { }); it('passes if thrown is a type of Error, but there is no expected error', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(), + const matcher = privateUnderTest.matchers.toThrowError(), fn = function() { throw new TypeError(); }; @@ -132,8 +132,8 @@ describe('toThrowError', function() { }); it('passes if thrown is an Error and the expected is the same message', function() { - const matcher = jasmineUnderTest.matchers.toThrowError({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrowError({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() { throw new Error('foo'); @@ -148,8 +148,8 @@ describe('toThrowError', function() { }); it('fails if thrown is an Error and the expected is not the same message', function() { - const matcher = jasmineUnderTest.matchers.toThrowError({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrowError({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() { throw new Error('foo'); @@ -164,8 +164,8 @@ describe('toThrowError', function() { }); it('passes if thrown is an Error and the expected is a RegExp that matches the message', function() { - const matcher = jasmineUnderTest.matchers.toThrowError({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrowError({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() { throw new Error('a long message'); @@ -180,8 +180,8 @@ describe('toThrowError', function() { }); it('fails if thrown is an Error and the expected is a RegExp that does not match the message', function() { - const matcher = jasmineUnderTest.matchers.toThrowError({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrowError({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() { throw new Error('a long message'); @@ -196,7 +196,7 @@ describe('toThrowError', function() { }); it('passes if thrown is an Error and the expected the same Error', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(), + const matcher = privateUnderTest.matchers.toThrowError(), fn = function() { throw new Error(); }; @@ -208,7 +208,7 @@ describe('toThrowError', function() { }); it('passes if thrown is a custom error that takes arguments and the expected is the same error', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(), + const matcher = privateUnderTest.matchers.toThrowError(), CustomError = function CustomError(arg) { arg.x; }, @@ -227,7 +227,7 @@ describe('toThrowError', function() { }); it('fails if thrown is an Error and the expected is a different Error', function() { - const matcher = jasmineUnderTest.matchers.toThrowError(), + const matcher = privateUnderTest.matchers.toThrowError(), fn = function() { throw new Error(); }; @@ -243,9 +243,9 @@ describe('toThrowError', function() { it('passes if thrown is a type of Error and it is equal to the expected Error and message', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(true), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrowError(matchersUtil), + matcher = privateUnderTest.matchers.toThrowError(matchersUtil), fn = function() { throw new TypeError('foo'); }; @@ -261,9 +261,9 @@ describe('toThrowError', function() { it('passes if thrown is a custom error that takes arguments and it is equal to the expected custom error and message', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(true), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrowError(matchersUtil), + matcher = privateUnderTest.matchers.toThrowError(matchersUtil), CustomError = function CustomError(arg) { this.message = arg.message; }, @@ -285,9 +285,9 @@ describe('toThrowError', function() { it('fails if thrown is a type of Error and the expected is a different Error', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(false), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrowError(matchersUtil), + matcher = privateUnderTest.matchers.toThrowError(matchersUtil), fn = function() { throw new TypeError('foo'); }; @@ -305,9 +305,9 @@ describe('toThrowError', function() { it('fails if thrown is a type of Error and the expected is a different Error', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(false), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrowError(matchersUtil), + matcher = privateUnderTest.matchers.toThrowError(matchersUtil), fn = function() { throw new TypeError('foo'); }; @@ -324,9 +324,9 @@ describe('toThrowError', function() { it('passes if thrown is a type of Error and has the same type as the expected Error and the message matches the expected message', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(true), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrowError(matchersUtil), + matcher = privateUnderTest.matchers.toThrowError(matchersUtil), fn = function() { throw new TypeError('foo'); }; diff --git a/spec/core/matchers/toThrowMatchingSpec.js b/spec/core/matchers/toThrowMatchingSpec.js index 1b5ed44c..7bfa8821 100644 --- a/spec/core/matchers/toThrowMatchingSpec.js +++ b/spec/core/matchers/toThrowMatchingSpec.js @@ -1,6 +1,6 @@ describe('toThrowMatching', function() { it('throws an error when the actual is not a function', function() { - const matcher = jasmineUnderTest.matchers.toThrowMatching(); + const matcher = privateUnderTest.matchers.toThrowMatching(); expect(function() { matcher.compare({}, function() { @@ -10,7 +10,7 @@ describe('toThrowMatching', function() { }); it('throws an error when the expected is not a function', function() { - const matcher = jasmineUnderTest.matchers.toThrowMatching(), + const matcher = privateUnderTest.matchers.toThrowMatching(), fn = function() { throw new Error('foo'); }; @@ -21,7 +21,7 @@ describe('toThrowMatching', function() { }); it('fails if actual does not throw at all', function() { - const matcher = jasmineUnderTest.matchers.toThrowMatching(), + const matcher = privateUnderTest.matchers.toThrowMatching(), fn = function() { return true; }; @@ -35,8 +35,8 @@ describe('toThrowMatching', function() { }); it('fails with the correct message if thrown is a falsy value', function() { - const matcher = jasmineUnderTest.matchers.toThrowMatching({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrowMatching({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() { throw undefined; @@ -52,7 +52,7 @@ describe('toThrowMatching', function() { }); it('passes if the argument is a function that returns true when called with the error', function() { - const matcher = jasmineUnderTest.matchers.toThrowMatching(), + const matcher = privateUnderTest.matchers.toThrowMatching(), predicate = function(e) { return e.message === 'nope'; }, @@ -69,8 +69,8 @@ describe('toThrowMatching', function() { }); it('fails if the argument is a function that returns false when called with the error', function() { - const matcher = jasmineUnderTest.matchers.toThrowMatching({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrowMatching({ + pp: privateUnderTest.makePrettyPrinter() }), predicate = function(e) { return e.message === 'oh no'; diff --git a/spec/core/matchers/toThrowSpec.js b/spec/core/matchers/toThrowSpec.js index 3f96010e..386a9dcc 100644 --- a/spec/core/matchers/toThrowSpec.js +++ b/spec/core/matchers/toThrowSpec.js @@ -1,6 +1,6 @@ describe('toThrow', function() { it('throws an error when the actual is not a function', function() { - const matcher = jasmineUnderTest.matchers.toThrow(); + const matcher = privateUnderTest.matchers.toThrow(); expect(function() { matcher.compare({}); @@ -9,7 +9,7 @@ describe('toThrow', function() { }); it('fails if actual does not throw', function() { - const matcher = jasmineUnderTest.matchers.toThrow(), + const matcher = privateUnderTest.matchers.toThrow(), fn = function() { return true; }; @@ -23,9 +23,9 @@ describe('toThrow', function() { it('passes if it throws but there is no expected', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(true), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrow(matchersUtil), + matcher = privateUnderTest.matchers.toThrow(matchersUtil), fn = function() { throw 5; }; @@ -39,8 +39,8 @@ describe('toThrow', function() { }); it('passes even if what is thrown is falsy', function() { - const matcher = jasmineUnderTest.matchers.toThrow({ - pp: jasmineUnderTest.makePrettyPrinter() + const matcher = privateUnderTest.matchers.toThrow({ + pp: privateUnderTest.makePrettyPrinter() }), fn = function() { throw undefined; @@ -56,9 +56,9 @@ describe('toThrow', function() { it('passes if what is thrown is equivalent to what is expected', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(true), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrow(matchersUtil), + matcher = privateUnderTest.matchers.toThrow(matchersUtil), fn = function() { throw 5; }; @@ -72,9 +72,9 @@ describe('toThrow', function() { it('fails if what is thrown is not equivalent to what is expected', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(false), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrow(matchersUtil), + matcher = privateUnderTest.matchers.toThrow(matchersUtil), fn = function() { throw 5; }; @@ -90,9 +90,9 @@ describe('toThrow', function() { it('fails if what is thrown is not equivalent to undefined', function() { const matchersUtil = { equals: jasmine.createSpy('delegated-equal').and.returnValue(false), - pp: jasmineUnderTest.makePrettyPrinter() + pp: privateUnderTest.makePrettyPrinter() }, - matcher = jasmineUnderTest.matchers.toThrow(matchersUtil), + matcher = privateUnderTest.matchers.toThrow(matchersUtil), fn = function() { throw 5; }; diff --git a/spec/helpers/defineJasmineUnderTest.js b/spec/helpers/defineJasmineUnderTest.js index 4996387d..15d35dc6 100644 --- a/spec/helpers/defineJasmineUnderTest.js +++ b/spec/helpers/defineJasmineUnderTest.js @@ -3,4 +3,7 @@ // to the Jasmine source files (and not jasmine.js). So re-require window.jasmineUnderTest = jasmineRequire.core(jasmineRequire); jasmineRequire.html(jasmineUnderTest); + + // Alias the private namespace so tests can be less verbose + window.privateUnderTest = window.jasmineUnderTest.private; })(); diff --git a/spec/helpers/integrationMatchers.js b/spec/helpers/integrationMatchers.js index aea7cc4d..76254bf6 100644 --- a/spec/helpers/integrationMatchers.js +++ b/spec/helpers/integrationMatchers.js @@ -42,9 +42,9 @@ : 'Expected runnable "' + fullName + '" to have failures ' + - jasmine.basicPrettyPrinter_(expectedFailures) + + jasmine.private.basicPrettyPrinter(expectedFailures) + ' but it had ' + - jasmine.basicPrettyPrinter_(foundFailures) + jasmine.private.basicPrettyPrinter(foundFailures) }; } }; diff --git a/spec/helpers/nodeDefineJasmineUnderTest.js b/spec/helpers/nodeDefineJasmineUnderTest.js index 05b6c071..ca9382bf 100644 --- a/spec/helpers/nodeDefineJasmineUnderTest.js +++ b/spec/helpers/nodeDefineJasmineUnderTest.js @@ -24,4 +24,7 @@ global.jasmineUnderTest = jasmineUnderTestRequire.core( jasmineUnderTestRequire ); + + // Alias the private namespace so tests can be less verbose + global.privateUnderTest = global.jasmineUnderTest.private; })(); diff --git a/spec/helpers/resetEnv.js b/spec/helpers/resetEnv.js index af90b4b4..f0572c79 100644 --- a/spec/helpers/resetEnv.js +++ b/spec/helpers/resetEnv.js @@ -1,8 +1,8 @@ beforeEach(function() { // env is stateful. Ensure that it, and its global error event listeners, // do not leak between tests. - if (jasmineUnderTest.currentEnv_) { - jasmineUnderTest.currentEnv_.cleanup_(); - jasmineUnderTest.currentEnv_ = null; + if (privateUnderTest.currentEnv_) { + privateUnderTest.currentEnv_.cleanup_(); + privateUnderTest.currentEnv_ = null; } }); diff --git a/spec/html/HtmlReporterSpec.js b/spec/html/HtmlReporterSpec.js index a62fd187..9a682cb7 100644 --- a/spec/html/HtmlReporterSpec.js +++ b/spec/html/HtmlReporterSpec.js @@ -2,7 +2,7 @@ describe('HtmlReporter', function() { let env; beforeEach(function() { - env = new jasmineUnderTest.Env(); + env = new privateUnderTest.Env(); }); afterEach(function() { diff --git a/spec/html/PrettyPrintHtmlSpec.js b/spec/html/PrettyPrintHtmlSpec.js index e667da8f..120b219b 100644 --- a/spec/html/PrettyPrintHtmlSpec.js +++ b/spec/html/PrettyPrintHtmlSpec.js @@ -1,20 +1,20 @@ describe('PrettyPrinter (HTML Dependent)', function() { it('should stringify non-element HTML nodes properly', function() { const sampleNode = document.createTextNode(''); - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); expect(pp(sampleNode)).toEqual('HTMLNode'); expect(pp({ foo: sampleNode })).toEqual('Object({ foo: HTMLNode })'); }); it('should stringify empty HTML elements as their opening tags', function() { const simple = document.createElement('div'); - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); simple.className = 'foo'; expect(pp(simple)).toEqual('
'); }); it('should stringify non-empty HTML elements as tags with placeholders', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const nonEmpty = document.createElement('div'); nonEmpty.className = 'foo'; nonEmpty.innerHTML = '

Irrelevant

'; @@ -23,7 +23,7 @@ describe('PrettyPrinter (HTML Dependent)', function() { it("should print Firefox's wrapped native objects correctly", function() { if (specHelpers.firefoxVersion) { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); let err; try { new CustomEvent(); @@ -38,7 +38,7 @@ describe('PrettyPrinter (HTML Dependent)', function() { }); it('should stringify HTML element with text and attributes', function() { - const pp = jasmineUnderTest.makePrettyPrinter(); + const pp = privateUnderTest.makePrettyPrinter(); const el = document.createElement('div'); el.setAttribute('things', 'foo'); el.innerHTML = 'foo'; diff --git a/spec/html/ResultsNodeSpec.js b/spec/html/ResultsNodeSpec.js index 1869c4a4..f4474d69 100644 --- a/spec/html/ResultsNodeSpec.js +++ b/spec/html/ResultsNodeSpec.js @@ -4,7 +4,7 @@ describe('ResultsNode', function() { id: 123, message: 'foo' }, - node = new jasmineUnderTest.ResultsNode(fakeResult, 'suite', null); + node = new privateUnderTest.ResultsNode(fakeResult, 'suite', null); expect(node.result).toBe(fakeResult); expect(node.type).toEqual('suite'); @@ -19,7 +19,7 @@ describe('ResultsNode', function() { id: 456, message: 'bar' }, - node = new jasmineUnderTest.ResultsNode(fakeResult, 'suite', null); + node = new privateUnderTest.ResultsNode(fakeResult, 'suite', null); node.addChild(fakeChildResult, 'spec'); @@ -37,7 +37,7 @@ describe('ResultsNode', function() { id: 456, message: 'bar' }, - node = new jasmineUnderTest.ResultsNode(fakeResult, 'suite', null); + node = new privateUnderTest.ResultsNode(fakeResult, 'suite', null); node.addChild(fakeChildResult, 'spec'); @@ -53,7 +53,7 @@ describe('ResultsNode', function() { id: 456, message: 'bar' }, - node = new jasmineUnderTest.ResultsNode(fakeResult, 'suite', null); + node = new privateUnderTest.ResultsNode(fakeResult, 'suite', null); node.addChild(fakeChildResult, 'spec'); diff --git a/spec/html/SpyRegistryHtmlSpec.js b/spec/html/SpyRegistryHtmlSpec.js index 3298fedc..5347a6d1 100644 --- a/spec/html/SpyRegistryHtmlSpec.js +++ b/spec/html/SpyRegistryHtmlSpec.js @@ -1,11 +1,11 @@ describe('Spy Registry browser-specific behavior', function() { function createSpy(name, originalFn) { - return jasmineUnderTest.Spy(name, originalFn); + return privateUnderTest.Spy(name, originalFn); } it('can spy on and unspy window.onerror', function() { const spies = [], - spyRegistry = new jasmineUnderTest.SpyRegistry({ + spyRegistry = new privateUnderTest.SpyRegistry({ currentSpies: function() { return spies; }, diff --git a/src/core/CallTracker.js b/src/core/CallTracker.js index ac5f0763..403eaef4 100644 --- a/src/core/CallTracker.js +++ b/src/core/CallTracker.js @@ -123,7 +123,9 @@ getJasmineRequireObj().CallTracker = function(j$) { * @param {Function} [argsCloner] A function to use to clone the arguments. Defaults to a shallow cloning function. * @function */ - this.saveArgumentsByValue = function(argsCloner = j$.util.cloneArgs) { + this.saveArgumentsByValue = function( + argsCloner = j$.private.util.cloneArgs + ) { opts.cloneArgs = true; opts.argsCloner = argsCloner; }; diff --git a/src/core/Deprecator.js b/src/core/Deprecator.js index 5d4e1f57..e4bff4e9 100644 --- a/src/core/Deprecator.js +++ b/src/core/Deprecator.js @@ -23,7 +23,7 @@ getJasmineRequireObj().Deprecator = function(j$) { ) { options = options || {}; - if (!this.verbose_ && !j$.isError_(deprecation)) { + if (!this.verbose_ && !j$.private.isError(deprecation)) { if (this.toSuppress_.indexOf(deprecation) !== -1) { return; } @@ -35,7 +35,7 @@ getJasmineRequireObj().Deprecator = function(j$) { }; Deprecator.prototype.log_ = function(runnable, deprecation, options) { - if (j$.isError_(deprecation)) { + if (j$.private.isError(deprecation)) { // eslint-disable-next-line no-console console.error(deprecation); return; @@ -64,7 +64,7 @@ getJasmineRequireObj().Deprecator = function(j$) { }; Deprecator.prototype.stackTrace_ = function() { - const formatter = new j$.ExceptionFormatter(); + const formatter = new j$.private.ExceptionFormatter(); return formatter.stack(new Error()).replace(/^Error\n/m, ''); }; @@ -73,7 +73,7 @@ getJasmineRequireObj().Deprecator = function(j$) { runnable = this.topSuite_; } - if (j$.isError_(deprecation)) { + if (j$.private.isError(deprecation)) { runnable.addDeprecationWarning(deprecation); return; } diff --git a/src/core/Env.js b/src/core/Env.js index 7cbc61fd..cf33696a 100644 --- a/src/core/Env.js +++ b/src/core/Env.js @@ -11,18 +11,18 @@ getJasmineRequireObj().Env = function(j$) { envOptions = envOptions || {}; const self = this; - const GlobalErrors = envOptions.GlobalErrors || j$.GlobalErrors; + const GlobalErrors = envOptions.GlobalErrors || j$.private.GlobalErrors; const global = envOptions.global || j$.getGlobal(); const realSetTimeout = global.setTimeout; const realClearTimeout = global.clearTimeout; - const clearStack = j$.getClearStack(global); - this.clock = new j$.Clock( + const clearStack = j$.private.getClearStack(global); + this.clock = new j$.private.Clock( global, function() { - return new j$.DelayedFunctionScheduler(); + return new j$.private.DelayedFunctionScheduler(); }, - new j$.MockDate(global) + new j$.private.MockDate(global) ); const globalErrors = new GlobalErrors( @@ -50,7 +50,7 @@ getJasmineRequireObj().Env = function(j$) { }; })(); - const runableResources = new j$.RunableResources({ + const runableResources = new j$.private.RunableResources({ getCurrentRunableId: function() { const r = runner.currentRunable(); return r ? r.id : null; @@ -63,7 +63,7 @@ getJasmineRequireObj().Env = function(j$) { let runner; let parallelLoadingState = null; // 'specs', 'helpers', or null for non-parallel - const config = new j$.Configuration(); + const config = new j$.private.Configuration(); if (!envOptions.suppressLoadErrors) { installGlobalErrors(); @@ -132,11 +132,11 @@ getJasmineRequireObj().Env = function(j$) { runableResources.customObjectFormatters().push(formatter); }; - j$.Expectation.addCoreMatchers(j$.matchers); - j$.Expectation.addAsyncCoreMatchers(j$.asyncMatchers); + j$.private.Expectation.addCoreMatchers(j$.private.matchers); + j$.private.Expectation.addAsyncCoreMatchers(j$.private.asyncMatchers); const expectationFactory = function(actual, spec) { - return j$.Expectation.factory({ + return j$.private.Expectation.factory({ matchersUtil: runableResources.makeMatchersUtil(), customMatchers: runableResources.customMatchers(), actual: actual, @@ -169,7 +169,7 @@ getJasmineRequireObj().Env = function(j$) { }; const throwUnlessFactory = function(actual, spec) { - return j$.Expectation.factory({ + return j$.private.Expectation.factory({ matchersUtil: runableResources.makeMatchersUtil(), customMatchers: runableResources.customMatchers(), actual: actual, @@ -178,7 +178,7 @@ getJasmineRequireObj().Env = function(j$) { }; const throwUnlessAsyncFactory = function(actual, spec) { - return j$.Expectation.asyncFactory({ + return j$.private.Expectation.asyncFactory({ matchersUtil: runableResources.makeMatchersUtil(), customAsyncMatchers: runableResources.customAsyncMatchers(), actual: actual, @@ -193,7 +193,7 @@ getJasmineRequireObj().Env = function(j$) { error.matcherName !== undefined && error.passed !== undefined; const result = isExpectationResult ? error - : j$.buildExpectationResult({ + : j$.private.buildExpectationResult({ error, passed: false, matcherName: '', @@ -254,7 +254,7 @@ getJasmineRequireObj().Env = function(j$) { } const asyncExpectationFactory = function(actual, spec, runableType) { - return j$.Expectation.asyncFactory({ + return j$.private.Expectation.asyncFactory({ matchersUtil: runableResources.makeMatchersUtil(), customAsyncMatchers: runableResources.customAsyncMatchers(), actual: actual, @@ -310,10 +310,10 @@ getJasmineRequireObj().Env = function(j$) { (runner.currentRunable() || topSuite).handleException(e); }; - new j$.QueueRunner(options).execute(); + new j$.private.QueueRunner(options).execute(); } - const suiteBuilder = new j$.SuiteBuilder({ + const suiteBuilder = new j$.private.SuiteBuilder({ env: this, expectationFactory, asyncExpectationFactory, @@ -321,7 +321,7 @@ getJasmineRequireObj().Env = function(j$) { runQueue }); topSuite = suiteBuilder.topSuite; - const deprecator = new j$.Deprecator(topSuite); + const deprecator = new j$.private.Deprecator(topSuite); /** * Provides the root suite, through which all suites and specs can be @@ -341,23 +341,23 @@ getJasmineRequireObj().Env = function(j$) { * @interface Reporter * @see custom_reporter */ - reportDispatcher = new j$.ReportDispatcher( - j$.reporterEvents, + reportDispatcher = new j$.private.ReportDispatcher( + j$.private.reporterEvents, function(options) { - options.SkipPolicy = j$.NeverSkipPolicy; + options.SkipPolicy = j$.private.NeverSkipPolicy; return runQueue(options); }, recordLateError ); - runner = new j$.Runner({ + runner = new j$.private.Runner({ topSuite, totalSpecsDefined: () => suiteBuilder.totalSpecsDefined, focusedRunables: () => suiteBuilder.focusedRunables, runableResources, reportDispatcher, runQueue, - TreeProcessor: j$.TreeProcessor, + TreeProcessor: j$.private.TreeProcessor, globalErrors, getConfig: () => config }); @@ -523,7 +523,7 @@ getJasmineRequireObj().Env = function(j$) { try { const maybePromise = fn(spy); - if (!j$.isPromiseLike(maybePromise)) { + if (!j$.private.isPromiseLike(maybePromise)) { throw new Error( 'The callback to spyOnGlobalErrorsAsync must be an async or promise-returning function' ); @@ -758,7 +758,7 @@ getJasmineRequireObj().Env = function(j$) { }; this.pending = function(message) { - let fullMessage = j$.Spec.pendingSpecExceptionMessage; + let fullMessage = j$.private.Spec.pendingSpecExceptionMessage; if (message) { fullMessage += message; } @@ -777,7 +777,7 @@ getJasmineRequireObj().Env = function(j$) { message += ': '; if (error.message) { message += error.message; - } else if (j$.isString_(error)) { + } else if (j$.private.isString(error)) { message += error; } else { // pretty print all kind of objects. This includes arrays. @@ -806,7 +806,7 @@ getJasmineRequireObj().Env = function(j$) { } function callerCallerFilename() { - const frames = new j$.StackTrace(new Error()).frames; + const frames = new j$.private.StackTrace(new Error()).frames; // frames[3] should always exist except in Jasmine's own tests, which bypass // the global it/describe layer, but don't crash if it doesn't. return frames[3] && frames[3].file; diff --git a/src/core/ExceptionFormatter.js b/src/core/ExceptionFormatter.js index c2d6710a..cedc76e3 100644 --- a/src/core/ExceptionFormatter.js +++ b/src/core/ExceptionFormatter.js @@ -14,7 +14,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) { function ExceptionFormatter(options) { const jasmineFile = - (options && options.jasmineFile) || j$.util.jasmineFile(); + (options && options.jasmineFile) || j$.private.util.jasmineFile(); this.message = function(error) { let message = ''; @@ -58,7 +58,7 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) { lines.pop(); } - const stackTrace = new j$.StackTrace(error); + const stackTrace = new j$.private.StackTrace(error); lines = lines.concat(filterJasmine(stackTrace)); if (messageHandling === 'require') { @@ -111,7 +111,9 @@ getJasmineRequireObj().ExceptionFormatter = function(j$) { } if (!empty) { - return 'error properties: ' + j$.basicPrettyPrinter_(result) + '\n'; + return ( + 'error properties: ' + j$.private.basicPrettyPrinter(result) + '\n' + ); } return ''; diff --git a/src/core/Expectation.js b/src/core/Expectation.js index 8d3950dc..00360404 100644 --- a/src/core/Expectation.js +++ b/src/core/Expectation.js @@ -4,7 +4,7 @@ getJasmineRequireObj().Expectation = function(j$) { * @namespace matchers */ function Expectation(options) { - this.expector = new j$.Expector(options); + this.expector = new j$.private.Expector(options); const customMatchers = options.customMatchers || {}; for (const matcherName in customMatchers) { @@ -80,7 +80,7 @@ getJasmineRequireObj().Expectation = function(j$) { * @namespace async-matchers */ function AsyncExpectation(options) { - this.expector = new j$.Expector(options); + this.expector = new j$.private.Expector(options); const customAsyncMatchers = options.customAsyncMatchers || {}; for (const matcherName in customAsyncMatchers) { @@ -173,7 +173,7 @@ getJasmineRequireObj().Expectation = function(j$) { function negatedFailureMessage(result, matcherName, args, matchersUtil) { if (result.message) { - if (j$.isFunction_(result.message)) { + if (j$.private.isFunction(result.message)) { return result.message(); } else { return result.message; @@ -218,7 +218,7 @@ getJasmineRequireObj().Expectation = function(j$) { return function(actual) { const matcherArgs = arguments; - return j$.isPending_(actual).then(function(isPending) { + return j$.private.isPending(actual).then(function(isPending) { if (isPending) { return { pass: false, diff --git a/src/core/Expector.js b/src/core/Expector.js index 01802f24..a5ddeabf 100644 --- a/src/core/Expector.js +++ b/src/core/Expector.js @@ -5,7 +5,7 @@ getJasmineRequireObj().Expector = function(j$) { }; this.actual = options.actual; this.addExpectationResult = options.addExpectationResult || function() {}; - this.filters = new j$.ExpectationFilterChain(); + this.filters = new j$.private.ExpectationFilterChain(); } Expector.prototype.instantiateMatcher = function( @@ -39,7 +39,7 @@ getJasmineRequireObj().Expector = function(j$) { this.matchersUtil, args ); - } else if (j$.isFunction_(result.message)) { + } else if (j$.private.isFunction(result.message)) { return result.message(); } else { return result.message; diff --git a/src/core/GlobalErrors.js b/src/core/GlobalErrors.js index 27af0128..ec167ae5 100644 --- a/src/core/GlobalErrors.js +++ b/src/core/GlobalErrors.js @@ -24,7 +24,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) { if ( global.process && global.process.listeners && - j$.isFunction_(global.process.on) + j$.private.isFunction(global.process.on) ) { this.#adapter = new NodeAdapter(global, dispatch); } else { @@ -173,7 +173,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) { const jasmineMessage = 'Unhandled promise rejection: ' + event.reason; let reason; - if (j$.isError_(event.reason)) { + if (j$.private.isError(event.reason)) { reason = event.reason; reason.jasmineMessage = jasmineMessage; } else { @@ -252,7 +252,7 @@ getJasmineRequireObj().GlobalErrors = function(j$) { jasmineMessagePrefix = 'Uncaught exception'; } - if (j$.isError_(error)) { + if (j$.private.isError(error)) { error.jasmineMessage = jasmineMessagePrefix + ': ' + error; return error; } else { diff --git a/src/core/ParallelReportDispatcher.js b/src/core/ParallelReportDispatcher.js index db673065..c6491d21 100644 --- a/src/core/ParallelReportDispatcher.js +++ b/src/core/ParallelReportDispatcher.js @@ -16,11 +16,12 @@ getJasmineRequireObj().ParallelReportDispatcher = function(j$) { * @param onError {function} Function called when an unhandled exception, unhandled promise rejection, or explicit reporter failure occurs */ function ParallelReportDispatcher(onError, deps = {}) { - const ReportDispatcher = deps.ReportDispatcher || j$.ReportDispatcher; - const QueueRunner = deps.QueueRunner || j$.QueueRunner; - const globalErrors = deps.globalErrors || new j$.GlobalErrors(); + const ReportDispatcher = + deps.ReportDispatcher || j$.private.ReportDispatcher; + const QueueRunner = deps.QueueRunner || j$.private.QueueRunner; + const globalErrors = deps.globalErrors || new j$.private.GlobalErrors(); const dispatcher = new ReportDispatcher( - j$.reporterEvents, + j$.private.reporterEvents, function(queueRunnerOptions) { queueRunnerOptions = { ...queueRunnerOptions, @@ -84,7 +85,7 @@ getJasmineRequireObj().ParallelReportDispatcher = function(j$) { } }; - for (const eventName of j$.reporterEvents) { + for (const eventName of j$.private.reporterEvents) { self[eventName] = dispatcher[eventName].bind(dispatcher); } diff --git a/src/core/PrettyPrinter.js b/src/core/PrettyPrinter.js index 5489f910..7ee38566 100644 --- a/src/core/PrettyPrinter.js +++ b/src/core/PrettyPrinter.js @@ -26,7 +26,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { this.emitScalar(''); } else if (value.jasmineToString) { this.emitScalar(value.jasmineToString(this.pp_)); - } else if (j$.isString_(value)) { + } else if (j$.private.isString(value)) { this.emitString(value); } else if (j$.isSpy(value)) { this.emitScalar('spy on ' + value.and.identity); @@ -40,7 +40,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } else { this.emitScalar('Function'); } - } else if (j$.isDomNode(value)) { + } else if (j$.private.isDomNode(value)) { if (value.tagName) { this.emitDomElement(value); } else { @@ -48,16 +48,16 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } } else if (value instanceof Date) { this.emitScalar('Date(' + value + ')'); - } else if (j$.isSet(value)) { + } else if (j$.private.isSet(value)) { this.emitSet(value); - } else if (j$.isMap(value)) { + } else if (j$.private.isMap(value)) { this.emitMap(value); - } else if (j$.isTypedArray_(value)) { + } else if (j$.private.isTypedArray(value)) { this.emitTypedArray(value); } else if ( value.toString && typeof value === 'object' && - !j$.isArray_(value) && + !j$.private.isArray(value) && hasCustomToString(value) ) { try { @@ -69,12 +69,15 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } else if (this.seen.includes(value)) { this.emitScalar( '' ); - } else if (j$.isArray_(value) || j$.isA_('Object', value)) { + } else if ( + j$.private.isArray(value) || + j$.private.isA('Object', value) + ) { this.seen.push(value); - if (j$.isArray_(value)) { + if (j$.private.isArray(value)) { this.emitArray(value); } else { this.emitObject(value); @@ -97,7 +100,10 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } iterateObject(obj, fn) { - const objKeys = j$.MatchersUtil.keys(obj, j$.isArray_(obj)); + const objKeys = j$.private.MatchersUtil.keys( + obj, + j$.private.isArray(obj) + ); const length = Math.min(objKeys.length, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH); for (let i = 0; i < length; i++) { @@ -206,7 +212,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { const ctor = obj.constructor; const constructorName = typeof ctor === 'function' && obj instanceof ctor - ? j$.fnNameFor(obj.constructor) + ? j$.private.fnNameFor(obj.constructor) : 'null'; this.append(constructorName); @@ -236,7 +242,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { } emitTypedArray(arr) { - const constructorName = j$.fnNameFor(arr.constructor); + const constructorName = j$.private.fnNameFor(arr.constructor); const limitedArray = Array.prototype.slice.call( arr, 0, @@ -305,7 +311,7 @@ getJasmineRequireObj().makePrettyPrinter = function(j$) { // iframe, web worker) try { return ( - j$.isFunction_(value.toString) && + j$.private.isFunction(value.toString) && value.toString !== Object.prototype.toString && value.toString() !== Object.prototype.toString.call(value) ); diff --git a/src/core/QueueRunner.js b/src/core/QueueRunner.js index 87d3ee10..5a339157 100644 --- a/src/core/QueueRunner.js +++ b/src/core/QueueRunner.js @@ -3,7 +3,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { function StopExecutionError() {} StopExecutionError.prototype = new Error(); - j$.StopExecutionError = StopExecutionError; + j$.private.StopExecutionError = StopExecutionError; function once(fn, onTwice) { let called = false; @@ -56,7 +56,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { }; this.onException = attrs.onException || emptyFn; this.onMultipleDone = attrs.onMultipleDone || fallbackOnMultipleDone; - this.userContext = attrs.userContext || new j$.UserContext(); + this.userContext = attrs.userContext || new j$.private.UserContext(); this.timeout = attrs.timeout || { setTimeout: setTimeout, clearTimeout: clearTimeout @@ -67,7 +67,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { popListener: emptyFn }; - const SkipPolicy = attrs.SkipPolicy || j$.NeverSkipPolicy; + const SkipPolicy = attrs.SkipPolicy || j$.private.NeverSkipPolicy; this.skipPolicy_ = new SkipPolicy(this.queueableFns); this.errored_ = false; @@ -190,7 +190,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { if (queueableFn.fn.length === 0) { maybeThenable = queueableFn.fn.call(this.userContext); - if (maybeThenable && j$.isFunction_(maybeThenable.then)) { + if (maybeThenable && j$.private.isFunction(maybeThenable.then)) { maybeThenable.then( wrapInPromiseResolutionHandler(next), onPromiseRejection @@ -260,11 +260,11 @@ getJasmineRequireObj().QueueRunner = function(j$) { }; QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) { - if (retval && j$.isFunction_(retval.then)) { + if (retval && j$.private.isFunction(retval.then)) { // Issue a warning that matches the user's code. // Omit the stack trace because there's almost certainly no user code // on the stack at this point. - if (j$.isAsyncFunction_(fn)) { + if (j$.private.isAsyncFunction(fn)) { this.onException( new Error( 'An asynchronous before/it/after ' + @@ -288,7 +288,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { function wrapInPromiseResolutionHandler(fn) { return function(maybeArg) { - if (j$.isError_(maybeArg)) { + if (j$.private.isError(maybeArg)) { fn(maybeArg); } else { fn(); diff --git a/src/core/RunableResources.js b/src/core/RunableResources.js index 33e8b025..ae1ce6a8 100644 --- a/src/core/RunableResources.js +++ b/src/core/RunableResources.js @@ -5,7 +5,7 @@ getJasmineRequireObj().RunableResources = function(j$) { this.getCurrentRunableId_ = options.getCurrentRunableId; this.globalErrors_ = options.globalErrors; - this.spyFactory = new j$.SpyFactory( + this.spyFactory = new j$.private.SpyFactory( () => { if (this.getCurrentRunableId_()) { return this.customSpyStrategies(); @@ -17,7 +17,7 @@ getJasmineRequireObj().RunableResources = function(j$) { () => this.makeMatchersUtil() ); - this.spyRegistry = new j$.SpyRegistry({ + this.spyRegistry = new j$.private.SpyRegistry({ currentSpies: () => this.spies(), createSpy: (name, originalFn) => this.spyFactory.createSpy(name, originalFn) @@ -48,7 +48,7 @@ getJasmineRequireObj().RunableResources = function(j$) { ]; for (const k of toClone) { - newRes[k] = j$.util.clone(parentRes[k]); + newRes[k] = j$.private.util.clone(parentRes[k]); } } } @@ -126,17 +126,19 @@ getJasmineRequireObj().RunableResources = function(j$) { } makePrettyPrinter() { - return j$.makePrettyPrinter(this.customObjectFormatters()); + return j$.private.makePrettyPrinter(this.customObjectFormatters()); } makeMatchersUtil() { if (this.getCurrentRunableId_()) { - return new j$.MatchersUtil({ + return new j$.private.MatchersUtil({ customTesters: this.customEqualityTesters(), pp: this.makePrettyPrinter() }); } else { - return new j$.MatchersUtil({ pp: j$.basicPrettyPrinter_ }); + return new j$.private.MatchersUtil({ + pp: j$.private.basicPrettyPrinter + }); } } diff --git a/src/core/Runner.js b/src/core/Runner.js index 8e06e8b6..9c71d7e5 100644 --- a/src/core/Runner.js +++ b/src/core/Runner.js @@ -24,7 +24,7 @@ getJasmineRequireObj().Runner = function(j$) { this.#reportDispatcher = options.reportDispatcher; this.#getConfig = options.getConfig; this.#executedBefore = false; - this.#currentRunableTracker = new j$.CurrentRunableTracker(); + this.#currentRunableTracker = new j$.private.CurrentRunableTracker(); } currentSpec() { @@ -64,9 +64,9 @@ getJasmineRequireObj().Runner = function(j$) { } } - const order = new j$.Order({ + const order = new j$.private.Order({ random: config.random, - seed: j$.isNumber_(config.seed) ? config.seed + '' : config.seed + seed: j$.private.isNumber(config.seed) ? config.seed + '' : config.seed }); const treeProcessor = new this.#TreeProcessor({ @@ -108,7 +108,7 @@ getJasmineRequireObj().Runner = function(j$) { }); this.#currentRunableTracker.pushSuite(this.#topSuite); - const treeRunner = new j$.TreeRunner({ + const treeRunner = new j$.private.TreeRunner({ executionTree: this.#executionTree, globalErrors: this.#globalErrors, runableResources: this.#runableResources, diff --git a/src/core/Spec.js b/src/core/Spec.js index 56d572bf..2f3202d8 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -43,7 +43,7 @@ getJasmineRequireObj().Spec = function(j$) { } addExpectationResult(passed, data, isError) { - const expectationResult = j$.buildExpectationResult(data); + const expectationResult = j$.private.buildExpectationResult(data); if (passed) { this.result.passedExpectations.push(expectationResult); @@ -60,7 +60,7 @@ getJasmineRequireObj().Spec = function(j$) { } if (this.#throwOnExpectationFailure && !isError) { - throw new j$.errors.ExpectationFailed(); + throw new j$.private.errors.ExpectationFailed(); } } } @@ -74,8 +74,8 @@ getJasmineRequireObj().Spec = function(j$) { // Key and value will eventually be cloned during reporting. The error // thrown at that point if they aren't cloneable isn't very helpful. // Throw a better one now. - j$.util.assertStructuredCloneable(key, 'Key'); - j$.util.assertStructuredCloneable(value, 'Value'); + j$.private.util.assertStructuredCloneable(key, 'Key'); + j$.private.util.assertStructuredCloneable(value, 'Value'); this.result.properties = this.result.properties || {}; this.result.properties[key] = value; } @@ -194,7 +194,7 @@ getJasmineRequireObj().Spec = function(j$) { return; } - if (e instanceof j$.errors.ExpectationFailed) { + if (e instanceof j$.private.errors.ExpectationFailed) { return; } @@ -264,7 +264,7 @@ getJasmineRequireObj().Spec = function(j$) { deprecation = { message: deprecation }; } this.result.deprecationWarnings.push( - j$.buildExpectationResult(deprecation) + j$.private.buildExpectationResult(deprecation) ); } diff --git a/src/core/Spy.js b/src/core/Spy.js index 41180f42..73d7c248 100644 --- a/src/core/Spy.js +++ b/src/core/Spy.js @@ -53,7 +53,7 @@ getJasmineRequireObj().Spy = function(j$) { }, matchersUtil ), - callTracker = new j$.CallTracker(); + callTracker = new j$.private.CallTracker(); function makeFunc(length, fn) { switch (length) { @@ -145,9 +145,9 @@ getJasmineRequireObj().Spy = function(j$) { } function SpyStrategyDispatcher(strategyArgs, matchersUtil) { - const baseStrategy = new j$.SpyStrategy(strategyArgs); + const baseStrategy = new j$.private.SpyStrategy(strategyArgs); const argsStrategies = new StrategyDict(function() { - return new j$.SpyStrategy(strategyArgs); + return new j$.private.SpyStrategy(strategyArgs); }, matchersUtil); this.and = baseStrategy; diff --git a/src/core/SpyFactory.js b/src/core/SpyFactory.js index 512a8912..51f89400 100644 --- a/src/core/SpyFactory.js +++ b/src/core/SpyFactory.js @@ -5,12 +5,12 @@ getJasmineRequireObj().SpyFactory = function(j$) { getMatchersUtil ) { this.createSpy = function(name, originalFn) { - if (j$.isFunction_(name) && originalFn === undefined) { + if (j$.private.isFunction(name) && originalFn === undefined) { originalFn = name; name = originalFn.name; } - return j$.Spy(name, getMatchersUtil(), { + return j$.private.Spy(name, getMatchersUtil(), { originalFn, customStrategies: getCustomStrategies(), defaultStrategyFn: getDefaultStrategyFn() @@ -19,7 +19,7 @@ getJasmineRequireObj().SpyFactory = function(j$) { this.createSpyObj = function(baseName, methodNames, propertyNames) { const baseNameIsCollection = - j$.isObject_(baseName) || j$.isArray_(baseName); + j$.private.isObject(baseName) || j$.private.isArray(baseName); if (baseNameIsCollection) { propertyNames = methodNames; @@ -65,11 +65,11 @@ getJasmineRequireObj().SpyFactory = function(j$) { function normalizeKeyValues(object) { const result = []; - if (j$.isArray_(object)) { + if (j$.private.isArray(object)) { for (let i = 0; i < object.length; i++) { result.push([object[i]]); } - } else if (j$.isObject_(object)) { + } else if (j$.private.isObject(object)) { for (const key in object) { if (object.hasOwnProperty(key)) { result.push([key, object[key]]); diff --git a/src/core/SpyRegistry.js b/src/core/SpyRegistry.js index b4a246da..b4d06b69 100644 --- a/src/core/SpyRegistry.js +++ b/src/core/SpyRegistry.js @@ -1,9 +1,9 @@ getJasmineRequireObj().SpyRegistry = function(j$) { - const spyOnMsg = j$.formatErrorMsg( + const spyOnMsg = j$.private.formatErrorMsg( '', 'spyOn(, )' ); - const spyOnPropertyMsg = j$.formatErrorMsg( + const spyOnPropertyMsg = j$.private.formatErrorMsg( '', 'spyOnProperty(, , [accessType])' ); @@ -43,7 +43,10 @@ getJasmineRequireObj().SpyRegistry = function(j$) { // Spying on mock clock timing fns would prevent the real ones from being // restored. - if (obj[methodName] && obj[methodName][j$.Clock.IsMockClockTimingFn]) { + if ( + obj[methodName] && + obj[methodName][j$.private.Clock.IsMockClockTimingFn] + ) { throw new Error("Mock clock timing functions can't be spied on"); } @@ -94,7 +97,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) { // localStorage in Firefox and later Safari versions, have no-op setters. if (obj[methodName] !== spiedMethod) { throw new Error( - j$.formatErrorMsg('')( + j$.private.formatErrorMsg('')( `Can't spy on ${methodName} because assigning to it had no effect` ) ); @@ -122,7 +125,10 @@ getJasmineRequireObj().SpyRegistry = function(j$) { throw new Error(getErrorMsg('No property name supplied')); } - const descriptor = j$.util.getPropertyDescriptor(obj, propertyName); + const descriptor = j$.private.util.getPropertyDescriptor( + obj, + propertyName + ); if (!descriptor) { throw new Error(getErrorMsg(propertyName + ' property does not exist')); @@ -157,7 +163,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) { } } - const originalDescriptor = j$.util.clone(descriptor); + const originalDescriptor = j$.private.util.clone(descriptor); const spy = createSpy(propertyName, descriptor[accessType]); let restoreStrategy; diff --git a/src/core/SpyStrategy.js b/src/core/SpyStrategy.js index d2e50388..b3f79bb5 100644 --- a/src/core/SpyStrategy.js +++ b/src/core/SpyStrategy.js @@ -19,7 +19,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) { const cs = options.customStrategies || {}; for (const k in cs) { - if (j$.util.has(cs, k) && !this[k]) { + if (j$.private.util.has(cs, k) && !this[k]) { this[k] = createCustomPlan(cs[k]); } } @@ -57,7 +57,7 @@ getJasmineRequireObj().SpyStrategy = function(j$) { return function() { const plan = factory.apply(null, arguments); - if (!j$.isFunction_(plan)) { + if (!j$.private.isFunction(plan)) { throw new Error('Spy strategy must return a function'); } @@ -129,7 +129,9 @@ getJasmineRequireObj().SpyStrategy = function(j$) { * @param {Error|Object|String} something Thing to throw */ SpyStrategy.prototype.throwError = function(something) { - const error = j$.isString_(something) ? new Error(something) : something; + const error = j$.private.isString(something) + ? new Error(something) + : something; this.plan = function() { throw error; }; @@ -146,9 +148,9 @@ getJasmineRequireObj().SpyStrategy = function(j$) { SpyStrategy.prototype.callFake = function(fn) { if ( !( - j$.isFunction_(fn) || - j$.isAsyncFunction_(fn) || - j$.isGeneratorFunction_(fn) + j$.private.isFunction(fn) || + j$.private.isAsyncFunction(fn) || + j$.private.isGeneratorFunction(fn) ) ) { throw new Error( diff --git a/src/core/Suite.js b/src/core/Suite.js index 4a75565f..62a91216 100644 --- a/src/core/Suite.js +++ b/src/core/Suite.js @@ -34,8 +34,8 @@ getJasmineRequireObj().Suite = function(j$) { // Key and value will eventually be cloned during reporting. The error // thrown at that point if they aren't cloneable isn't very helpful. // Throw a better one now. - j$.util.assertStructuredCloneable(key, 'Key'); - j$.util.assertStructuredCloneable(value, 'Value'); + j$.private.util.assertStructuredCloneable(key, 'Key'); + j$.private.util.assertStructuredCloneable(value, 'Value'); this.result.properties = this.result.properties || {}; this.result.properties[key] = value; } @@ -170,18 +170,18 @@ getJasmineRequireObj().Suite = function(j$) { if (!this.sharedContext) { this.sharedContext = this.parentSuite ? this.parentSuite.clonedSharedUserContext() - : new j$.UserContext(); + : new j$.private.UserContext(); } return this.sharedContext; } clonedSharedUserContext() { - return j$.UserContext.fromExisting(this.sharedUserContext()); + return j$.private.UserContext.fromExisting(this.sharedUserContext()); } handleException() { - if (arguments[0] instanceof j$.errors.ExpectationFailed) { + if (arguments[0] instanceof j$.private.errors.ExpectationFailed) { return; } @@ -190,7 +190,7 @@ getJasmineRequireObj().Suite = function(j$) { passed: false, error: arguments[0] }; - const failedExpectation = j$.buildExpectationResult(data); + const failedExpectation = j$.private.buildExpectationResult(data); if (!this.parentSuite) { failedExpectation.globalErrorType = 'afterAll'; @@ -232,7 +232,7 @@ getJasmineRequireObj().Suite = function(j$) { return; } - const expectationResult = j$.buildExpectationResult(data); + const expectationResult = j$.private.buildExpectationResult(data); if (this.reportedDone) { this.onLateError(expectationResult); @@ -246,7 +246,7 @@ getJasmineRequireObj().Suite = function(j$) { } if (this.#throwOnExpectationFailure) { - throw new j$.errors.ExpectationFailed(); + throw new j$.private.errors.ExpectationFailed(); } } @@ -255,7 +255,7 @@ getJasmineRequireObj().Suite = function(j$) { deprecation = { message: deprecation }; } this.result.deprecationWarnings.push( - j$.buildExpectationResult(deprecation) + j$.private.buildExpectationResult(deprecation) ); } diff --git a/src/core/SuiteBuilder.js b/src/core/SuiteBuilder.js index 76b45b3d..d3738969 100644 --- a/src/core/SuiteBuilder.js +++ b/src/core/SuiteBuilder.js @@ -92,7 +92,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(fn, 'fit'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } const spec = this.specFactory_(description, fn, timeout, filename); this.currentDeclarationSuite_.addChild(spec); @@ -105,7 +105,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(beforeEachFunction, 'beforeEach'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } this.currentDeclarationSuite_.beforeEach({ @@ -118,7 +118,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(beforeAllFunction, 'beforeAll'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } this.currentDeclarationSuite_.beforeAll({ @@ -131,7 +131,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(afterEachFunction, 'afterEach'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } afterEachFunction.isCleanup = true; @@ -145,7 +145,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { ensureIsFunctionOrAsync(afterAllFunction, 'afterAll'); if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } this.currentDeclarationSuite_.afterAll({ @@ -156,7 +156,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { it_(description, fn, timeout, filename) { if (timeout) { - j$.util.validateTimeout(timeout); + j$.private.util.validateTimeout(timeout); } this.checkDuplicate_(description, 'spec'); @@ -195,7 +195,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { const parentSuite = this.currentDeclarationSuite_; const reportedParentSuiteId = parentSuite === this.topSuite ? null : parentSuite.id; - return new j$.Suite({ + return new j$.private.Suite({ id: 'suite' + this.nextSuiteId_++, description, filename, @@ -237,7 +237,7 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { const config = this.env_.configuration(); const suite = this.currentDeclarationSuite_; const parentSuiteId = suite === this.topSuite ? null : suite.id; - const spec = new j$.Spec({ + const spec = new j$.private.Spec({ id: 'spec' + this.nextSpecId_++, filename, parentSuiteId, @@ -300,17 +300,21 @@ getJasmineRequireObj().SuiteBuilder = function(j$) { } function ensureIsFunction(fn, caller) { - if (!j$.isFunction_(fn)) { + if (!j$.private.isFunction(fn)) { throw new Error( - caller + ' expects a function argument; received ' + j$.getType_(fn) + caller + + ' expects a function argument; received ' + + j$.private.getType(fn) ); } } function ensureIsFunctionOrAsync(fn, caller) { - if (!j$.isFunction_(fn) && !j$.isAsyncFunction_(fn)) { + if (!j$.private.isFunction(fn) && !j$.private.isAsyncFunction(fn)) { throw new Error( - caller + ' expects a function argument; received ' + j$.getType_(fn) + caller + + ' expects a function argument; received ' + + j$.private.getType(fn) ); } } diff --git a/src/core/TreeRunner.js b/src/core/TreeRunner.js index 1412a1c6..5d96d4da 100644 --- a/src/core/TreeRunner.js +++ b/src/core/TreeRunner.js @@ -78,14 +78,14 @@ getJasmineRequireObj().TreeRunner = function(j$) { }, onComplete: () => { if (spec.result.status === 'failed') { - specOverallDone(new j$.StopExecutionError('spec failed')); + specOverallDone(new j$.private.StopExecutionError('spec failed')); } else { specOverallDone(); } }, userContext: spec.userContext(), runnableName: spec.getFullName.bind(spec), - SkipPolicy: j$.CompleteOnFirstErrorSkipPolicy + SkipPolicy: j$.private.CompleteOnFirstErrorSkipPolicy }); } @@ -260,7 +260,7 @@ getJasmineRequireObj().TreeRunner = function(j$) { async #reportChildrenOfBeforeAllFailure(suite) { for (const child of suite.children) { - if (child instanceof j$.Suite) { + if (child instanceof j$.private.Suite) { await this.#reportDispatcher.suiteStarted(child.result); await this.#reportChildrenOfBeforeAllFailure(child); @@ -292,9 +292,9 @@ getJasmineRequireObj().TreeRunner = function(j$) { #suiteSkipPolicy() { if (this.#getConfig().stopOnSpecFailure) { - return j$.CompleteOnFirstErrorSkipPolicy; + return j$.private.CompleteOnFirstErrorSkipPolicy; } else { - return j$.SkipAfterBeforeAllErrorPolicy; + return j$.private.SkipAfterBeforeAllErrorPolicy; } } } diff --git a/src/core/asymmetric_equality/Any.js b/src/core/asymmetric_equality/Any.js index abc3207c..ee634e9e 100644 --- a/src/core/asymmetric_equality/Any.js +++ b/src/core/asymmetric_equality/Any.js @@ -38,7 +38,7 @@ getJasmineRequireObj().Any = function(j$) { }; Any.prototype.jasmineToString = function() { - return ''; + return ''; }; return Any; diff --git a/src/core/asymmetric_equality/ArrayContaining.js b/src/core/asymmetric_equality/ArrayContaining.js index 3eddacde..c22046ef 100644 --- a/src/core/asymmetric_equality/ArrayContaining.js +++ b/src/core/asymmetric_equality/ArrayContaining.js @@ -4,10 +4,10 @@ getJasmineRequireObj().ArrayContaining = function(j$) { } ArrayContaining.prototype.asymmetricMatch = function(other, matchersUtil) { - if (!j$.isArray_(this.sample)) { + if (!j$.private.isArray(this.sample)) { throw new Error( 'You must provide an array to arrayContaining, not ' + - j$.basicPrettyPrinter_(this.sample) + + j$.private.basicPrettyPrinter(this.sample) + '.' ); } @@ -15,7 +15,7 @@ getJasmineRequireObj().ArrayContaining = function(j$) { // If the actual parameter is not an array, we can fail immediately, since it couldn't // possibly be an "array containing" anything. However, we also want an empty sample // array to match anything, so we need to double-check we aren't in that case - if (!j$.isArray_(other) && this.sample.length > 0) { + if (!j$.private.isArray(other) && this.sample.length > 0) { return false; } diff --git a/src/core/asymmetric_equality/ArrayWithExactContents.js b/src/core/asymmetric_equality/ArrayWithExactContents.js index ad241c1d..c49f92d3 100644 --- a/src/core/asymmetric_equality/ArrayWithExactContents.js +++ b/src/core/asymmetric_equality/ArrayWithExactContents.js @@ -7,10 +7,10 @@ getJasmineRequireObj().ArrayWithExactContents = function(j$) { other, matchersUtil ) { - if (!j$.isArray_(this.sample)) { + if (!j$.private.isArray(this.sample)) { throw new Error( 'You must provide an array to arrayWithExactContents, not ' + - j$.basicPrettyPrinter_(this.sample) + + j$.private.basicPrettyPrinter(this.sample) + '.' ); } diff --git a/src/core/asymmetric_equality/Empty.js b/src/core/asymmetric_equality/Empty.js index 1dd28948..7bc3d52e 100644 --- a/src/core/asymmetric_equality/Empty.js +++ b/src/core/asymmetric_equality/Empty.js @@ -2,15 +2,19 @@ getJasmineRequireObj().Empty = function(j$) { function Empty() {} Empty.prototype.asymmetricMatch = function(other) { - if (j$.isString_(other) || j$.isArray_(other) || j$.isTypedArray_(other)) { + if ( + j$.private.isString(other) || + j$.private.isArray(other) || + j$.private.isTypedArray(other) + ) { return other.length === 0; } - if (j$.isMap(other) || j$.isSet(other)) { + if (j$.private.isMap(other) || j$.private.isSet(other)) { return other.size === 0; } - if (j$.isObject_(other)) { + if (j$.private.isObject(other)) { return Object.keys(other).length === 0; } return false; diff --git a/src/core/asymmetric_equality/MapContaining.js b/src/core/asymmetric_equality/MapContaining.js index 6e7bf8d2..4afe50d6 100644 --- a/src/core/asymmetric_equality/MapContaining.js +++ b/src/core/asymmetric_equality/MapContaining.js @@ -1,9 +1,9 @@ getJasmineRequireObj().MapContaining = function(j$) { function MapContaining(sample) { - if (!j$.isMap(sample)) { + if (!j$.private.isMap(sample)) { throw new Error( 'You must provide a map to `mapContaining`, not ' + - j$.basicPrettyPrinter_(sample) + j$.private.basicPrettyPrinter(sample) ); } @@ -11,7 +11,7 @@ getJasmineRequireObj().MapContaining = function(j$) { } MapContaining.prototype.asymmetricMatch = function(other, matchersUtil) { - if (!j$.isMap(other)) { + if (!j$.private.isMap(other)) { return false; } diff --git a/src/core/asymmetric_equality/NotEmpty.js b/src/core/asymmetric_equality/NotEmpty.js index 361b6978..4a13fe81 100644 --- a/src/core/asymmetric_equality/NotEmpty.js +++ b/src/core/asymmetric_equality/NotEmpty.js @@ -2,15 +2,19 @@ getJasmineRequireObj().NotEmpty = function(j$) { function NotEmpty() {} NotEmpty.prototype.asymmetricMatch = function(other) { - if (j$.isString_(other) || j$.isArray_(other) || j$.isTypedArray_(other)) { + if ( + j$.private.isString(other) || + j$.private.isArray(other) || + j$.private.isTypedArray(other) + ) { return other.length !== 0; } - if (j$.isMap(other) || j$.isSet(other)) { + if (j$.private.isMap(other) || j$.private.isSet(other)) { return other.size !== 0; } - if (j$.isObject_(other)) { + if (j$.private.isObject(other)) { return Object.keys(other).length !== 0; } diff --git a/src/core/asymmetric_equality/ObjectContaining.js b/src/core/asymmetric_equality/ObjectContaining.js index 04a86694..77b48428 100644 --- a/src/core/asymmetric_equality/ObjectContaining.js +++ b/src/core/asymmetric_equality/ObjectContaining.js @@ -40,7 +40,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) { }; ObjectContaining.prototype.valuesForDiff_ = function(other, pp) { - if (!j$.isObject_(other)) { + if (!j$.private.isObject(other)) { return { self: this.jasmineToString(pp), other: other diff --git a/src/core/asymmetric_equality/SetContaining.js b/src/core/asymmetric_equality/SetContaining.js index 490af878..cf373fd9 100644 --- a/src/core/asymmetric_equality/SetContaining.js +++ b/src/core/asymmetric_equality/SetContaining.js @@ -1,9 +1,9 @@ getJasmineRequireObj().SetContaining = function(j$) { function SetContaining(sample) { - if (!j$.isSet(sample)) { + if (!j$.private.isSet(sample)) { throw new Error( 'You must provide a set to `setContaining`, not ' + - j$.basicPrettyPrinter_(sample) + j$.private.basicPrettyPrinter(sample) ); } @@ -11,7 +11,7 @@ getJasmineRequireObj().SetContaining = function(j$) { } SetContaining.prototype.asymmetricMatch = function(other, matchersUtil) { - if (!j$.isSet(other)) { + if (!j$.private.isSet(other)) { return false; } diff --git a/src/core/asymmetric_equality/StringContaining.js b/src/core/asymmetric_equality/StringContaining.js index 16f0c4e6..b0e899f2 100644 --- a/src/core/asymmetric_equality/StringContaining.js +++ b/src/core/asymmetric_equality/StringContaining.js @@ -1,6 +1,6 @@ getJasmineRequireObj().StringContaining = function(j$) { function StringContaining(expected) { - if (!j$.isString_(expected)) { + if (!j$.private.isString(expected)) { throw new Error('Expected is not a String'); } @@ -8,7 +8,7 @@ getJasmineRequireObj().StringContaining = function(j$) { } StringContaining.prototype.asymmetricMatch = function(other) { - if (!j$.isString_(other)) { + if (!j$.private.isString(other)) { // Arrays, etc. don't match no matter what their indexOf returns. return false; } diff --git a/src/core/asymmetric_equality/StringMatching.js b/src/core/asymmetric_equality/StringMatching.js index ebcc1738..89b627cd 100644 --- a/src/core/asymmetric_equality/StringMatching.js +++ b/src/core/asymmetric_equality/StringMatching.js @@ -1,6 +1,6 @@ getJasmineRequireObj().StringMatching = function(j$) { function StringMatching(expected) { - if (!j$.isString_(expected) && !j$.isA_('RegExp', expected)) { + if (!j$.private.isString(expected) && !j$.private.isA('RegExp', expected)) { throw new Error('Expected is not a String or a RegExp'); } diff --git a/src/core/base.js b/src/core/base.js index 2b32ffb2..c5ac348d 100644 --- a/src/core/base.js +++ b/src/core/base.js @@ -45,7 +45,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { return DEFAULT_TIMEOUT_INTERVAL; }, set: function(newValue) { - j$.util.validateTimeout(newValue, 'jasmine.DEFAULT_TIMEOUT_INTERVAL'); + j$.private.util.validateTimeout( + newValue, + 'jasmine.DEFAULT_TIMEOUT_INTERVAL' + ); DEFAULT_TIMEOUT_INTERVAL = newValue; } }); @@ -63,58 +66,61 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @return {Env} */ j$.getEnv = function(options) { - const env = (j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options)); + const env = (j$.private.currentEnv_ = + j$.private.currentEnv_ || new j$.private.Env(options)); //jasmine. singletons in here (setTimeout blah blah). return env; }; - j$.isArray_ = function(value) { - return j$.isA_('Array', value); + j$.private.isArray = function(value) { + return j$.private.isA('Array', value); }; - j$.isObject_ = function(value) { - return value !== undefined && value !== null && j$.isA_('Object', value); - }; - - j$.isString_ = function(value) { - return j$.isA_('String', value); - }; - - j$.isNumber_ = function(value) { - return j$.isA_('Number', value); - }; - - j$.isFunction_ = function(value) { - return j$.isA_('Function', value); - }; - - j$.isAsyncFunction_ = function(value) { - return j$.isA_('AsyncFunction', value); - }; - - j$.isGeneratorFunction_ = function(value) { - return j$.isA_('GeneratorFunction', value); - }; - - j$.isTypedArray_ = function(value) { + j$.private.isObject = function(value) { return ( - j$.isA_('Float32Array', value) || - j$.isA_('Float64Array', value) || - j$.isA_('Int16Array', value) || - j$.isA_('Int32Array', value) || - j$.isA_('Int8Array', value) || - j$.isA_('Uint16Array', value) || - j$.isA_('Uint32Array', value) || - j$.isA_('Uint8Array', value) || - j$.isA_('Uint8ClampedArray', value) + value !== undefined && value !== null && j$.private.isA('Object', value) ); }; - j$.isA_ = function(typeName, value) { - return j$.getType_(value) === '[object ' + typeName + ']'; + j$.private.isString = function(value) { + return j$.private.isA('String', value); }; - j$.isError_ = function(value) { + j$.private.isNumber = function(value) { + return j$.private.isA('Number', value); + }; + + j$.private.isFunction = function(value) { + return j$.private.isA('Function', value); + }; + + j$.private.isAsyncFunction = function(value) { + return j$.private.isA('AsyncFunction', value); + }; + + j$.private.isGeneratorFunction = function(value) { + return j$.private.isA('GeneratorFunction', value); + }; + + j$.private.isTypedArray = function(value) { + return ( + j$.private.isA('Float32Array', value) || + j$.private.isA('Float64Array', value) || + j$.private.isA('Int16Array', value) || + j$.private.isA('Int32Array', value) || + j$.private.isA('Int8Array', value) || + j$.private.isA('Uint16Array', value) || + j$.private.isA('Uint32Array', value) || + j$.private.isA('Uint8Array', value) || + j$.private.isA('Uint8ClampedArray', value) + ); + }; + + j$.private.isA = function(typeName, value) { + return j$.private.getType(value) === '[object ' + typeName + ']'; + }; + + j$.private.isError = function(value) { if (!value) { return false; } @@ -126,15 +132,15 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { return typeof value.stack === 'string' && typeof value.message === 'string'; }; - j$.isAsymmetricEqualityTester_ = function(obj) { - return obj ? j$.isA_('Function', obj.asymmetricMatch) : false; + j$.private.isAsymmetricEqualityTester = function(obj) { + return obj ? j$.private.isA('Function', obj.asymmetricMatch) : false; }; - j$.getType_ = function(value) { + j$.private.getType = function(value) { return Object.prototype.toString.apply(value); }; - j$.isDomNode = function(obj) { + j$.private.isDomNode = function(obj) { // Node is a function, because constructors return typeof jasmineGlobal.Node !== 'undefined' ? obj instanceof jasmineGlobal.Node @@ -145,7 +151,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { // return obj.nodeType > 0; }; - j$.isMap = function(obj) { + j$.private.isMap = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -153,7 +159,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isSet = function(obj) { + j$.private.isSet = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -161,7 +167,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isWeakMap = function(obj) { + j$.private.isWeakMap = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -169,7 +175,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isURL = function(obj) { + j$.private.isURL = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -177,11 +183,11 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isIterable_ = function(value) { + j$.private.isIterable = function(value) { return value && !!value[Symbol.iterator]; }; - j$.isDataView = function(obj) { + j$.private.isDataView = function(obj) { return ( obj !== null && typeof obj !== 'undefined' && @@ -189,15 +195,15 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { ); }; - j$.isPromise = function(obj) { + j$.private.isPromise = function(obj) { return !!obj && obj.constructor === jasmineGlobal.Promise; }; - j$.isPromiseLike = function(obj) { - return !!obj && j$.isFunction_(obj.then); + j$.private.isPromiseLike = function(obj) { + return !!obj && j$.private.isFunction(obj.then); }; - j$.fnNameFor = function(func) { + j$.private.fnNameFor = function(func) { if (func.name) { return func.name; } @@ -209,7 +215,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { return matches ? matches[1] : ''; }; - j$.isPending_ = function(promise) { + j$.private.isPending = function(promise) { const sentinel = {}; return Promise.race([promise, Promise.resolve(sentinel)]).then( function(result) { @@ -231,7 +237,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Constructor} clazz - The constructor to check against. */ j$.any = function(clazz) { - return new j$.Any(clazz); + return new j$.private.Any(clazz); }; /** @@ -243,7 +249,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.anything = function() { - return new j$.Anything(); + return new j$.private.Anything(); }; /** @@ -255,7 +261,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.truthy = function() { - return new j$.Truthy(); + return new j$.private.Truthy(); }; /** @@ -268,7 +274,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.falsy = function() { - return new j$.Falsy(); + return new j$.private.Falsy(); }; /** @@ -280,7 +286,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.empty = function() { - return new j$.Empty(); + return new j$.private.Empty(); }; /** @@ -292,7 +298,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Object} sample - The value to compare the actual to. */ j$.is = function(sample) { - return new j$.Is(sample); + return new j$.private.Is(sample); }; /** @@ -304,7 +310,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @function */ j$.notEmpty = function() { - return new j$.NotEmpty(); + return new j$.private.NotEmpty(); }; /** @@ -317,7 +323,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Object} sample - The subset of properties that _must_ be in the actual. */ j$.objectContaining = function(sample) { - return new j$.ObjectContaining(sample); + return new j$.private.ObjectContaining(sample); }; /** @@ -330,7 +336,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {RegExp|String} expected */ j$.stringMatching = function(expected) { - return new j$.StringMatching(expected); + return new j$.private.StringMatching(expected); }; /** @@ -343,7 +349,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {String} expected */ j$.stringContaining = function(expected) { - return new j$.StringContaining(expected); + return new j$.private.StringContaining(expected); }; /** @@ -356,7 +362,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Array} sample */ j$.arrayContaining = function(sample) { - return new j$.ArrayContaining(sample); + return new j$.private.ArrayContaining(sample); }; /** @@ -370,7 +376,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Array} sample */ j$.arrayWithExactContents = function(sample) { - return new j$.ArrayWithExactContents(sample); + return new j$.private.ArrayWithExactContents(sample); }; /** @@ -384,7 +390,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Map} sample - The subset of items that _must_ be in the actual. */ j$.mapContaining = function(sample) { - return new j$.MapContaining(sample); + return new j$.private.MapContaining(sample); }; /** @@ -398,7 +404,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @param {Set} sample - The subset of items that _must_ be in the actual. */ j$.setContaining = function(sample) { - return new j$.SetContaining(sample); + return new j$.private.SetContaining(sample); }; /** @@ -414,8 +420,8 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { return false; } return ( - putativeSpy.and instanceof j$.SpyStrategy && - putativeSpy.calls instanceof j$.CallTracker + putativeSpy.and instanceof j$.private.SpyStrategy && + putativeSpy.calls instanceof j$.private.CallTracker ); }; diff --git a/src/core/buildExpectationResult.js b/src/core/buildExpectationResult.js index 513741af..78a102da 100644 --- a/src/core/buildExpectationResult.js +++ b/src/core/buildExpectationResult.js @@ -1,7 +1,7 @@ //TODO: expectation result may make more sense as a presentation of an expectation. getJasmineRequireObj().buildExpectationResult = function(j$) { function buildExpectationResult(options) { - const exceptionFormatter = new j$.ExceptionFormatter(); + const exceptionFormatter = new j$.private.ExceptionFormatter(); /** * Describes the result of evaluating an expectation @@ -24,7 +24,7 @@ getJasmineRequireObj().buildExpectationResult = function(j$) { }; if (!result.passed) { - if (options.error && !j$.isString_(options.error)) { + if (options.error && !j$.private.isString(options.error)) { if ('code' in options.error) { result.code = options.error.code; } diff --git a/src/core/matchers/DiffBuilder.js b/src/core/matchers/DiffBuilder.js index 3aed1916..489f12c9 100644 --- a/src/core/matchers/DiffBuilder.js +++ b/src/core/matchers/DiffBuilder.js @@ -2,9 +2,9 @@ getJasmineRequireObj().DiffBuilder = function(j$) { class DiffBuilder { constructor(config) { this.prettyPrinter_ = - (config || {}).prettyPrinter || j$.makePrettyPrinter(); - this.mismatches_ = new j$.MismatchTree(); - this.path_ = new j$.ObjectPath(); + (config || {}).prettyPrinter || j$.private.makePrettyPrinter(); + this.mismatches_ = new j$.private.MismatchTree(); + this.path_ = new j$.private.ObjectPath(); this.actualRoot_ = undefined; this.expectedRoot_ = undefined; } @@ -65,8 +65,8 @@ getJasmineRequireObj().DiffBuilder = function(j$) { const handleAsymmetricExpected = () => { if ( - j$.isAsymmetricEqualityTester_(expected) && - j$.isFunction_(expected.valuesForDiff_) + j$.private.isAsymmetricEqualityTester(expected) && + j$.private.isFunction(expected.valuesForDiff_) ) { const asymmetricResult = expected.valuesForDiff_( actual, diff --git a/src/core/matchers/MismatchTree.js b/src/core/matchers/MismatchTree.js index 85176563..504fc600 100644 --- a/src/core/matchers/MismatchTree.js +++ b/src/core/matchers/MismatchTree.js @@ -8,7 +8,7 @@ getJasmineRequireObj().MismatchTree = function(j$) { */ class MismatchTree { constructor(path) { - this.path = path || new j$.ObjectPath([]); + this.path = path || new j$.private.ObjectPath([]); this.formatter = undefined; this.children = []; this.isMismatch = false; diff --git a/src/core/matchers/async/toBePending.js b/src/core/matchers/async/toBePending.js index 23ad8d47..bd5549f6 100644 --- a/src/core/matchers/async/toBePending.js +++ b/src/core/matchers/async/toBePending.js @@ -11,7 +11,7 @@ getJasmineRequireObj().toBePending = function(j$) { return function toBePending() { return { compare: function(actual) { - if (!j$.isPromiseLike(actual)) { + if (!j$.private.isPromiseLike(actual)) { throw new Error( `Expected toBePending to be called on a promise but was on a ${typeof actual}.` ); diff --git a/src/core/matchers/async/toBeRejected.js b/src/core/matchers/async/toBeRejected.js index 31d025c0..57e6d71b 100644 --- a/src/core/matchers/async/toBeRejected.js +++ b/src/core/matchers/async/toBeRejected.js @@ -13,7 +13,7 @@ getJasmineRequireObj().toBeRejected = function(j$) { return function toBeRejected() { return { compare: function(actual) { - if (!j$.isPromiseLike(actual)) { + if (!j$.private.isPromiseLike(actual)) { throw new Error( `Expected toBeRejected to be called on a promise but was on a ${typeof actual}.` ); diff --git a/src/core/matchers/async/toBeRejectedWith.js b/src/core/matchers/async/toBeRejectedWith.js index b114a13c..d640c901 100644 --- a/src/core/matchers/async/toBeRejectedWith.js +++ b/src/core/matchers/async/toBeRejectedWith.js @@ -14,7 +14,7 @@ getJasmineRequireObj().toBeRejectedWith = function(j$) { return function toBeRejectedWith(matchersUtil) { return { compare: function(actualPromise, expectedValue) { - if (!j$.isPromiseLike(actualPromise)) { + if (!j$.private.isPromiseLike(actualPromise)) { throw new Error( `Expected toBeRejectedWith to be called on a promise but was on a ${typeof actualPromise}.` ); diff --git a/src/core/matchers/async/toBeRejectedWithError.js b/src/core/matchers/async/toBeRejectedWithError.js index 0bb3b58a..1ef90713 100644 --- a/src/core/matchers/async/toBeRejectedWithError.js +++ b/src/core/matchers/async/toBeRejectedWithError.js @@ -17,7 +17,7 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) { return function toBeRejectedWithError(matchersUtil) { return { compare: function(actualPromise, arg1, arg2) { - if (!j$.isPromiseLike(actualPromise)) { + if (!j$.private.isPromiseLike(actualPromise)) { throw new Error( `Expected toBeRejectedWithError to be called on a promise but was on a ${typeof actualPromise}.` ); @@ -41,14 +41,14 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) { }; function matchError(actual, expected, matchersUtil) { - if (!j$.isError_(actual)) { + if (!j$.private.isError(actual)) { return fail(expected, 'rejected with ' + matchersUtil.pp(actual)); } if (!(actual instanceof expected.error)) { return fail( expected, - 'rejected with type ' + j$.fnNameFor(actual.constructor) + 'rejected with type ' + j$.private.fnNameFor(actual.constructor) ); } @@ -108,7 +108,7 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) { error: error, message: message, printValue: - j$.fnNameFor(error) + + j$.private.fnNameFor(error) + (typeof message === 'undefined' ? '' : ': ' + matchersUtil.pp(message)) }; } @@ -116,7 +116,7 @@ getJasmineRequireObj().toBeRejectedWithError = function(j$) { function isErrorConstructor(value) { return ( typeof value === 'function' && - (value === Error || j$.isError_(value.prototype)) + (value === Error || j$.private.isError(value.prototype)) ); } }; diff --git a/src/core/matchers/async/toBeResolved.js b/src/core/matchers/async/toBeResolved.js index 4badc198..1bfb7476 100644 --- a/src/core/matchers/async/toBeResolved.js +++ b/src/core/matchers/async/toBeResolved.js @@ -13,7 +13,7 @@ getJasmineRequireObj().toBeResolved = function(j$) { return function toBeResolved(matchersUtil) { return { compare: function(actual) { - if (!j$.isPromiseLike(actual)) { + if (!j$.private.isPromiseLike(actual)) { throw new Error( `Expected toBeResolved to be called on a promise but was on a ${typeof actual}.` ); diff --git a/src/core/matchers/async/toBeResolvedTo.js b/src/core/matchers/async/toBeResolvedTo.js index acb12551..21426b82 100644 --- a/src/core/matchers/async/toBeResolvedTo.js +++ b/src/core/matchers/async/toBeResolvedTo.js @@ -14,7 +14,7 @@ getJasmineRequireObj().toBeResolvedTo = function(j$) { return function toBeResolvedTo(matchersUtil) { return { compare: function(actualPromise, expectedValue) { - if (!j$.isPromiseLike(actualPromise)) { + if (!j$.private.isPromiseLike(actualPromise)) { throw new Error( `Expected toBeResolvedTo to be called on a promise but was on a ${typeof actualPromise}.` ); diff --git a/src/core/matchers/matchersUtil.js b/src/core/matchers/matchersUtil.js index 58f035c2..d6054aa9 100644 --- a/src/core/matchers/matchersUtil.js +++ b/src/core/matchers/matchersUtil.js @@ -36,7 +36,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { return false; } - if (j$.isSet(haystack)) { + if (j$.private.isSet(haystack)) { // Try .has() first. It should be faster in cases where // needle === something in haystack. Fall back to .equals() comparison // if that fails. @@ -45,7 +45,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { } } - if (j$.isIterable_(haystack) && !j$.isString_(haystack)) { + if (j$.private.isIterable(haystack) && !j$.private.isString(haystack)) { // Arrays, Sets, etc. for (const candidate of haystack) { if (this.equals(candidate, needle)) { @@ -61,7 +61,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { return haystack.indexOf(needle) >= 0; } - if (j$.isNumber_(haystack.length)) { + if (j$.private.isNumber(haystack.length)) { // Objects that are shaped like arrays but aren't iterable for (let i = 0; i < haystack.length; i++) { if (this.equals(haystack[i], needle)) { @@ -108,7 +108,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { bStack, diffBuilder ) { - if (j$.isFunction_(b.valuesForDiff_)) { + if (j$.private.isFunction(b.valuesForDiff_)) { const values = b.valuesForDiff_(a, this.pp); this.eq_(values.other, values.self, aStack, bStack, diffBuilder); } else { @@ -123,8 +123,8 @@ getJasmineRequireObj().MatchersUtil = function(j$) { bStack, diffBuilder ) { - const asymmetricA = j$.isAsymmetricEqualityTester_(a); - const asymmetricB = j$.isAsymmetricEqualityTester_(b); + const asymmetricA = j$.private.isAsymmetricEqualityTester(a); + const asymmetricB = j$.private.isAsymmetricEqualityTester(b); if (asymmetricA === asymmetricB) { return undefined; @@ -159,7 +159,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { * @returns {boolean} True if the values are equal */ MatchersUtil.prototype.equals = function(a, b, diffBuilder) { - diffBuilder = diffBuilder || j$.NullDiffBuilder(); + diffBuilder = diffBuilder || j$.private.NullDiffBuilder(); diffBuilder.setRoots(a, b); return this.eq_(a, b, [], [], diffBuilder); @@ -274,8 +274,8 @@ getJasmineRequireObj().MatchersUtil = function(j$) { return false; } - const aIsDomNode = j$.isDomNode(a); - const bIsDomNode = j$.isDomNode(b); + const aIsDomNode = j$.private.isDomNode(a); + const bIsDomNode = j$.private.isDomNode(b); if (aIsDomNode && bIsDomNode) { // At first try to use DOM3 method isEqualNode result = a.isEqualNode(b); @@ -289,8 +289,8 @@ getJasmineRequireObj().MatchersUtil = function(j$) { return false; } - const aIsPromise = j$.isPromise(a); - const bIsPromise = j$.isPromise(b); + const aIsPromise = j$.private.isPromise(a); + const bIsPromise = j$.private.isPromise(b); if (aIsPromise && bIsPromise) { return a === b; } @@ -344,7 +344,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { if (!result) { return false; } - } else if (j$.isMap(a) && j$.isMap(b)) { + } else if (j$.private.isMap(a) && j$.private.isMap(b)) { if (a.size != b.size) { diffBuilder.recordMismatch(); return false; @@ -377,9 +377,15 @@ getJasmineRequireObj().MatchersUtil = function(j$) { // otherwise explicitly look up the mapKey in the other Map since we want keys with unique // obj identity (that are otherwise equal) to not match. if ( - j$.isAsymmetricEqualityTester_(mapKey) || - (j$.isAsymmetricEqualityTester_(cmpKey) && - this.eq_(mapKey, cmpKey, aStack, bStack, j$.NullDiffBuilder())) + j$.private.isAsymmetricEqualityTester(mapKey) || + (j$.private.isAsymmetricEqualityTester(cmpKey) && + this.eq_( + mapKey, + cmpKey, + aStack, + bStack, + j$.private.NullDiffBuilder() + )) ) { mapValueB = b.get(cmpKey); } else { @@ -390,7 +396,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { mapValueB, aStack, bStack, - j$.NullDiffBuilder() + j$.private.NullDiffBuilder() ); } } @@ -399,7 +405,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { diffBuilder.recordMismatch(); return false; } - } else if (j$.isSet(a) && j$.isSet(b)) { + } else if (j$.private.isSet(a) && j$.private.isSet(b)) { if (a.size != b.size) { diffBuilder.recordMismatch(); return false; @@ -435,7 +441,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { otherValue, baseStack, otherStack, - j$.NullDiffBuilder() + j$.private.NullDiffBuilder() ); if (!found && prevStackSize !== baseStack.length) { baseStack.splice(prevStackSize); @@ -450,7 +456,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { diffBuilder.recordMismatch(); return false; } - } else if (j$.isURL(a) && j$.isURL(b)) { + } else if (j$.private.isURL(a) && j$.private.isURL(b)) { // URLs have no enumrable properties, so the default object comparison // would consider any two URLs to be equal. return a.toString() === b.toString(); @@ -488,7 +494,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { for (const key of aKeys) { // Deep compare each member - if (!j$.util.has(b, key)) { + if (!j$.private.util.has(b, key)) { diffBuilder.recordMismatch( objectKeysAreDifferentFormatter.bind(null, this.pp) ); @@ -518,7 +524,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { const allKeys = (function(o) { const keys = []; for (const key in o) { - if (j$.util.has(o, key)) { + if (j$.private.util.has(o, key)) { keys.push(key); } } @@ -559,7 +565,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { // and not in objB. function extraKeysAndValues(objA, objB) { return MatchersUtil.keys(objA) - .filter(key => !j$.util.has(objB, key)) + .filter(key => !j$.private.util.has(objB, key)) .map(key => [key, objA[key]]); } @@ -598,7 +604,7 @@ getJasmineRequireObj().MatchersUtil = function(j$) { 'Expected ' + path + ' to be a kind of ' + - j$.fnNameFor(expected.constructor) + + j$.private.fnNameFor(expected.constructor) + ', but was ' + pp(actual) + '.' diff --git a/src/core/matchers/toBeInstanceOf.js b/src/core/matchers/toBeInstanceOf.js index fba86e9c..a58cb32c 100644 --- a/src/core/matchers/toBeInstanceOf.js +++ b/src/core/matchers/toBeInstanceOf.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toBeInstanceOf = function(j$) { - const usageError = j$.formatErrorMsg( + const usageError = j$.private.formatErrorMsg( '', 'expect(value).toBeInstanceOf()' ); @@ -20,16 +20,16 @@ getJasmineRequireObj().toBeInstanceOf = function(j$) { compare: function(actual, expected) { const actualType = actual && actual.constructor - ? j$.fnNameFor(actual.constructor) + ? j$.private.fnNameFor(actual.constructor) : matchersUtil.pp(actual); const expectedType = expected - ? j$.fnNameFor(expected) + ? j$.private.fnNameFor(expected) : matchersUtil.pp(expected); let expectedMatcher; let pass; try { - expectedMatcher = new j$.Any(expected); + expectedMatcher = new j$.private.Any(expected); pass = expectedMatcher.asymmetricMatch(actual); // eslint-disable-next-line no-unused-vars } catch (error) { diff --git a/src/core/matchers/toEqual.js b/src/core/matchers/toEqual.js index 04a67bda..688c1dd1 100644 --- a/src/core/matchers/toEqual.js +++ b/src/core/matchers/toEqual.js @@ -14,7 +14,9 @@ getJasmineRequireObj().toEqual = function(j$) { const result = { pass: false }, - diffBuilder = new j$.DiffBuilder({ prettyPrinter: matchersUtil.pp }); + diffBuilder = new j$.private.DiffBuilder({ + prettyPrinter: matchersUtil.pp + }); result.pass = matchersUtil.equals(actual, expected, diffBuilder); diff --git a/src/core/matchers/toHaveBeenCalled.js b/src/core/matchers/toHaveBeenCalled.js index bb544410..4e836d4a 100644 --- a/src/core/matchers/toHaveBeenCalled.js +++ b/src/core/matchers/toHaveBeenCalled.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toHaveBeenCalled = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalled()' ); diff --git a/src/core/matchers/toHaveBeenCalledBefore.js b/src/core/matchers/toHaveBeenCalledBefore.js index 85a0af99..fb0b1496 100644 --- a/src/core/matchers/toHaveBeenCalledBefore.js +++ b/src/core/matchers/toHaveBeenCalledBefore.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toHaveBeenCalledBefore = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalledBefore()' ); diff --git a/src/core/matchers/toHaveBeenCalledOnceWith.js b/src/core/matchers/toHaveBeenCalledOnceWith.js index d8d4373f..91d8924c 100644 --- a/src/core/matchers/toHaveBeenCalledOnceWith.js +++ b/src/core/matchers/toHaveBeenCalledOnceWith.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toHaveBeenCalledOnceWith = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalledOnceWith(...arguments)' ); @@ -62,7 +62,7 @@ getJasmineRequireObj().toHaveBeenCalledOnceWith = function(j$) { function getDiffs() { return actual.calls.allArgs().map(function(argsForCall, callIx) { - const diffBuilder = new j$.DiffBuilder(); + const diffBuilder = new j$.private.DiffBuilder(); matchersUtil.equals(argsForCall, expectedArgs, diffBuilder); return diffBuilder.getMessage(); }); diff --git a/src/core/matchers/toHaveBeenCalledTimes.js b/src/core/matchers/toHaveBeenCalledTimes.js index 4a16995c..2bb8b02f 100644 --- a/src/core/matchers/toHaveBeenCalledTimes.js +++ b/src/core/matchers/toHaveBeenCalledTimes.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalledTimes()' ); @@ -27,7 +27,7 @@ getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) { const args = Array.prototype.slice.call(arguments, 0), result = { pass: false }; - if (!j$.isNumber_(expected)) { + if (!j$.private.isNumber(expected)) { throw new Error( getErrorMsg( 'The expected times failed is a required argument and must be a number.' diff --git a/src/core/matchers/toHaveBeenCalledWith.js b/src/core/matchers/toHaveBeenCalledWith.js index da2d1074..666b504a 100644 --- a/src/core/matchers/toHaveBeenCalledWith.js +++ b/src/core/matchers/toHaveBeenCalledWith.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toHaveBeenCalledWith = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveBeenCalledWith(...arguments)' ); @@ -71,7 +71,7 @@ getJasmineRequireObj().toHaveBeenCalledWith = function(j$) { const diffs = actual.calls .allArgs() .map(function(argsForCall, callIx) { - const diffBuilder = new j$.DiffBuilder(); + const diffBuilder = new j$.private.DiffBuilder(); matchersUtil.equals(argsForCall, expectedArgs, diffBuilder); return ( 'Call ' + diff --git a/src/core/matchers/toHaveClass.js b/src/core/matchers/toHaveClass.js index 034b6f29..7d497868 100644 --- a/src/core/matchers/toHaveClass.js +++ b/src/core/matchers/toHaveClass.js @@ -26,7 +26,9 @@ getJasmineRequireObj().toHaveClass = function(j$) { function isElement(maybeEl) { return ( - maybeEl && maybeEl.classList && j$.isFunction_(maybeEl.classList.contains) + maybeEl && + maybeEl.classList && + j$.private.isFunction(maybeEl.classList.contains) ); } diff --git a/src/core/matchers/toHaveClasses.js b/src/core/matchers/toHaveClasses.js index e8275b35..39a840d0 100644 --- a/src/core/matchers/toHaveClasses.js +++ b/src/core/matchers/toHaveClasses.js @@ -26,7 +26,9 @@ getJasmineRequireObj().toHaveClasses = function(j$) { function isElement(maybeEl) { return ( - maybeEl && maybeEl.classList && j$.isFunction_(maybeEl.classList.contains) + maybeEl && + maybeEl.classList && + j$.private.isFunction(maybeEl.classList.contains) ); } diff --git a/src/core/matchers/toHaveNoOtherSpyInteractions.js b/src/core/matchers/toHaveNoOtherSpyInteractions.js index a1bc3c29..1457476c 100644 --- a/src/core/matchers/toHaveNoOtherSpyInteractions.js +++ b/src/core/matchers/toHaveNoOtherSpyInteractions.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toHaveNoOtherSpyInteractions = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveNoOtherSpyInteractions()' ); @@ -17,7 +17,7 @@ getJasmineRequireObj().toHaveNoOtherSpyInteractions = function(j$) { compare: function(actual) { const result = {}; - if (!j$.isObject_(actual)) { + if (!j$.private.isObject(actual)) { throw new Error( getErrorMsg('Expected an object, but got ' + typeof actual + '.') ); diff --git a/src/core/matchers/toHaveSize.js b/src/core/matchers/toHaveSize.js index 8a653448..d215d703 100644 --- a/src/core/matchers/toHaveSize.js +++ b/src/core/matchers/toHaveSize.js @@ -17,15 +17,15 @@ getJasmineRequireObj().toHaveSize = function(j$) { }; if ( - j$.isA_('WeakSet', actual) || - j$.isWeakMap(actual) || - j$.isDataView(actual) + j$.private.isA('WeakSet', actual) || + j$.private.isWeakMap(actual) || + j$.private.isDataView(actual) ) { throw new Error('Cannot get size of ' + actual + '.'); } let actualSize; - if (j$.isSet(actual) || j$.isMap(actual)) { + if (j$.private.isSet(actual) || j$.private.isMap(actual)) { actualSize = actual.size; } else if (isLength(actual.length)) { actualSize = actual.length; diff --git a/src/core/matchers/toHaveSpyInteractions.js b/src/core/matchers/toHaveSpyInteractions.js index 139d24e1..b71baff5 100755 --- a/src/core/matchers/toHaveSpyInteractions.js +++ b/src/core/matchers/toHaveSpyInteractions.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toHaveSpyInteractions = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toHaveSpyInteractions()' ); @@ -18,7 +18,7 @@ getJasmineRequireObj().toHaveSpyInteractions = function(j$) { compare: function(actual) { const result = {}; - if (!j$.isObject_(actual)) { + if (!j$.private.isObject(actual)) { throw new Error( getErrorMsg('Expected a spy object, but got ' + typeof actual + '.') ); diff --git a/src/core/matchers/toMatch.js b/src/core/matchers/toMatch.js index 571304c9..1475d930 100644 --- a/src/core/matchers/toMatch.js +++ b/src/core/matchers/toMatch.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toMatch = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect().toMatch( || )' ); @@ -17,7 +17,10 @@ getJasmineRequireObj().toMatch = function(j$) { function toMatch() { return { compare: function(actual, expected) { - if (!j$.isString_(expected) && !j$.isA_('RegExp', expected)) { + if ( + !j$.private.isString(expected) && + !j$.private.isA('RegExp', expected) + ) { throw new Error(getErrorMsg('Expected is not a String or a RegExp')); } diff --git a/src/core/matchers/toThrow.js b/src/core/matchers/toThrow.js index 9f8e2240..db230097 100644 --- a/src/core/matchers/toThrow.js +++ b/src/core/matchers/toThrow.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toThrow = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect(function() {}).toThrow()' ); diff --git a/src/core/matchers/toThrowError.js b/src/core/matchers/toThrowError.js index 4ddd78b3..46554220 100644 --- a/src/core/matchers/toThrowError.js +++ b/src/core/matchers/toThrowError.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toThrowError = function(j$) { - const getErrorMsg = j$.formatErrorMsg( + const getErrorMsg = j$.private.formatErrorMsg( '', 'expect(function() {}).toThrowError(, )' ); @@ -36,7 +36,7 @@ getJasmineRequireObj().toThrowError = function(j$) { thrown = e; } - if (!j$.isError_(thrown)) { + if (!j$.private.isError(thrown)) { return fail(function() { return ( 'Expected function to throw an Error, but it threw ' + @@ -79,7 +79,7 @@ getJasmineRequireObj().toThrowError = function(j$) { match: function(error) { return pass( 'Expected function not to throw an Error, but it threw ' + - j$.fnNameFor(error) + + j$.private.fnNameFor(error) + '.' ); } @@ -108,12 +108,12 @@ getJasmineRequireObj().toThrowError = function(j$) { } const errorTypeDescription = errorType - ? j$.fnNameFor(errorType) + ? j$.private.fnNameFor(errorType) : 'an exception'; function thrownDescription(thrown) { const thrownName = errorType - ? j$.fnNameFor(thrown.constructor) + ? j$.private.fnNameFor(thrown.constructor) : 'an exception'; let thrownMessage = ''; @@ -179,7 +179,7 @@ getJasmineRequireObj().toThrowError = function(j$) { const Surrogate = function() {}; Surrogate.prototype = type.prototype; - return j$.isError_(new Surrogate()); + return j$.private.isError(new Surrogate()); } } diff --git a/src/core/matchers/toThrowMatching.js b/src/core/matchers/toThrowMatching.js index 4e9ea406..508fa226 100644 --- a/src/core/matchers/toThrowMatching.js +++ b/src/core/matchers/toThrowMatching.js @@ -1,5 +1,5 @@ getJasmineRequireObj().toThrowMatching = function(j$) { - const usageError = j$.formatErrorMsg( + const usageError = j$.private.formatErrorMsg( '', 'expect(function() {}).toThrowMatching()' ); @@ -53,7 +53,7 @@ getJasmineRequireObj().toThrowMatching = function(j$) { function thrownDescription(thrown) { if (thrown && thrown.constructor) { return ( - j$.fnNameFor(thrown.constructor) + + j$.private.fnNameFor(thrown.constructor) + ' with message ' + matchersUtil.pp(thrown.message) ); diff --git a/src/core/reporterEvents.js b/src/core/reporterEvents.js index e073494a..4f563d94 100644 --- a/src/core/reporterEvents.js +++ b/src/core/reporterEvents.js @@ -1,4 +1,4 @@ -getJasmineRequireObj().reporterEvents = function() { +getJasmineRequireObj().reporterEvents = function(j$) { /** * Used to tell Jasmine what optional or uncommonly implemented features * the reporter supports. If not specified, the defaults described in diff --git a/src/core/requireCore.js b/src/core/requireCore.js index 669bd244..63925f61 100644 --- a/src/core/requireCore.js +++ b/src/core/requireCore.js @@ -29,92 +29,79 @@ var getJasmineRequireObj = (function(jasmineGlobal) { } getJasmineRequire().core = function(jRequire) { - const j$ = {}; + const j$ = { private: {} }; jRequire.base(j$, jasmineGlobal); - j$.util = jRequire.util(j$); - j$.errors = jRequire.errors(); - j$.formatErrorMsg = jRequire.formatErrorMsg(); - j$.Any = jRequire.Any(j$); - j$.Anything = jRequire.Anything(j$); - j$.CallTracker = jRequire.CallTracker(j$); - j$.MockDate = jRequire.MockDate(j$); - j$.getClearStack = jRequire.clearStack(j$); - j$.Clock = jRequire.Clock(); - j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$); - j$.Deprecator = jRequire.Deprecator(j$); - j$.Configuration = jRequire.Configuration(j$); - j$.Env = jRequire.Env(j$); - j$.StackTrace = jRequire.StackTrace(j$); - j$.ExceptionFormatter = jRequire.ExceptionFormatter(j$); - j$.ExpectationFilterChain = jRequire.ExpectationFilterChain(); - j$.Expector = jRequire.Expector(j$); - j$.Expectation = jRequire.Expectation(j$); - j$.buildExpectationResult = jRequire.buildExpectationResult(j$); - j$.JsApiReporter = jRequire.JsApiReporter(j$); - j$.makePrettyPrinter = jRequire.makePrettyPrinter(j$); - j$.basicPrettyPrinter_ = j$.makePrettyPrinter(); - j$.MatchersUtil = jRequire.MatchersUtil(j$); - j$.ObjectContaining = jRequire.ObjectContaining(j$); - j$.ArrayContaining = jRequire.ArrayContaining(j$); - j$.ArrayWithExactContents = jRequire.ArrayWithExactContents(j$); - j$.MapContaining = jRequire.MapContaining(j$); - j$.SetContaining = jRequire.SetContaining(j$); - j$.QueueRunner = jRequire.QueueRunner(j$); - j$.NeverSkipPolicy = jRequire.NeverSkipPolicy(j$); - j$.SkipAfterBeforeAllErrorPolicy = jRequire.SkipAfterBeforeAllErrorPolicy( + j$.private.util = jRequire.util(j$); + j$.private.errors = jRequire.errors(); + j$.private.formatErrorMsg = jRequire.formatErrorMsg(j$); + j$.private.Any = jRequire.Any(j$); + j$.private.Anything = jRequire.Anything(j$); + j$.private.CallTracker = jRequire.CallTracker(j$); + j$.private.MockDate = jRequire.MockDate(j$); + j$.private.getClearStack = jRequire.clearStack(j$); + j$.private.Clock = jRequire.Clock(); + j$.private.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$); + j$.private.Deprecator = jRequire.Deprecator(j$); + j$.private.Configuration = jRequire.Configuration(j$); + j$.private.Env = jRequire.Env(j$); + j$.private.StackTrace = jRequire.StackTrace(j$); + j$.private.ExceptionFormatter = jRequire.ExceptionFormatter(j$); + j$.private.ExpectationFilterChain = jRequire.ExpectationFilterChain(); + j$.private.Expector = jRequire.Expector(j$); + j$.private.Expectation = jRequire.Expectation(j$); + j$.private.buildExpectationResult = jRequire.buildExpectationResult(j$); + j$.private.JsApiReporter = jRequire.JsApiReporter(j$); + j$.private.makePrettyPrinter = jRequire.makePrettyPrinter(j$); + j$.private.basicPrettyPrinter = j$.private.makePrettyPrinter(); + j$.private.MatchersUtil = jRequire.MatchersUtil(j$); + j$.private.ObjectContaining = jRequire.ObjectContaining(j$); + j$.private.ArrayContaining = jRequire.ArrayContaining(j$); + j$.private.ArrayWithExactContents = jRequire.ArrayWithExactContents(j$); + j$.private.MapContaining = jRequire.MapContaining(j$); + j$.private.SetContaining = jRequire.SetContaining(j$); + j$.private.QueueRunner = jRequire.QueueRunner(j$); + j$.private.NeverSkipPolicy = jRequire.NeverSkipPolicy(j$); + j$.private.SkipAfterBeforeAllErrorPolicy = jRequire.SkipAfterBeforeAllErrorPolicy( j$ ); - j$.CompleteOnFirstErrorSkipPolicy = jRequire.CompleteOnFirstErrorSkipPolicy( + j$.private.CompleteOnFirstErrorSkipPolicy = jRequire.CompleteOnFirstErrorSkipPolicy( j$ ); - j$.reporterEvents = jRequire.reporterEvents(j$); - j$.ReportDispatcher = jRequire.ReportDispatcher(j$); + j$.private.reporterEvents = jRequire.reporterEvents(j$); + j$.private.ReportDispatcher = jRequire.ReportDispatcher(j$); j$.ParallelReportDispatcher = jRequire.ParallelReportDispatcher(j$); - j$.CurrentRunableTracker = jRequire.CurrentRunableTracker(); - j$.RunableResources = jRequire.RunableResources(j$); - j$.Runner = jRequire.Runner(j$); - j$.Spec = jRequire.Spec(j$); - j$.Spy = jRequire.Spy(j$); - j$.SpyFactory = jRequire.SpyFactory(j$); - j$.SpyRegistry = jRequire.SpyRegistry(j$); - j$.SpyStrategy = jRequire.SpyStrategy(j$); - j$.StringMatching = jRequire.StringMatching(j$); - j$.StringContaining = jRequire.StringContaining(j$); - j$.UserContext = jRequire.UserContext(j$); - j$.Suite = jRequire.Suite(j$); - j$.SuiteBuilder = jRequire.SuiteBuilder(j$); + j$.private.CurrentRunableTracker = jRequire.CurrentRunableTracker(); + j$.private.RunableResources = jRequire.RunableResources(j$); + j$.private.Runner = jRequire.Runner(j$); + j$.private.Spec = jRequire.Spec(j$); + j$.private.Spy = jRequire.Spy(j$); + j$.private.SpyFactory = jRequire.SpyFactory(j$); + j$.private.SpyRegistry = jRequire.SpyRegistry(j$); + j$.private.SpyStrategy = jRequire.SpyStrategy(j$); + j$.private.StringMatching = jRequire.StringMatching(j$); + j$.private.StringContaining = jRequire.StringContaining(j$); + j$.private.UserContext = jRequire.UserContext(j$); + j$.private.Suite = jRequire.Suite(j$); + j$.private.SuiteBuilder = jRequire.SuiteBuilder(j$); j$.Timer = jRequire.Timer(); - j$.TreeProcessor = jRequire.TreeProcessor(j$); - j$.TreeRunner = jRequire.TreeRunner(j$); + j$.private.TreeProcessor = jRequire.TreeProcessor(j$); + j$.private.TreeRunner = jRequire.TreeRunner(j$); j$.version = jRequire.version(); - j$.Order = jRequire.Order(); - j$.DiffBuilder = jRequire.DiffBuilder(j$); - j$.NullDiffBuilder = jRequire.NullDiffBuilder(j$); - j$.ObjectPath = jRequire.ObjectPath(j$); - j$.MismatchTree = jRequire.MismatchTree(j$); + j$.private.Order = jRequire.Order(); + j$.private.DiffBuilder = jRequire.DiffBuilder(j$); + j$.private.NullDiffBuilder = jRequire.NullDiffBuilder(j$); + j$.private.ObjectPath = jRequire.ObjectPath(j$); + j$.private.MismatchTree = jRequire.MismatchTree(j$); + j$.private.GlobalErrors = jRequire.GlobalErrors(j$); + j$.private.Truthy = jRequire.Truthy(j$); + j$.private.Falsy = jRequire.Falsy(j$); + j$.private.Empty = jRequire.Empty(j$); + j$.private.NotEmpty = jRequire.NotEmpty(j$); + j$.private.Is = jRequire.Is(j$); - // zone.js tries to monkey patch GlobalErrors in a way that is either a - // no-op or causes Jasmine to crash, depending on whether it's done before - // or after env creation. Prevent that. - const GlobalErrors = jRequire.GlobalErrors(j$); - Object.defineProperty(j$, 'GlobalErrors', { - enumerable: true, - configurable: false, - get() { - return GlobalErrors; - }, - set() {} - }); - - j$.Truthy = jRequire.Truthy(j$); - j$.Falsy = jRequire.Falsy(j$); - j$.Empty = jRequire.Empty(j$); - j$.NotEmpty = jRequire.NotEmpty(j$); - j$.Is = jRequire.Is(j$); - - j$.matchers = jRequire.requireMatchers(jRequire, j$); - j$.asyncMatchers = jRequire.requireAsyncMatchers(jRequire, j$); + j$.private.matchers = jRequire.requireMatchers(jRequire, j$); + j$.private.asyncMatchers = jRequire.requireAsyncMatchers(jRequire, j$); return j$; }; diff --git a/src/core/requireInterface.js b/src/core/requireInterface.js index 507ba14d..45f0f721 100644 --- a/src/core/requireInterface.js +++ b/src/core/requireInterface.js @@ -352,7 +352,7 @@ getJasmineRequireObj().interface = function(jasmine, env) { return env.spyOnAllFunctions(obj, includeNonEnumerable); }, - jsApiReporter: new jasmine.JsApiReporter({ + jsApiReporter: new jasmine.private.JsApiReporter({ timer: new jasmine.Timer() }), diff --git a/src/core/util.js b/src/core/util.js index f824df1d..e0e9edbd 100644 --- a/src/core/util.js +++ b/src/core/util.js @@ -27,7 +27,7 @@ getJasmineRequireObj().util = function(j$) { } else if (str === '[object Date]') { return new Date(arg.valueOf()); } else { - return j$.util.clone(arg); + return j$.private.util.clone(arg); } }); }; @@ -49,7 +49,7 @@ getJasmineRequireObj().util = function(j$) { }; function callerFile() { - const trace = new j$.StackTrace(new Error()); + const trace = new j$.private.StackTrace(new Error()); return trace.frames[1].file; } diff --git a/src/html/HtmlReporter.js b/src/html/HtmlReporter.js index 88cafae1..33a2f165 100644 --- a/src/html/HtmlReporter.js +++ b/src/html/HtmlReporter.js @@ -1,6 +1,6 @@ jasmineRequire.HtmlReporter = function(j$) { function ResultsStateBuilder() { - this.topResults = new j$.ResultsNode({}, '', null); + this.topResults = new j$.private.ResultsNode({}, '', null); this.currentParent = this.topResults; this.specsExecuted = 0; this.failureCount = 0; @@ -758,7 +758,7 @@ jasmineRequire.HtmlReporter = function(j$) { const el = createElement(type); let children; - if (j$.isArray_(childrenArrayOrVarArgs)) { + if (j$.private.isArray(childrenArrayOrVarArgs)) { children = childrenArrayOrVarArgs; } else { children = []; diff --git a/src/html/requireHtml.js b/src/html/requireHtml.js index 522db07f..dd3b5a47 100644 --- a/src/html/requireHtml.js +++ b/src/html/requireHtml.js @@ -2,7 +2,7 @@ var jasmineRequire = window.jasmineRequire || require('./jasmine.js'); jasmineRequire.html = function(j$) { - j$.ResultsNode = jasmineRequire.ResultsNode(); + j$.private.ResultsNode = jasmineRequire.ResultsNode(); j$.HtmlReporter = jasmineRequire.HtmlReporter(j$); j$.QueryString = jasmineRequire.QueryString(); j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter();