Merge branch '3.99' into 4.0

2021-08-30 18:44:32 -07:00
parent d8862aa583 de9815f436
commit a63b0b0368
12 changed files with 518 additions and 188 deletions
--- a/spec/core/SpySpec.js
+++ b/spec/core/SpySpec.js
@@ -264,6 +264,7 @@ describe('Spies', function() {
        reject: jasmine.createSpy()
      };
      customPromise.resolve.and.returnValue('resolved');
+      spyOn(env, 'deprecated');
      env.configure({ Promise: customPromise });

      var spy = env.createSpy('foo').and.resolveTo(42);