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
@@ -144,11 +144,17 @@ describe('Env', function() {
    });

    it('can be configured with a custom library', function() {
+      spyOn(env, 'deprecated');
      var myLibrary = {
        resolve: jasmine.createSpy(),
        reject: jasmine.createSpy()
      };
      env.configure({ Promise: myLibrary });
+      expect(env.deprecated).toHaveBeenCalledWith(
+        'The `Promise` config property is deprecated. Future versions of ' +
+          'Jasmine will create native promises even if the `Promise` config ' +
+          'property is set. Please remove it.'
+      );
    });

    it('cannot be configured with an invalid promise library', function() {
@@ -540,4 +546,10 @@ describe('Env', function() {

    expect(suiteThis).not.toBeInstanceOf(jasmineUnderTest.Suite);
  });
+
+  describe('#execute', function() {
+    it('returns a promise', function() {
+      expect(env.execute()).toBeInstanceOf(Promise);
+    });
+  });
 });