Merge branch 'main' into 3.99

2021-07-10 08:58:14 -07:00
parent 00c1e3d608 50c88e7774
commit 6cb9507f62
43 changed files with 1037 additions and 314 deletions
@@ -13,9 +13,11 @@ getJasmineRequireObj().Spy = function(j$) {
  });

  /**
-   * _Note:_ Do not construct this directly, use {@link spyOn}, {@link spyOnProperty}, {@link jasmine.createSpy}, or {@link jasmine.createSpyObj}
-   * @constructor
-   * @name Spy
+   * @classdesc _Note:_ Do not construct this directly. Use {@link spyOn},
+   * {@link spyOnProperty}, {@link jasmine.createSpy}, or
+   * {@link jasmine.createSpyObj} instead.
+   * @class Spy
+   * @hideconstructor
   */
  function Spy(
    name,