diff --git a/lib/jasmine-core/boot.js b/lib/jasmine-core/boot.js index acd4c5a8..9c9aee42 100644 --- a/lib/jasmine-core/boot.js +++ b/lib/jasmine-core/boot.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2020 Pivotal Labs +Copyright (c) 2008-2021 Pivotal Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/lib/jasmine-core/jasmine-html.js b/lib/jasmine-core/jasmine-html.js index 5e436b3e..8539c76c 100644 --- a/lib/jasmine-core/jasmine-html.js +++ b/lib/jasmine-core/jasmine-html.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2020 Pivotal Labs +Copyright (c) 2008-2021 Pivotal Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 51c2d0ad..36f1e822 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2020 Pivotal Labs +Copyright (c) 2008-2021 Pivotal Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -532,16 +532,6 @@ getJasmineRequireObj().util = function(j$) { childClass.prototype = new Subclass(); }; - util.htmlEscape = function(str) { - if (!str) { - return str; - } - return str - .replace(/&/g, '&') - .replace(//g, '>'); - }; - util.argsToArray = function(args) { var arrayOfArgs = []; for (var i = 0; i < args.length; i++) { @@ -1389,6 +1379,9 @@ getJasmineRequireObj().Env = function(j$) { resources.customAsyncMatchers = j$.util.clone( runnableResources[parentRunnableId].customAsyncMatchers ); + resources.customObjectFormatters = j$.util.clone( + runnableResources[parentRunnableId].customObjectFormatters + ); resources.defaultStrategyFn = runnableResources[parentRunnableId].defaultStrategyFn; } diff --git a/lib/jasmine-core/node_boot.js b/lib/jasmine-core/node_boot.js index d62c7d36..4016e3b8 100644 --- a/lib/jasmine-core/node_boot.js +++ b/lib/jasmine-core/node_boot.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2020 Pivotal Labs +Copyright (c) 2008-2021 Pivotal Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the