Merge branch 'main' into 3.99

This commit is contained in:
Steve Gravrock
2021-07-10 08:58:14 -07:00
43 changed files with 1037 additions and 314 deletions

View File

@@ -1,10 +1,11 @@
getJasmineRequireObj().Env = function(j$) {
/**
* _Note:_ Do not construct this directly, Jasmine will make one during booting.
* @name Env
* @class Env
* @since 2.0.0
* @classdesc The Jasmine environment
* @constructor
* @classdesc The Jasmine environment.<br>
* _Note:_ Do not construct this directly. You can obtain the Env instance by
* calling {@link jasmine.getEnv}.
* @hideconstructor
*/
function Env(options) {
options = options || {};
@@ -35,7 +36,8 @@ getJasmineRequireObj().Env = function(j$) {
/**
* This represents the available options to configure Jasmine.
* Options that are not provided will use their default values
* Options that are not provided will use their default values.
* @see Env#configure
* @interface Configuration
* @since 3.3.0
*/
@@ -651,6 +653,7 @@ getJasmineRequireObj().Env = function(j$) {
* @name Env#hideDisabled
* @since 3.2.0
* @function
* @deprecated Use the `hideDisabled` option with {@link Env#configure}
*/
this.hideDisabled = function(value) {
this.deprecated(