Bump version to 4.2.0

This removes quite a bit of indirection from result processing, at the
cost of making a few of the tests more awkward.

.circleci/config.yml

@@ -3,25 +3,26 @@
 
 version: 2.1
 
-orbs:
-  node: circleci/node@3.0.0
-
 executors:
+  node18:
+    docker:
+      - image: cimg/node:18.0.0 # Latest 18.x
+    working_directory: ~/workspace
   node16:
     docker:
-      - image: cimg/node:16.1.0-browsers
+      - image: cimg/node:16.14.2 # Latest 16.x
     working_directory: ~/workspace
   node14:
     docker:
-      - image: circleci/node:14
+      - image: cimg/node:14.17.4 # Latest 14.x
     working_directory: ~/workspace
   node12_latest:
     docker:
-    - image: circleci/node:12
+    - image: cimg/node:12.22.10 # Latest 12.x
     working_directory: ~/workspace
   node12_17:
     docker:
-      - image: circleci/node:12.17
+      - image: cimg/node:12.17.0 # Oldest version supported by Jasmine
     working_directory: ~/workspace
 
 jobs:
@@ -60,8 +61,6 @@ jobs:
 
   test_browsers: &test_browsers
     executor: node14
-    environment:
-      SKIP_JASMINE_BROWSER_FLAKES: "true"
     steps:
       - attach_workspace:
           at: .
@@ -69,10 +68,10 @@ jobs:
           name: Install Sauce Connect
           command: |
             cd /tmp
-            curl https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz | tar zxf -
+            curl https://saucelabs.com/downloads/sc-4.7.1-linux.tar.gz | tar zxf -
-            chmod +x sc-4.6.4-linux/bin/sc
+            chmod +x sc-4.7.1-linux/bin/sc
             mkdir ~/workspace/bin
-            cp sc-4.6.4-linux/bin/sc ~/workspace/bin
+            cp sc-4.7.1-linux/bin/sc ~/workspace/bin
             ~/workspace/bin/sc --version
       - run:
           name: Run tests
@@ -90,61 +89,14 @@ jobs:
             scripts/stop-sauce-connect $(cat sauce-pidfile)
             exit $exitcode
 
-  test_browser_flakes:
-    <<: *test_browsers
-    environment:
-      SKIP_JASMINE_BROWSER_FLAKES: "false"
-
 workflows:
   version: 2
-  cron:
-    triggers:
-      - schedule:
-          # Times are UTC.
-          cron: "0 11 * * *"
-          filters:
-            branches:
-               only:
-                 - main
-                 - "3.99"
-                 - "4.0"
-    jobs:
-      - build:
-          executor: node16
-          name: build_node_16
-      - build:
-          executor: node14
-          name: build_node_14
-      - build:
-          executor: node12_latest
-          name: build_node_12_latest
-      - build:
-          executor: node12_17
-          name: build_node_12_17
-      - test_node:
-          executor: node16
-          name: test_node_16
-          requires:
-             - build_node_16
-      - test_node:
-          executor: node12_latest
-          name: test_node_12_latest
-          requires:
-             - build_node_12_latest
-      - test_node:
-          executor: node12_17
-          name: test_node_12_17
-          requires:
-             - build_node_12_17
-      - test_browsers:
-          requires:
-             - build_node_14
-          filters:
-            branches:
-              ignore: /pull\/.*/ # Don't run on pull requests.
 
   push:
     jobs:
+      - build:
+          executor: node18
+          name: build_node_18
       - build:
           executor: node16
           name: build_node_16
@@ -157,6 +109,11 @@ workflows:
       - build:
           executor: node12_17
           name: build_node_12_17
+      - test_node:
+          executor: node18
+          name: test_node_18
+          requires:
+             - build_node_18
       - test_node:
           executor: node16
           name: test_node_16
@@ -183,23 +140,3 @@ workflows:
           filters:
             branches:
               ignore: /pull\/.*/ # Don't run on pull requests.
-
-  browser-flakes:
-    triggers:
-    - schedule:
-        # Times are UTC.
-        cron: "0 10 * * *"
-        filters:
-          branches:
-            only:
-            - browser-flakes
-    jobs:
-    - build:
-        executor: node14
-        name: build_node_14
-    - test_browser_flakes:
-        requires:
-        - build_node_14
-        filters:
-          branches:
-            ignore: /pull\/.*/ # Don't run on pull requests.

README.md

@@ -20,39 +20,24 @@ Please read the [contributors' guide](https://github.com/jasmine/jasmine/blob/ma
 
 ## Installation
 
-For the Jasmine NPM module:<br>
+There are several different ways to install Jasmine, depending on your 
-[https://github.com/jasmine/jasmine-npm](https://github.com/jasmine/jasmine-npm).
+environment and how you'd like to use it. See the [Getting Started page](https://jasmine.github.io/pages/getting_started.html)
+for details.
 
-For the Jasmine browser runner:<br>
+## Usage
-[https://github.com/jasmine/jasmine-browser](https://github.com/jasmine/jasmine-browser).
 
-To install Jasmine standalone on your local box (where **_{#.#.#}_** below is substituted by the release number downloaded):
+See the [documentation site](https://jasmine.github.io/pages/docs_home.html),
-
+particularly the [Your First Suite tutorial](https://jasmine.github.io/tutorials/your_first_suite)
-* Download the standalone distribution for your desired release from the [releases page](https://github.com/jasmine/jasmine/releases).
+for information on writing specs.
-* Create a Jasmine directory in your project. - `mkdir my-project/jasmine`
-* Move the dist to your project directory. - `mv jasmine/dist/jasmine-standalone-{#.#.#}.zip my-project/jasmine`
-* Change directory. - `cd my-project/jasmine`
-* Unzip the dist. - `unzip jasmine-standalone-{#.#.#}.zip`
-
-Add the following to your HTML file:
-
-```html
-<link rel="shortcut icon" type="image/png" href="lib/jasmine-{#.#.#}/jasmine_favicon.png">
-<link rel="stylesheet" type="text/css" href="lib/jasmine-{#.#.#}/jasmine.css">
-
-<script type="text/javascript" src="lib/jasmine-{#.#.#}/jasmine.js"></script>
-<script type="text/javascript" src="lib/jasmine-{#.#.#}/jasmine-html.js"></script>
-<script type="text/javascript" src="lib/jasmine-{#.#.#}/boot.js"></script>
-```
 
 ## Supported environments
 
 Jasmine tests itself across popular browsers (Safari, Chrome, Firefox, and
-Microsoft Edge) as well as nodejs.
+Microsoft Edge) as well as Node.
 
 | Environment       | Supported versions |
 |-------------------|--------------------|
-| Node              | 12.17+, 14, 16     |
+| Node              | 12.17+, 14, 16, 18 |
 | Safari            | 14-15              |
 | Chrome            | Evergreen          |
 | Firefox           | Evergreen, 91      |
@@ -74,18 +59,19 @@ for the supported environments for each Jasmine release.
 
 ## Maintainers
 
-* [Gregg Van Hove](mailto:gvanhove@pivotal.io), Pivotal Labs
+* [Gwendolyn Van Hove](mailto:gwen@slackersoft.net)
+* [Steve Gravrock](mailto:sdg@panix.com)
 
 ### Maintainers Emeritus
 
-* [Davis W. Frank](mailto:dwfrank@pivotal.io), Pivotal Labs
+* [Davis W. Frank](mailto:dwfrank@pivotal.io)
-* [Rajan Agaskar](mailto:rajan@pivotal.io), Pivotal Labs
+* [Rajan Agaskar](mailto:rajan@pivotal.io)
-* [Greg Cobb](mailto:gcobb@pivotal.io), Pivotal Labs
+* [Greg Cobb](mailto:gcobb@pivotal.io)
-* [Chris Amavisca](mailto:camavisca@pivotal.io), Pivotal Labs
+* [Chris Amavisca](mailto:camavisca@pivotal.io)
-* [Christian Williams](mailto:antixian666@gmail.com), Cloud Foundry
+* [Christian Williams](mailto:antixian666@gmail.com)
 * Sheel Choksi
 
-Copyright (c) 2008-2018 Pivotal Labs. This software is licensed under the MIT License.
+Copyright (c) 2008-2022 Jasmine Maintainers. This software is licensed under the MIT License.
 
 
 ## License

RELEASE.md

@@ -36,9 +36,10 @@ When ready to release - specs are all green and the stories are done:
 ### Commit and push core changes
 
 1. Run the browser tests using `scripts/run-all-browsers`.
-1. Commit release notes and version changes (jasmine.js, version.rb, package.json)
+2. Commit release notes and version changes (jasmine.js, package.json)
-1. Push
+3. Push
-1. Wait for Circle CI to go green
+4. Tag the release and push the tag.
+5. Wait for Circle CI to go green
 
 ### Build standalone distribution
 
@@ -47,7 +48,6 @@ When ready to release - specs are all green and the stories are done:
 
 ### Release the core NPM module
 
-1. Run the tests on Windows. (CI only tests on Linux.)
 1. `npm adduser` to save your credentials locally
 1. `npm publish .` to publish what's in `package.json`
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jasmine-core",
   "license": "MIT",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/jasmine/jasmine.git"
@@ -43,8 +43,8 @@
     "grunt-contrib-concat": "^2.0.0",
     "grunt-css-url-embed": "^1.11.1",
     "grunt-sass": "^3.0.2",
-    "jasmine": "github:jasmine/jasmine-npm#main",
+    "jasmine": "^4.1.0",
-    "jasmine-browser-runner": "github:jasmine/jasmine-browser#main",
+    "jasmine-browser-runner": "^1.0.0",
     "jsdom": "^19.0.0",
     "load-grunt-tasks": "^5.1.0",
     "prettier": "1.17.1",
@@ -95,14 +95,15 @@
         "error",
         "always"
       ],
-      "space-before-blocks": "error"
+      "space-before-blocks": "error",
+      "no-eval": "error"
     }
   },
   "browserslist": [
-    "Safari >= 13",
+    "Safari >= 14",
     "last 2 Chrome versions",
     "last 2 Firefox versions",
-    "Firefox >= 68",
+    "Firefox >= 91",
     "last 2 Edge versions"
   ]
 }

release_notes/3.99.1.md

@@ -0,0 +1,22 @@
+# Jasmine Core 3.99.1 Release Notes
+
+This release fixes a bug in 3.99.0, which incorrectly reported a deprecation
+warning when a promise returned from a function passed to `it`, `beforeEach`,
+etc was resolved to a value.
+
+## Supported environments
+
+jasmine-core 3.99.1 has been tested in the following environments.
+
+| Environment       | Supported versions |
+|-------------------|--------------------|
+| Node              | 10, 12, 14, 16     |
+| Safari            | 10-14              |
+| Chrome            | 98                 |
+| Firefox           | 97, 78, 68         |
+| Edge              | 98                 |
+| Internet Explorer | 10, 11             |
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/4.0.1.md

@@ -0,0 +1,21 @@
+# Jasmine Core 4.0.1 Release Notes
+
+This release fixes a bug in 4.0.0, which incorrectly reported a failure
+when a promise returned from a function passed to `it`, `beforeEach`,
+etc was resolved to a value.
+
+## Supported environments
+
+jasmine-core 4.0.1 has been tested in the following environments.
+
+| Environment       | Supported versions |
+|-------------------|--------------------|
+| Node              | 12.17+, 14, 16     |
+| Safari            | 14-15              |
+| Chrome            | 98                 |
+| Firefox           | 91, 97             |
+| Edge              | 98                 |
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/4.1.0.md

@@ -0,0 +1,50 @@
+# Jasmine 4.1.0 Release Notes
+
+## New Features and Bug Fixes
+
+* toBeCloseTo treats Infinity and -Infinity as close to themselves
+  * Fixes [#1957](https://github.com/jasmine/jasmine/issues/1957)
+
+* Replaced uses of deprecated String.prototype.substr()
+  * Merges [#1962](https://github.com/jasmine/jasmine/pull/1962) from @CommanderRoot
+
+* Removed obsolete vendor-specific background-size CSS rules
+  * Fixes [#1961](https://github.com/jasmine/jasmine/issues/1961)
+
+* Added toHaveSpyInteractions matcher
+  * Merges [#1959](https://github.com/jasmine/jasmine/pull/1959) from @nitobuenida
+  * Fixes [#1568](https://github.com/jasmine/jasmine/issues/1568)
+
+* Pretty-print [new String("")] as "[ '' ]", not "[]"
+
+* Fixed cloning of Date objects in Spy#calls#saveArgumentsByValue
+  * Merges [#1955](https://github.com/jasmine/jasmine/pull/1955) from @coyoteecd
+  * Fixes [#1885](https://github.com/jasmine/jasmine/issues/1885)
+
+* Include the name of the suite in the empty suite error message
+
+* toEqual checks keys that are Symbols
+  * Merges [#1879](https://github.com/jasmine/jasmine/pull/1879) from @laeleoni
+  * Fixes [#1811](https://github.com/jasmine/jasmine/issues/1811)
+
+## Documentation Updates
+
+* Replaced redundant installation instructions in README with link to docs
+
+* Added links to usage instructions to README
+
+## Supported environments
+
+jasmine-core 4.1.0 has been tested in the following environments.
+
+| Environment       | Supported versions |
+|-------------------|--------------------|
+| Node              | 12.17+, 14, 16     |
+| Safari            | 14-15              |
+| Chrome            | 100                |
+| Firefox           | 91, 99             |
+| Edge              | 100                |
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/4.1.1.md

@@ -0,0 +1,35 @@
+# Jasmine 4.1.1 Release Notes
+
+## Summary
+
+This release fixes several bugs involving equality comparison of properties
+with Symbol keys.
+
+## Bug fixes
+
+* Fixes for crash bugs and output problems when comparing objects with Symbol keys
+  * Include symbol properties in matcher diffs
+  * Fixed exception when comparing arrays with Symbol keys
+  * Include symbol properties in matcher diffs
+  * Include symbol keys when pretty-printing objects
+  * Fixes [#1966](https://github.com/jasmine/jasmine/issues/1966)
+
+* Exclude non-enumerable symbol properties from equality comparison
+  * Merges [#1963](https://github.com/jasmine/jasmine/pull/1963) from @suke
+
+
+## Supported environments
+
+jasmine-core 4.1.1 has been tested in the following environments.
+
+| Environment       | Supported versions |
+|-------------------|--------------------|
+| Node              | 12.17+, 14, 16, 18 |
+| Safari            | 14, 15             |
+| Chrome            | 101                |
+| Firefox           | 91, 100            |
+| Edge              | 101                |
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/4.2.0.md

@@ -0,0 +1,29 @@
+# Jasmine 4.2.0 Release Notes
+
+## New Features
+
+* Added a jasmine.is asymmetric equality tester
+  * Allows the use of === comparisons for specific fields of an object that
+    should otherwise be compared with the default deep value equality logic.
+  
+## Bug Fixes
+
+* More reliably report errors that occur late in the suite/spec lifecycle
+  * Previously, an error that occurred after Jasmine started to report the
+    suiteDone or specDone event for the current runable would not be reliably
+    reported. Now such an error is reported on the nearest ancestor suite whose 
+    suiteDone event has not yet been reported.
+
+* Don't report a deprecation when a runnable uses two forms of async
+  * This was made into an error in 4.0, so the deprecation is redundant.
+
+* Include property getter values in pretty-printed objects
+
+## Documentation Updates
+
+* Removed duplicate Suite and Spec jsdocs
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

spec/.eslintrc.js

@@ -7,10 +7,15 @@ module.exports = {
     semi: 'off',
     'key-spacing': 'off',
     'space-before-blocks': 'off',
-    'no-unused-vars': 'off',
     'no-trailing-spaces': 'off',
     'block-spacing': 'off',
 
+    // Additionally, check for unused fn args
+    // TODO: consider doing this in src files as well as specs
+    'no-unused-vars': ['error', { args: 'after-used' }],
+
+    'no-var': 'error',
+
     // Since linting is done at the end of the process and doesn't stop us
     // from running tests, it makes sense to fail if debugger statements
     // or console references are present.

spec/core/AsyncExpectationSpec.js

@@ -7,7 +7,7 @@ describe('AsyncExpectation', function() {
 
   describe('#not', function() {
     it('converts a pass to a fail', function() {
-      var addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      const addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = Promise.resolve(),
         pp = jasmineUnderTest.makePrettyPrinter(),
         expectation = jasmineUnderTest.Expectation.asyncFactory({
@@ -28,7 +28,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('converts a fail to a pass', function() {
-      var addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      const addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = Promise.reject(),
         expectation = jasmineUnderTest.Expectation.asyncFactory({
           matchersUtil: new jasmineUnderTest.MatchersUtil({
@@ -51,9 +51,9 @@ describe('AsyncExpectation', function() {
   });
 
   it('propagates rejections from the comparison function', function() {
-    var error = new Error('ExpectationSpec failure');
+    const error = new Error('ExpectationSpec failure');
 
-    var addExpectationResult = jasmine.createSpy('addExpectationResult'),
+    const addExpectationResult = jasmine.createSpy('addExpectationResult'),
       actual = dummyPromise(),
       expectation = jasmineUnderTest.Expectation.asyncFactory({
         actual: actual,
@@ -74,7 +74,7 @@ describe('AsyncExpectation', function() {
 
   describe('#withContext', function() {
     it('prepends the context to the generated failure message', function() {
-      var matchersUtil = {
+      const matchersUtil = {
           pp: function(val) {
             return val.toString();
           }
@@ -101,7 +101,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('prepends the context to a custom failure message', function() {
-      var matchersUtil = {
+      const matchersUtil = {
           buildFailureMessage: function() {
             return 'failure message';
           },
@@ -132,7 +132,7 @@ describe('AsyncExpectation', function() {
     it('prepends the context to a custom failure message from a function', function() {
       pending('should actually work, but no custom matchers for async yet');
 
-      var matchersUtil = {
+      const matchersUtil = {
           buildFailureMessage: function() {
             return 'failure message';
           }
@@ -159,7 +159,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('works with #not', function() {
-      var addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      const addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = Promise.resolve(),
         pp = jasmineUnderTest.makePrettyPrinter(),
         expectation = jasmineUnderTest.Expectation.asyncFactory({
@@ -183,7 +183,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('works with #not and a custom message', function() {
-      var addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      const addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = Promise.resolve('a'),
         expectation = jasmineUnderTest.Expectation.asyncFactory({
           actual: actual,
@@ -210,22 +210,20 @@ describe('AsyncExpectation', function() {
 
   describe('async matchers', function() {
     it('makes custom matchers available to this expectation', function() {
-      var asyncMatchers = {
+      const asyncMatchers = {
           toFoo: function() {},
           toBar: function() {}
         },
-        expectation;
+        expectation = jasmineUnderTest.Expectation.asyncFactory({
-
+          customAsyncMatchers: asyncMatchers
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+        });
-        customAsyncMatchers: asyncMatchers
-      });
 
       expect(expectation.toFoo).toBeDefined();
       expect(expectation.toBar).toBeDefined();
     });
 
     it("wraps matchers's compare functions, passing in matcher dependencies", function() {
-      var fakeCompare = function() {
+      const fakeCompare = function() {
           return Promise.resolve({ pass: true });
         },
         matcherFactory = jasmine
@@ -238,14 +236,12 @@ describe('AsyncExpectation', function() {
           buildFailureMessage: jasmine.createSpy('buildFailureMessage')
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        expectation;
+        expectation = jasmineUnderTest.Expectation.asyncFactory({
-
+          matchersUtil: matchersUtil,
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+          customAsyncMatchers: matchers,
-        matchersUtil: matchersUtil,
+          actual: 'an actual',
-        customAsyncMatchers: matchers,
+          addExpectationResult: addExpectationResult
-        actual: 'an actual',
+        });
-        addExpectationResult: addExpectationResult
-      });
 
       return expectation.toFoo('hello').then(function() {
         expect(matcherFactory).toHaveBeenCalledWith(matchersUtil);
@@ -253,7 +249,7 @@ describe('AsyncExpectation', function() {
     });
 
     it("wraps matchers's compare functions, passing the actual and expected", function() {
-      var fakeCompare = jasmine
+      const fakeCompare = jasmine
           .createSpy('fake-compare')
           .and.returnValue(Promise.resolve({ pass: true })),
         matchers = {
@@ -267,14 +263,12 @@ describe('AsyncExpectation', function() {
           buildFailureMessage: jasmine.createSpy('buildFailureMessage')
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        expectation;
+        expectation = jasmineUnderTest.Expectation.asyncFactory({
-
+          matchersUtil: matchersUtil,
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+          customAsyncMatchers: matchers,
-        matchersUtil: matchersUtil,
+          actual: 'an actual',
-        customAsyncMatchers: matchers,
+          addExpectationResult: addExpectationResult
-        actual: 'an actual',
+        });
-        addExpectationResult: addExpectationResult
-      });
 
       return expectation.toFoo('hello').then(function() {
         expect(fakeCompare).toHaveBeenCalledWith('an actual', 'hello');
@@ -282,7 +276,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('reports a passing result to the spec when the comparison passes', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -295,14 +289,13 @@ describe('AsyncExpectation', function() {
           buildFailureMessage: jasmine.createSpy('buildFailureMessage')
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         customAsyncMatchers: matchers,
         matchersUtil: matchersUtil,
         actual: 'an actual',
@@ -323,7 +316,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('reports a failing result to the spec when the comparison fails', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -338,14 +331,13 @@ describe('AsyncExpectation', function() {
           }
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         customAsyncMatchers: matchers,
         matchersUtil: matchersUtil,
         actual: 'an actual',
@@ -366,7 +358,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('reports a failing result and a custom fail message to the spec when the comparison fails', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -379,14 +371,13 @@ describe('AsyncExpectation', function() {
           }
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         actual: 'an actual',
         customAsyncMatchers: matchers,
         addExpectationResult: addExpectationResult
@@ -406,7 +397,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('reports a failing result with a custom fail message function to the spec when the comparison fails', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -421,14 +412,13 @@ describe('AsyncExpectation', function() {
           }
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         customAsyncMatchers: matchers,
         actual: 'an actual',
         addExpectationResult: addExpectationResult
@@ -448,7 +438,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('reports a passing result to the spec when the comparison fails for a negative expectation', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -459,14 +449,13 @@ describe('AsyncExpectation', function() {
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = 'an actual',
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         customAsyncMatchers: matchers,
         actual: 'an actual',
         addExpectationResult: addExpectationResult
@@ -486,7 +475,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('reports a failing result to the spec when the comparison passes for a negative expectation', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -502,14 +491,13 @@ describe('AsyncExpectation', function() {
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = 'an actual',
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         customAsyncMatchers: matchers,
         actual: 'an actual',
         matchersUtil: matchersUtil,
@@ -530,7 +518,7 @@ describe('AsyncExpectation', function() {
     });
 
     it('reports a failing result and a custom fail message to the spec when the comparison passes for a negative expectation', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -544,14 +532,13 @@ describe('AsyncExpectation', function() {
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = 'an actual',
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         customAsyncMatchers: matchers,
         actual: 'an actual',
         addExpectationResult: addExpectationResult
@@ -571,7 +558,7 @@ describe('AsyncExpectation', function() {
     });
 
     it("reports a passing result to the spec when the 'not' comparison passes, given a negativeCompare", function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -585,14 +572,13 @@ describe('AsyncExpectation', function() {
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = 'an actual',
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         customAsyncMatchers: matchers,
         actual: 'an actual',
         addExpectationResult: addExpectationResult
@@ -612,7 +598,7 @@ describe('AsyncExpectation', function() {
     });
 
     it("reports a failing result and a custom fail message to the spec when the 'not' comparison fails, given a negativeCompare", function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -629,14 +615,13 @@ describe('AsyncExpectation', function() {
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
         actual = 'an actual',
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         customAsyncMatchers: matchers,
         actual: 'an actual',
         addExpectationResult: addExpectationResult
@@ -656,8 +641,8 @@ describe('AsyncExpectation', function() {
     });
 
     it('reports errorWithStack when a custom error message is returned', function() {
-      var customError = new Error('I am a custom error');
+      const customError = new Error('I am a custom error');
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -671,14 +656,13 @@ describe('AsyncExpectation', function() {
           }
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         actual: 'an actual',
         customAsyncMatchers: matchers,
         addExpectationResult: addExpectationResult
@@ -698,7 +682,7 @@ describe('AsyncExpectation', function() {
     });
 
     it("reports a custom message to the spec when a 'not' comparison fails", function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -711,14 +695,13 @@ describe('AsyncExpectation', function() {
           }
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      const expectation = jasmineUnderTest.Expectation.asyncFactory({
         actual: 'an actual',
         customAsyncMatchers: matchers,
         addExpectationResult: addExpectationResult
@@ -738,7 +721,7 @@ describe('AsyncExpectation', function() {
     });
 
     it("reports a custom message func to the spec when a 'not' comparison fails", function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -753,14 +736,13 @@ describe('AsyncExpectation', function() {
           }
         },
         addExpectationResult = jasmine.createSpy('addExpectationResult'),
-        errorWithStack = new Error('errorWithStack'),
+        errorWithStack = new Error('errorWithStack');
-        expectation;
 
       spyOn(jasmineUnderTest.util, 'errorWithStack').and.returnValue(
         errorWithStack
       );
 
-      expectation = jasmineUnderTest.Expectation.asyncFactory({
+      let expectation = jasmineUnderTest.Expectation.asyncFactory({
         actual: 'an actual',
         customAsyncMatchers: matchers,
         addExpectationResult: addExpectationResult
@@ -781,6 +763,6 @@ describe('AsyncExpectation', function() {
   });
 
   function dummyPromise() {
-    return new Promise(function(resolve, reject) {});
+    return new Promise(function() {});
   }
 });

spec/core/CallTrackerSpec.js

@@ -1,6 +1,6 @@
 describe('CallTracker', function() {
   it('tracks that it was called when executed', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.any()).toBe(false);
 
@@ -10,7 +10,7 @@ describe('CallTracker', function() {
   });
 
   it('tracks that number of times that it is executed', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.count()).toEqual(0);
 
@@ -20,7 +20,7 @@ describe('CallTracker', function() {
   });
 
   it('tracks the params from each execution', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track({ object: void 0, args: [] });
     callTracker.track({ object: {}, args: [0, 'foo'] });
@@ -31,9 +31,9 @@ describe('CallTracker', function() {
   });
 
   it("tracks the 'this' object from each execution", function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
-    var this0 = {},
+    const this0 = {},
       this1 = {};
     callTracker.track({ object: this0, args: [] });
     callTracker.track({ object: this1, args: [] });
@@ -45,13 +45,13 @@ describe('CallTracker', function() {
   });
 
   it('returns any empty array when there was no call', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.argsFor(0)).toEqual([]);
   });
 
   it('allows access for the arguments for all calls', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track({ object: {}, args: [] });
     callTracker.track({ object: {}, args: [0, 'foo'] });
@@ -60,7 +60,7 @@ describe('CallTracker', function() {
   });
 
   it('tracks the context and arguments for each call', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track({ object: {}, args: [] });
     callTracker.track({ object: {}, args: [0, 'foo'] });
@@ -71,7 +71,7 @@ describe('CallTracker', function() {
   });
 
   it('simplifies access to the arguments for the last (most recent) call', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track();
     callTracker.track({ object: {}, args: [0, 'foo'] });
@@ -83,13 +83,13 @@ describe('CallTracker', function() {
   });
 
   it("returns a useful falsy value when there isn't a last (most recent) call", function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.mostRecent()).toBeFalsy();
   });
 
   it('simplifies access to the arguments for the first (oldest) call', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track({ object: {}, args: [0, 'foo'] });
 
@@ -97,13 +97,13 @@ describe('CallTracker', function() {
   });
 
   it("returns a useful falsy value when there isn't a first (oldest) call", function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     expect(callTracker.first()).toBeFalsy();
   });
 
   it('allows the tracking to be reset', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
 
     callTracker.track();
     callTracker.track({ object: {}, args: [0, 'foo'] });
@@ -117,10 +117,10 @@ describe('CallTracker', function() {
   });
 
   it('allows object arguments to be shallow cloned', function() {
-    var callTracker = new jasmineUnderTest.CallTracker();
+    const callTracker = new jasmineUnderTest.CallTracker();
     callTracker.saveArgumentsByValue();
 
-    var objectArg = { foo: 'bar' },
+    const objectArg = { foo: 'bar' },
       arrayArg = ['foo', 'bar'];
 
     callTracker.track({
@@ -135,7 +135,7 @@ describe('CallTracker', function() {
   });
 
   it('saves primitive arguments by value', function() {
-    var callTracker = new jasmineUnderTest.CallTracker(),
+    const callTracker = new jasmineUnderTest.CallTracker(),
       args = [undefined, null, false, '', /\s/, 0, 1.2, NaN];
 
     callTracker.saveArgumentsByValue();

spec/core/ClearStackSpec.js

@@ -1,6 +1,6 @@
 describe('ClearStack', function() {
   it('works in an integrationy way', function(done) {
-    var clearStack = jasmineUnderTest.getClearStack(
+    const clearStack = jasmineUnderTest.getClearStack(
       jasmineUnderTest.getGlobal()
     );
 
@@ -10,14 +10,14 @@ describe('ClearStack', function() {
   });
 
   it('uses setImmediate when available', function() {
-    var setImmediate = jasmine
+    const setImmediate = jasmine
         .createSpy('setImmediate')
         .and.callFake(function(fn) {
           fn();
         }),
       global = { setImmediate: setImmediate },
-      clearStack = jasmineUnderTest.getClearStack(global),
+      clearStack = jasmineUnderTest.getClearStack(global);
-      called = false;
+    let called = false;
 
     clearStack(function() {
       called = true;
@@ -28,7 +28,7 @@ describe('ClearStack', function() {
   });
 
   it('uses setTimeout instead of setImmediate every 10 calls to make sure we release the CPU', function() {
-    var setImmediate = jasmine.createSpy('setImmediate'),
+    const setImmediate = jasmine.createSpy('setImmediate'),
       setTimeout = jasmine.createSpy('setTimeout'),
       global = { setImmediate: setImmediate, setTimeout: setTimeout },
       clearStack = jasmineUnderTest.getClearStack(global);
@@ -56,7 +56,7 @@ describe('ClearStack', function() {
   });
 
   it('uses MessageChannels when available', function() {
-    var fakeChannel = {
+    const fakeChannel = {
         port1: {},
         port2: {
           postMessage: function() {
@@ -69,8 +69,8 @@ describe('ClearStack', function() {
           return fakeChannel;
         }
       },
-      clearStack = jasmineUnderTest.getClearStack(global),
+      clearStack = jasmineUnderTest.getClearStack(global);
-      called = false;
+    let called = false;
 
     clearStack(function() {
       called = true;
@@ -80,7 +80,7 @@ describe('ClearStack', function() {
   });
 
   it('uses setTimeout instead of MessageChannel every 10 calls to make sure we release the CPU', function() {
-    var fakeChannel = {
+    const fakeChannel = {
         port1: {},
         port2: {
           postMessage: jasmine
@@ -122,7 +122,7 @@ describe('ClearStack', function() {
   });
 
   it('calls setTimeout when onmessage is called recursively', function() {
-    var fakeChannel = {
+    const fakeChannel = {
         port1: {},
         port2: {
           postMessage: function() {
@@ -149,12 +149,14 @@ describe('ClearStack', function() {
   });
 
   it('falls back to setTimeout', function() {
-    var setTimeout = jasmine.createSpy('setTimeout').and.callFake(function(fn) {
+    const setTimeout = jasmine
-        fn();
+        .createSpy('setTimeout')
-      }),
+        .and.callFake(function(fn) {
+          fn();
+        }),
       global = { setTimeout: setTimeout },
-      clearStack = jasmineUnderTest.getClearStack(global),
+      clearStack = jasmineUnderTest.getClearStack(global);
-      called = false;
+    let called = false;
 
     clearStack(function() {
       called = true;

spec/core/ClockSpec.js

@@ -1,11 +1,11 @@
 describe('Clock', function() {
-  var NODE_JS =
+  const NODE_JS =
     typeof process !== 'undefined' &&
     process.versions &&
     typeof process.versions.node === 'string';
 
   it('does not replace setTimeout until it is installed', function() {
-    var fakeSetTimeout = jasmine.createSpy('global setTimeout'),
+    const fakeSetTimeout = jasmine.createSpy('global setTimeout'),
       fakeGlobal = { setTimeout: fakeSetTimeout },
       delayedFunctionScheduler = jasmine.createSpyObj(
         'delayedFunctionScheduler',
@@ -40,7 +40,7 @@ describe('Clock', function() {
   });
 
   it('does not replace clearTimeout until it is installed', function() {
-    var fakeClearTimeout = jasmine.createSpy('global cleartimeout'),
+    const fakeClearTimeout = jasmine.createSpy('global cleartimeout'),
       fakeGlobal = { clearTimeout: fakeClearTimeout },
       delayedFunctionScheduler = jasmine.createSpyObj(
         'delayedFunctionScheduler',
@@ -76,7 +76,7 @@ describe('Clock', function() {
   });
 
   it('does not replace setInterval until it is installed', function() {
-    var fakeSetInterval = jasmine.createSpy('global setInterval'),
+    const fakeSetInterval = jasmine.createSpy('global setInterval'),
       fakeGlobal = { setInterval: fakeSetInterval },
       delayedFunctionScheduler = jasmine.createSpyObj(
         'delayedFunctionScheduler',
@@ -111,7 +111,7 @@ describe('Clock', function() {
   });
 
   it('does not replace clearInterval until it is installed', function() {
-    var fakeClearInterval = jasmine.createSpy('global clearinterval'),
+    const fakeClearInterval = jasmine.createSpy('global clearinterval'),
       fakeGlobal = { clearInterval: fakeClearInterval },
       delayedFunctionScheduler = jasmine.createSpyObj(
         'delayedFunctionScheduler',
@@ -147,7 +147,7 @@ describe('Clock', function() {
   });
 
   it('does not install if the current setTimeout is not the original function on the global', function() {
-    var originalFakeSetTimeout = function() {},
+    const originalFakeSetTimeout = function() {},
       replacedSetTimeout = function() {},
       fakeGlobal = { setTimeout: originalFakeSetTimeout },
       delayedFunctionSchedulerFactory = jasmine.createSpy(
@@ -171,7 +171,7 @@ describe('Clock', function() {
   });
 
   it('does not install if the current clearTimeout is not the original function on the global', function() {
-    var originalFakeClearTimeout = function() {},
+    const originalFakeClearTimeout = function() {},
       replacedClearTimeout = function() {},
       fakeGlobal = { clearTimeout: originalFakeClearTimeout },
       delayedFunctionSchedulerFactory = jasmine.createSpy(
@@ -195,7 +195,7 @@ describe('Clock', function() {
   });
 
   it('does not install if the current setInterval is not the original function on the global', function() {
-    var originalFakeSetInterval = function() {},
+    const originalFakeSetInterval = function() {},
       replacedSetInterval = function() {},
       fakeGlobal = { setInterval: originalFakeSetInterval },
       delayedFunctionSchedulerFactory = jasmine.createSpy(
@@ -219,7 +219,7 @@ describe('Clock', function() {
   });
 
   it('does not install if the current clearInterval is not the original function on the global', function() {
-    var originalFakeClearInterval = function() {},
+    const originalFakeClearInterval = function() {},
       replacedClearInterval = function() {},
       fakeGlobal = { clearInterval: originalFakeClearInterval },
       delayedFunctionSchedulerFactory = jasmine.createSpy(
@@ -243,7 +243,7 @@ describe('Clock', function() {
   });
 
   it('replaces the global timer functions on uninstall', function() {
-    var fakeSetTimeout = jasmine.createSpy('global setTimeout'),
+    const fakeSetTimeout = jasmine.createSpy('global setTimeout'),
       fakeClearTimeout = jasmine.createSpy('global clearTimeout'),
       fakeSetInterval = jasmine.createSpy('global setInterval'),
       fakeClearInterval = jasmine.createSpy('global clearInterval'),
@@ -286,7 +286,7 @@ describe('Clock', function() {
   });
 
   it('can be installed for the duration of a passed in function and uninstalled when done', function() {
-    var fakeSetTimeout = jasmine.createSpy('global setTimeout'),
+    const fakeSetTimeout = jasmine.createSpy('global setTimeout'),
       fakeClearTimeout = jasmine.createSpy('global clearTimeout'),
       fakeSetInterval = jasmine.createSpy('global setInterval'),
       fakeClearInterval = jasmine.createSpy('global clearInterval'),
@@ -312,8 +312,8 @@ describe('Clock', function() {
           return delayedFunctionScheduler;
         },
         mockDate
-      ),
+      );
-      passedFunctionCalled = false;
+    let passedFunctionCalled = false;
 
     clock.withMock(function() {
       fakeGlobal.setTimeout(delayedFn, 0);
@@ -346,7 +346,7 @@ describe('Clock', function() {
   });
 
   it('can be installed for the duration of a passed in function and uninstalled if an error is thrown', function() {
-    var fakeSetTimeout = jasmine.createSpy('global setTimeout'),
+    const fakeSetTimeout = jasmine.createSpy('global setTimeout'),
       fakeClearTimeout = jasmine.createSpy('global clearTimeout'),
       fakeSetInterval = jasmine.createSpy('global setInterval'),
       fakeClearInterval = jasmine.createSpy('global clearInterval'),
@@ -372,8 +372,8 @@ describe('Clock', function() {
           return delayedFunctionScheduler;
         },
         mockDate
-      ),
+      );
-      passedFunctionCalled = false;
+    let passedFunctionCalled = false;
 
     expect(function() {
       clock.withMock(function() {
@@ -409,7 +409,7 @@ describe('Clock', function() {
   });
 
   it('schedules the delayed function (via setTimeout) with the fake timer', function() {
-    var fakeSetTimeout = jasmine.createSpy('setTimeout'),
+    const fakeSetTimeout = jasmine.createSpy('setTimeout'),
       scheduleFunction = jasmine.createSpy('scheduleFunction'),
       delayedFunctionScheduler = { scheduleFunction: scheduleFunction },
       fakeGlobal = { setTimeout: fakeSetTimeout },
@@ -451,7 +451,7 @@ describe('Clock', function() {
   });
 
   it('returns an id for the delayed function', function() {
-    var fakeSetTimeout = jasmine.createSpy('setTimeout'),
+    const fakeSetTimeout = jasmine.createSpy('setTimeout'),
       scheduleId = 123,
       scheduleFunction = jasmine
         .createSpy('scheduleFunction')
@@ -470,11 +470,10 @@ describe('Clock', function() {
           return delayedFunctionScheduler;
         },
         mockDate
-      ),
+      );
-      timeout;
 
     clock.install();
-    timeout = clock.setTimeout(delayedFn, 0);
+    const timeout = clock.setTimeout(delayedFn, 0);
 
     if (!NODE_JS) {
       expect(timeout).toEqual(123);
@@ -484,7 +483,7 @@ describe('Clock', function() {
   });
 
   it('clears the scheduled function with the scheduler', function() {
-    var fakeClearTimeout = jasmine.createSpy('clearTimeout'),
+    const fakeClearTimeout = jasmine.createSpy('clearTimeout'),
       delayedFunctionScheduler = jasmine.createSpyObj(
         'delayedFunctionScheduler',
         ['removeFunctionWithId']
@@ -513,7 +512,7 @@ describe('Clock', function() {
   });
 
   it('schedules the delayed function with the fake timer', function() {
-    var fakeSetInterval = jasmine.createSpy('setInterval'),
+    const fakeSetInterval = jasmine.createSpy('setInterval'),
       scheduleFunction = jasmine.createSpy('scheduleFunction'),
       delayedFunctionScheduler = { scheduleFunction: scheduleFunction },
       fakeGlobal = { setInterval: fakeSetInterval },
@@ -556,7 +555,7 @@ describe('Clock', function() {
   });
 
   it('returns an id for the delayed function', function() {
-    var fakeSetInterval = jasmine.createSpy('setInterval'),
+    const fakeSetInterval = jasmine.createSpy('setInterval'),
       scheduleId = 123,
       scheduleFunction = jasmine
         .createSpy('scheduleFunction')
@@ -575,11 +574,10 @@ describe('Clock', function() {
           return delayedFunctionScheduler;
         },
         mockDate
-      ),
+      );
-      interval;
 
     clock.install();
-    interval = clock.setInterval(delayedFn, 0);
+    const interval = clock.setInterval(delayedFn, 0);
 
     if (!NODE_JS) {
       expect(interval).toEqual(123);
@@ -589,7 +587,7 @@ describe('Clock', function() {
   });
 
   it('clears the scheduled function with the scheduler', function() {
-    var clearInterval = jasmine.createSpy('clearInterval'),
+    const clearInterval = jasmine.createSpy('clearInterval'),
       delayedFunctionScheduler = jasmine.createSpyObj(
         'delayedFunctionScheduler',
         ['removeFunctionWithId']
@@ -618,7 +616,7 @@ describe('Clock', function() {
   });
 
   it('gives you a friendly reminder if the Clock is not installed and you tick', function() {
-    var clock = new jasmineUnderTest.Clock(
+    const clock = new jasmineUnderTest.Clock(
       {},
       jasmine.createSpyObj('delayedFunctionScheduler', ['tick'])
     );
@@ -630,7 +628,7 @@ describe('Clock', function() {
 
 describe('Clock (acceptance)', function() {
   it('can run setTimeouts/setIntervals synchronously', function() {
-    var delayedFn1 = jasmine.createSpy('delayedFn1'),
+    const delayedFn1 = jasmine.createSpy('delayedFn1'),
       delayedFn2 = jasmine.createSpy('delayedFn2'),
       delayedFn3 = jasmine.createSpy('delayedFn3'),
       recurring1 = jasmine.createSpy('recurring1'),
@@ -651,7 +649,7 @@ describe('Clock (acceptance)', function() {
     clock.install();
 
     clock.setTimeout(delayedFn1, 0);
-    var intervalId = clock.setInterval(recurring1, 50);
+    const intervalId = clock.setInterval(recurring1, 50);
     clock.setTimeout(delayedFn2, 100);
     clock.setTimeout(delayedFn3, 200);
 
@@ -690,7 +688,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('can clear a previously set timeout', function() {
-    var clearedFn = jasmine.createSpy('clearedFn'),
+    const clearedFn = jasmine.createSpy('clearedFn'),
       delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = {
         install: function() {},
@@ -703,12 +701,11 @@ describe('Clock (acceptance)', function() {
           return delayedFunctionScheduler;
         },
         mockDate
-      ),
+      );
-      timeoutId;
 
     clock.install();
 
-    timeoutId = clock.setTimeout(clearedFn, 100);
+    const timeoutId = clock.setTimeout(clearedFn, 100);
     expect(clearedFn).not.toHaveBeenCalled();
 
     clock.clearTimeout(timeoutId);
@@ -718,7 +715,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it("can clear a previously set interval using that interval's handler", function() {
-    var spy = jasmine.createSpy('spy'),
+    const spy = jasmine.createSpy('spy'),
       delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = {
         install: function() {},
@@ -731,12 +728,11 @@ describe('Clock (acceptance)', function() {
           return delayedFunctionScheduler;
         },
         mockDate
-      ),
+      );
-      intervalId;
 
     clock.install();
 
-    intervalId = clock.setInterval(function() {
+    const intervalId = clock.setInterval(function() {
       spy();
       clock.clearInterval(intervalId);
     }, 100);
@@ -746,7 +742,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('correctly schedules functions after the Clock has advanced', function() {
-    var delayedFn1 = jasmine.createSpy('delayedFn1'),
+    const delayedFn1 = jasmine.createSpy('delayedFn1'),
       delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = {
         install: function() {},
@@ -772,7 +768,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('correctly schedules functions while the Clock is advancing', function() {
-    var delayedFn1 = jasmine.createSpy('delayedFn1'),
+    const delayedFn1 = jasmine.createSpy('delayedFn1'),
       delayedFn2 = jasmine.createSpy('delayedFn2'),
       delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = {
@@ -803,7 +799,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('correctly calls functions scheduled while the Clock is advancing', function() {
-    var delayedFn1 = jasmine.createSpy('delayedFn1'),
+    const delayedFn1 = jasmine.createSpy('delayedFn1'),
       delayedFn2 = jasmine.createSpy('delayedFn2'),
       delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = {
@@ -831,7 +827,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('correctly schedules functions scheduled while the Clock is advancing but after the Clock is uninstalled', function() {
-    var delayedFn1 = jasmine.createSpy('delayedFn1'),
+    const delayedFn1 = jasmine.createSpy('delayedFn1'),
       delayedFn2 = jasmine.createSpy('delayedFn2'),
       delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       mockDate = {
@@ -865,7 +861,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('does not mock the Date object by default', function() {
-    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(global),
       clock = new jasmineUnderTest.Clock(
@@ -880,7 +876,7 @@ describe('Clock (acceptance)', function() {
 
     expect(global.Date).toEqual(Date);
 
-    var now = new global.Date().getTime();
+    const now = new global.Date().getTime();
 
     clock.tick(50);
 
@@ -888,7 +884,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('mocks the Date object and sets it to current time', function() {
-    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(global),
       clock = new jasmineUnderTest.Clock(
@@ -901,13 +897,13 @@ describe('Clock (acceptance)', function() {
 
     clock.install().mockDate();
 
-    var now = new global.Date().getTime();
+    const now = new global.Date().getTime();
 
     clock.tick(50);
 
     expect(new global.Date().getTime() - now).toEqual(50);
 
-    var timeoutDate = 0;
+    let timeoutDate = 0;
     clock.setTimeout(function() {
       timeoutDate = new global.Date().getTime();
     }, 100);
@@ -918,7 +914,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('mocks the Date object and sets it to a given time', function() {
-    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(global),
       clock = new jasmineUnderTest.Clock(
@@ -932,7 +928,7 @@ describe('Clock (acceptance)', function() {
 
     clock.install().mockDate(baseTime);
 
-    var now = new global.Date().getTime();
+    const now = new global.Date().getTime();
 
     expect(now).toEqual(baseTime.getTime());
 
@@ -940,7 +936,7 @@ describe('Clock (acceptance)', function() {
 
     expect(new global.Date().getTime()).toEqual(baseTime.getTime() + 50);
 
-    var timeoutDate = 0;
+    let timeoutDate = 0;
     clock.setTimeout(function() {
       timeoutDate = new global.Date().getTime();
     }, 100);
@@ -951,7 +947,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('throws mockDate is called with a non-Date', function() {
-    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(global),
       clock = new jasmineUnderTest.Clock(
@@ -960,8 +956,7 @@ describe('Clock (acceptance)', function() {
           return delayedFunctionScheduler;
         },
         mockDate
-      ),
+      );
-      env = jasmineUnderTest.getEnv();
 
     expect(() => clock.mockDate(12345)).toThrowError(
       'The argument to jasmine.clock().mockDate(), if specified, should be ' +
@@ -970,7 +965,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('mocks the Date object and updates the date per delayed function', function() {
-    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(global),
       clock = new jasmineUnderTest.Clock(
@@ -984,8 +979,8 @@ describe('Clock (acceptance)', function() {
 
     clock.install().mockDate(baseTime);
 
-    var actualTimes = [];
+    const actualTimes = [];
-    var pushCurrentTime = function() {
+    const pushCurrentTime = function() {
       actualTimes.push(global.Date().getTime());
     };
     delayedFunctionScheduler.scheduleFunction(pushCurrentTime);
@@ -1009,7 +1004,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('correctly clears a scheduled timeout while the Clock is advancing', function() {
-    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = { Date: Date, setTimeout: undefined },
       mockDate = new jasmineUnderTest.MockDate(global),
       clock = new jasmineUnderTest.Clock(
@@ -1022,7 +1017,7 @@ describe('Clock (acceptance)', function() {
 
     clock.install();
 
-    var timerId2;
+    let timerId2;
 
     global.setTimeout(function() {
       global.clearTimeout(timerId2);
@@ -1034,7 +1029,7 @@ describe('Clock (acceptance)', function() {
   });
 
   it('correctly clears a scheduled interval while the Clock is advancing', function() {
-    var delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const delayedFunctionScheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       global = { Date: Date, setTimeout: undefined },
       mockDate = new jasmineUnderTest.MockDate(global),
       clock = new jasmineUnderTest.Clock(
@@ -1047,7 +1042,7 @@ describe('Clock (acceptance)', function() {
 
     clock.install();
 
-    var timerId2;
+    let timerId2;
     global.setInterval(function() {
       global.clearInterval(timerId2);
     }, 100);

spec/core/DelayedFunctionSchedulerSpec.js

@@ -1,6 +1,6 @@
 describe('DelayedFunctionScheduler', function() {
   it('schedules a function for later execution', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn, 0);
@@ -13,7 +13,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('schedules a string for later execution', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       strfn = 'horrible = true;';
 
     scheduler.scheduleFunction(strfn, 0);
@@ -24,7 +24,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('#tick defaults to 0', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn, 0);
@@ -37,7 +37,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('defaults delay to 0', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn);
@@ -50,7 +50,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('optionally passes params to scheduled functions', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn, 0, ['foo', 'bar']);
@@ -63,7 +63,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('scheduled fns can optionally reoccur', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn');
 
     scheduler.scheduleFunction(fn, 20, [], true);
@@ -84,7 +84,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('increments scheduled fns ids unless one is passed', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler();
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler();
 
     expect(scheduler.scheduleFunction(function() {}, 0)).toBe(1);
     expect(scheduler.scheduleFunction(function() {}, 0)).toBe(2);
@@ -95,11 +95,9 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('#removeFunctionWithId removes a previously scheduled function with a given id', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
-      timeoutKey;
+      timeoutKey = scheduler.scheduleFunction(fn, 0);
-
-    timeoutKey = scheduler.scheduleFunction(fn, 0);
 
     expect(fn).not.toHaveBeenCalled();
 
@@ -111,15 +109,15 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('executes recurring functions interleaved with regular functions in the correct order', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler();
-      fn = jasmine.createSpy('fn'),
+    const fn = jasmine.createSpy('fn');
-      recurringCallCount = 0,
+    let recurringCallCount = 0;
-      recurring = jasmine.createSpy('recurring').and.callFake(function() {
+    const recurring = jasmine.createSpy('recurring').and.callFake(function() {
-        recurringCallCount++;
+      recurringCallCount++;
-        if (recurringCallCount < 5) {
+      if (recurringCallCount < 5) {
-          expect(fn).not.toHaveBeenCalled();
+        expect(fn).not.toHaveBeenCalled();
-        }
+      }
-      });
+    });
 
     scheduler.scheduleFunction(recurring, 10, [], true);
     scheduler.scheduleFunction(fn, 50);
@@ -132,7 +130,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('schedules a function for later execution during a tick', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
       fnDelay = 10;
 
@@ -148,10 +146,10 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('#removeFunctionWithId removes a previously scheduled function with a given id during a tick', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
-      fnDelay = 10,
+      fnDelay = 10;
-      timeoutKey;
+    let timeoutKey;
 
     scheduler.scheduleFunction(function() {
       scheduler.removeFunctionWithId(timeoutKey);
@@ -166,24 +164,24 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('executes recurring functions interleaved with regular functions and functions scheduled during a tick in the correct order', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler();
-      fn = jasmine.createSpy('fn'),
+    const fn = jasmine.createSpy('fn');
-      recurringCallCount = 0,
+    let recurringCallCount = 0;
-      recurring = jasmine.createSpy('recurring').and.callFake(function() {
+    const recurring = jasmine.createSpy('recurring').and.callFake(function() {
-        recurringCallCount++;
+      recurringCallCount++;
-        if (recurringCallCount < 5) {
+      if (recurringCallCount < 5) {
-          expect(fn).not.toHaveBeenCalled();
-        }
-      }),
-      innerFn = jasmine.createSpy('innerFn').and.callFake(function() {
-        expect(recurring.calls.count()).toBe(4);
         expect(fn).not.toHaveBeenCalled();
-      }),
+      }
-      scheduling = jasmine.createSpy('scheduling').and.callFake(function() {
+    });
-        expect(recurring.calls.count()).toBe(3);
+    const innerFn = jasmine.createSpy('innerFn').and.callFake(function() {
-        expect(fn).not.toHaveBeenCalled();
+      expect(recurring.calls.count()).toBe(4);
-        scheduler.scheduleFunction(innerFn, 10); // 41ms absolute
+      expect(fn).not.toHaveBeenCalled();
-      });
+    });
+    const scheduling = jasmine.createSpy('scheduling').and.callFake(function() {
+      expect(recurring.calls.count()).toBe(3);
+      expect(fn).not.toHaveBeenCalled();
+      scheduler.scheduleFunction(innerFn, 10); // 41ms absolute
+    });
 
     scheduler.scheduleFunction(recurring, 10, [], true);
     scheduler.scheduleFunction(fn, 50);
@@ -199,7 +197,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('executes recurring functions after rescheduling them', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       recurring = function() {
         expect(scheduler.scheduleFunction).toHaveBeenCalled();
       };
@@ -212,11 +210,11 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('removes functions during a tick that runs the function', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       spy = jasmine.createSpy('fn'),
       spyAndRemove = jasmine.createSpy('fn'),
-      fnDelay = 10,
+      fnDelay = 10;
-      timeoutKey;
+    let timeoutKey;
 
     spyAndRemove.and.callFake(function() {
       scheduler.removeFunctionWithId(timeoutKey);
@@ -233,10 +231,10 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('removes functions during the first tick that runs the function', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
-      fnDelay = 10,
+      fnDelay = 10;
-      timeoutKey;
+    let timeoutKey;
 
     timeoutKey = scheduler.scheduleFunction(fn, fnDelay, [], true);
     scheduler.scheduleFunction(function() {
@@ -252,7 +250,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it("does not remove a function that hasn't been added yet", function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       fn = jasmine.createSpy('fn'),
       fnDelay = 10;
 
@@ -267,7 +265,7 @@ describe('DelayedFunctionScheduler', function() {
   });
 
   it('updates the mockDate per scheduled time', function() {
-    var scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
+    const scheduler = new jasmineUnderTest.DelayedFunctionScheduler(),
       tickDate = jasmine.createSpy('tickDate');
 
     scheduler.scheduleFunction(function() {});

spec/core/DeprecatorSpec.js

@@ -6,8 +6,8 @@ describe('Deprecator', function() {
     });
 
     it('logs the mesage without context when the runnable is the top suite', function() {
-      var runnable = { addDeprecationWarning: function() {} };
+      const runnable = { addDeprecationWarning: function() {} };
-      var deprecator = new jasmineUnderTest.Deprecator(runnable);
+      const deprecator = new jasmineUnderTest.Deprecator(runnable);
       deprecator.verboseDeprecations(true);
 
       deprecator.addDeprecationWarning(runnable, 'the message', {
@@ -18,14 +18,14 @@ describe('Deprecator', function() {
     });
 
     it('logs the message in a descendant suite', function() {
-      var runnable = {
+      const runnable = {
         addDeprecationWarning: function() {},
         getFullName: function() {
           return 'the suite';
         },
         children: []
       };
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
       deprecator.verboseDeprecations(true);
 
       deprecator.addDeprecationWarning(runnable, 'the message', {
@@ -38,13 +38,13 @@ describe('Deprecator', function() {
     });
 
     it('logs and reports the message in a spec', function() {
-      var runnable = {
+      const runnable = {
         addDeprecationWarning: function() {},
         getFullName: function() {
           return 'the spec';
         }
       };
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
       deprecator.verboseDeprecations(true);
 
       deprecator.addDeprecationWarning(runnable, 'the message', {
@@ -57,12 +57,12 @@ describe('Deprecator', function() {
     });
 
     it('logs and reports the message without runnable info when ignoreRunnable is true', function() {
-      var topSuite = jasmine.createSpyObj('topSuite', [
+      const topSuite = jasmine.createSpyObj('topSuite', [
         'addDeprecationWarning',
         'getFullName'
       ]);
-      var deprecator = new jasmineUnderTest.Deprecator(topSuite);
+      const deprecator = new jasmineUnderTest.Deprecator(topSuite);
-      var runnable = jasmine.createSpyObj('spec', [
+      const runnable = jasmine.createSpyObj('spec', [
         'addDeprecationWarning',
         'getFullName'
       ]);
@@ -105,12 +105,12 @@ describe('Deprecator', function() {
     });
 
     it('emits the deprecation only once when verboseDeprecations is not set', function() {
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
-      var runnable1 = jasmine.createSpyObj('runnable1', [
+      const runnable1 = jasmine.createSpyObj('runnable1', [
         'addDeprecationWarning',
         'getFullName'
       ]);
-      var runnable2 = jasmine.createSpyObj('runnable2', [
+      const runnable2 = jasmine.createSpyObj('runnable2', [
         'addDeprecationWarning',
         'getFullName'
       ]);
@@ -124,12 +124,12 @@ describe('Deprecator', function() {
     });
 
     it('emits the deprecation only once when verboseDeprecations is false', function() {
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
-      var runnable1 = jasmine.createSpyObj('runnable1', [
+      const runnable1 = jasmine.createSpyObj('runnable1', [
         'addDeprecationWarning',
         'getFullName'
       ]);
-      var runnable2 = jasmine.createSpyObj('runnable2', [
+      const runnable2 = jasmine.createSpyObj('runnable2', [
         'addDeprecationWarning',
         'getFullName'
       ]);
@@ -144,12 +144,12 @@ describe('Deprecator', function() {
     });
 
     it('emits the deprecation for each call when verboseDeprecations is true', function() {
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
-      var runnable1 = jasmine.createSpyObj('runnable1', [
+      const runnable1 = jasmine.createSpyObj('runnable1', [
         'addDeprecationWarning',
         'getFullName'
       ]);
-      var runnable2 = jasmine.createSpyObj('runnable2', [
+      const runnable2 = jasmine.createSpyObj('runnable2', [
         'addDeprecationWarning',
         'getFullName'
       ]);
@@ -164,8 +164,8 @@ describe('Deprecator', function() {
     });
 
     it('includes a note about verboseDeprecations', function() {
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
-      var runnable = jasmine.createSpyObj('runnable', [
+      const runnable = jasmine.createSpyObj('runnable', [
         'addDeprecationWarning',
         'getFullName'
       ]);
@@ -183,8 +183,8 @@ describe('Deprecator', function() {
     });
 
     it('omits the note about verboseDeprecations when verboseDeprecations is true', function() {
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
-      var runnable = jasmine.createSpyObj('runnable', [
+      const runnable = jasmine.createSpyObj('runnable', [
         'addDeprecationWarning',
         'getFullName'
       ]);
@@ -207,13 +207,12 @@ describe('Deprecator', function() {
       // to report their own deprecations through Jasmine. See
       // <https://github.com/jasmine/jasmine/pull/1498>.
       it('passes the error through unchanged', function() {
-        var deprecator = new jasmineUnderTest.Deprecator({});
+        const deprecator = new jasmineUnderTest.Deprecator({});
-        var runnable = jasmine.createSpyObj('runnable', [
+        const runnable = jasmine.createSpyObj('runnable', [
           'addDeprecationWarning',
           'getFullName'
         ]);
-        var exceptionFormatter = new jasmineUnderTest.ExceptionFormatter();
+        let deprecation, originalStack;
-        var deprecation, originalStack;
 
         try {
           throw new Error('the deprecation');
@@ -239,12 +238,12 @@ describe('Deprecator', function() {
       });
 
       it('reports the deprecation every time, regardless of config.verboseDeprecations', function() {
-        var deprecator = new jasmineUnderTest.Deprecator({});
+        const deprecator = new jasmineUnderTest.Deprecator({});
-        var runnable = jasmine.createSpyObj('runnable', [
+        const runnable = jasmine.createSpyObj('runnable', [
           'addDeprecationWarning',
           'getFullName'
         ]);
-        var deprecation;
+        let deprecation;
 
         try {
           throw new Error('the deprecation');
@@ -260,12 +259,12 @@ describe('Deprecator', function() {
       });
 
       it('omits the note about verboseDeprecations', function() {
-        var deprecator = new jasmineUnderTest.Deprecator({});
+        const deprecator = new jasmineUnderTest.Deprecator({});
-        var runnable = jasmine.createSpyObj('runnable', [
+        const runnable = jasmine.createSpyObj('runnable', [
           'addDeprecationWarning',
           'getFullName'
         ]);
-        var deprecation;
+        let deprecation;
 
         try {
           throw new Error('the deprecation');
@@ -294,8 +293,8 @@ describe('Deprecator', function() {
     }
 
     function testStackTrace(options) {
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
-      var runnable = jasmine.createSpyObj('runnable', [
+      const runnable = jasmine.createSpyObj('runnable', [
         'addDeprecationWarning',
         'getFullName'
       ]);
@@ -312,8 +311,8 @@ describe('Deprecator', function() {
     }
 
     function testNoStackTrace(options) {
-      var deprecator = new jasmineUnderTest.Deprecator({});
+      const deprecator = new jasmineUnderTest.Deprecator({});
-      var runnable = jasmine.createSpyObj('runnable', [
+      const runnable = jasmine.createSpyObj('runnable', [
         'addDeprecationWarning',
         'getFullName'
       ]);

spec/core/EnvSpec.js

@@ -1,6 +1,6 @@
 // TODO: Fix these unit tests!
 describe('Env', function() {
-  var env;
+  let env;
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
   });
@@ -27,7 +27,6 @@ describe('Env', function() {
 
   describe('#topSuite', function() {
     it('returns an object that describes the tree of suites and specs', function() {
-      var suite;
       spyOn(env, 'deprecated');
 
       env.it('a top level spec');
@@ -38,7 +37,7 @@ describe('Env', function() {
         });
       });
 
-      suite = env.topSuite();
+      const suite = env.topSuite();
       expect(suite).not.toBeInstanceOf(jasmineUnderTest.Suite);
       expect(suite.description).toEqual('Jasmine__TopLevel__Suite');
       expect(suite.getFullName()).toEqual('');
@@ -113,7 +112,7 @@ describe('Env', function() {
 
   it('ignores configuration properties that are present but undefined', function() {
     spyOn(env, 'deprecated');
-    var initialConfig = {
+    const initialConfig = {
       random: true,
       seed: '123',
       failSpecWithNoExpectations: true,
@@ -161,8 +160,8 @@ describe('Env', function() {
     it('returns a suite metadata object', function() {
       let innerSuite;
       let spec;
-      const suite = env.describe('outer suite', function() {
+      const suite = env[methodName]('outer suite', function() {
-        innerSuite = env.describe('inner suite', function() {
+        innerSuite = env[methodName]('inner suite', function() {
           spec = env.it('a spec');
         });
       });
@@ -193,6 +192,7 @@ describe('Env', function() {
 
     it('throws an error when given arguments', function() {
       expect(function() {
+        // eslint-disable-next-line no-unused-vars
         env.describe('done method', function(done) {});
       }).toThrowError('describe does not expect any arguments');
     });
@@ -235,9 +235,17 @@ describe('Env', function() {
     });
 
     it('throws an error when it has no children', function() {
-      expect(function() {
+      let ran = false;
-        env.describe('done method', function() {});
+      env.describe('parent suite', function() {
-      }).toThrowError('describe with no children (describe() or it())');
+        expect(function() {
+          env.describe('child suite', function() {});
+        }).toThrowError(
+          'describe with no children (describe() or it()): parent suite child suite'
+        );
+        ran = true;
+      });
+
+      expect(ran).toBeTrue();
     });
   });
 
@@ -307,7 +315,7 @@ describe('Env', function() {
     behavesLikeIt('xit');
 
     it('calls spec.exclude with "Temporarily disabled with xit"', function() {
-      var excludeSpy = jasmine.createSpy();
+      const excludeSpy = jasmine.createSpy();
       spyOn(env, 'it_').and.returnValue({
         exclude: excludeSpy
       });
@@ -316,8 +324,8 @@ describe('Env', function() {
     });
 
     it('calls spec.pend with "Temporarily disabled with xit"', function() {
-      var pendSpy = jasmine.createSpy();
+      const pendSpy = jasmine.createSpy();
-      var realExclude = jasmineUnderTest.Spec.prototype.exclude;
+      const realExclude = jasmineUnderTest.Spec.prototype.exclude;
 
       spyOn(env, 'it_').and.returnValue({
         exclude: realExclude,
@@ -456,7 +464,7 @@ describe('Env', function() {
 
   describe('when not constructed with suppressLoadErrors: true', function() {
     it('installs a global error handler on construction', function() {
-      var globalErrors = jasmine.createSpyObj('globalErrors', [
+      const globalErrors = jasmine.createSpyObj('globalErrors', [
         'install',
         'uninstall',
         'pushListener',
@@ -471,7 +479,7 @@ describe('Env', function() {
 
   describe('when constructed with suppressLoadErrors: true', function() {
     it('does not install a global error handler until execute is called', function() {
-      var globalErrors = jasmine.createSpyObj('globalErrors', [
+      const globalErrors = jasmine.createSpyObj('globalErrors', [
         'install',
         'uninstall',
         'pushListener',
@@ -490,9 +498,9 @@ describe('Env', function() {
     function customEqualityTester() {}
     function customObjectFormatter() {}
     function prettyPrinter() {}
-    var RealSpec = jasmineUnderTest.Spec,
+    const RealSpec = jasmineUnderTest.Spec;
-      specInstance,
+    let specInstance;
-      expectationFactory;
+    let expectationFactory;
     spyOn(jasmineUnderTest, 'MatchersUtil');
     spyOn(jasmineUnderTest, 'makePrettyPrinter').and.returnValue(prettyPrinter);
     spyOn(jasmineUnderTest, 'Spec').and.callFake(function(options) {
@@ -523,9 +531,9 @@ describe('Env', function() {
     function customEqualityTester() {}
     function customObjectFormatter() {}
     function prettyPrinter() {}
-    var RealSpec = jasmineUnderTest.Spec,
+    const RealSpec = jasmineUnderTest.Spec;
-      specInstance,
+    let specInstance;
-      asyncExpectationFactory;
+    let asyncExpectationFactory;
     spyOn(jasmineUnderTest, 'MatchersUtil');
     spyOn(jasmineUnderTest, 'makePrettyPrinter').and.returnValue(prettyPrinter);
     spyOn(jasmineUnderTest, 'Spec').and.callFake(function(options) {
@@ -553,7 +561,7 @@ describe('Env', function() {
   });
 
   it("does not expose the suite as 'this'", function() {
-    var suiteThis;
+    let suiteThis;
     spyOn(env, 'deprecated');
 
     env.describe('a suite', function() {
@@ -577,11 +585,10 @@ describe('Env', function() {
           return env.execute(); // 2
         })
         .then(function() {
-          var id;
           expect(
             jasmineUnderTest.Suite.prototype.reset
           ).toHaveBeenCalledOnceWith();
-          id = jasmineUnderTest.Suite.prototype.reset.calls.thisFor(0).id;
+          const id = jasmineUnderTest.Suite.prototype.reset.calls.thisFor(0).id;
           expect(id).toBeTruthy();
           expect(id).toEqual(env.topSuite().id);
         });

spec/core/ExceptionFormatterSpec.js

@@ -1,7 +1,7 @@
 describe('ExceptionFormatter', function() {
   describe('#message', function() {
     it('formats Firefox exception messages', function() {
-      var sampleFirefoxException = {
+      const sampleFirefoxException = {
           fileName: 'foo.js',
           lineNumber: '1978',
           message: 'you got your foo in my bar',
@@ -16,7 +16,7 @@ describe('ExceptionFormatter', function() {
     });
 
     it('formats Webkit exception messages', function() {
-      var sampleWebkitException = {
+      const sampleWebkitException = {
           sourceURL: 'foo.js',
           line: '1978',
           message: 'you got your foo in my bar',
@@ -31,7 +31,7 @@ describe('ExceptionFormatter', function() {
     });
 
     it('formats V8 exception messages', function() {
-      var sampleV8 = {
+      const sampleV8 = {
           message: 'you got your foo in my bar',
           name: 'A Classic Mistake'
         },
@@ -42,29 +42,29 @@ describe('ExceptionFormatter', function() {
     });
 
     it('formats unnamed exceptions with message', function() {
-      var unnamedError = { message: 'This is an unnamed error message.' };
+      const unnamedError = { message: 'This is an unnamed error message.' };
 
-      var exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
+      const exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
         message = exceptionFormatter.message(unnamedError);
 
       expect(message).toEqual('This is an unnamed error message.');
     });
 
     it('formats empty exceptions with toString format', function() {
-      var EmptyError = function() {};
+      const EmptyError = function() {};
       EmptyError.prototype.toString = function() {
         return '[EmptyError]';
       };
-      var emptyError = new EmptyError();
+      const emptyError = new EmptyError();
 
-      var exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
+      const exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
         message = exceptionFormatter.message(emptyError);
 
       expect(message).toEqual('[EmptyError] thrown');
     });
 
     it("formats thrown exceptions that aren't errors", function() {
-      var thrown = 'crazy error',
+      const thrown = 'crazy error',
         exceptionFormatter = new jasmineUnderTest.ExceptionFormatter(),
         message = exceptionFormatter.message(thrown);
 
@@ -74,12 +74,7 @@ describe('ExceptionFormatter', function() {
 
   describe('#stack', function() {
     it('formats stack traces', function() {
-      var error;
+      const error = new Error('an error');
-      try {
-        throw new Error('an error');
-      } catch (e) {
-        error = e;
-      }
 
       expect(new jasmineUnderTest.ExceptionFormatter().stack(error)).toMatch(
         /ExceptionFormatterSpec\.js.*\d+/
@@ -87,7 +82,7 @@ describe('ExceptionFormatter', function() {
     });
 
     it('filters Jasmine stack frames from V8-style traces but leaves unmatched lines intact', function() {
-      var error = {
+      const error = {
         message: 'nope',
         stack:
           'C:\\__spec__\\core\\UtilSpec.ts:120\n' +
@@ -101,10 +96,10 @@ describe('ExceptionFormatter', function() {
           '    at fn3 (C:\\__jasmine__\\lib\\jasmine-core\\jasmine.js:7575:25)\n' +
           '    at fn4 (node:internal/timers:462:21)\n'
       };
-      var subject = new jasmineUnderTest.ExceptionFormatter({
+      const subject = new jasmineUnderTest.ExceptionFormatter({
         jasmineFile: 'C:\\__jasmine__\\lib\\jasmine-core\\jasmine.js'
       });
-      var result = subject.stack(error);
+      const result = subject.stack(error);
       expect(result).toEqual(
         'C:\\__spec__\\core\\UtilSpec.ts:120\n' +
           "                new Error('nope');\n" +
@@ -118,7 +113,7 @@ describe('ExceptionFormatter', function() {
     });
 
     it('filters Jasmine stack frames from V8 style traces', function() {
-      var error = {
+      const error = {
         message: 'nope',
         stack:
           'Error: nope\n' +
@@ -127,10 +122,10 @@ describe('ExceptionFormatter', function() {
           '    at fn3 (http://localhost:8888/__jasmine__/jasmine.js:4320:20)\n' +
           '    at fn4 (http://localhost:8888/__spec__/core/UtilSpec.js:110:19)\n'
       };
-      var subject = new jasmineUnderTest.ExceptionFormatter({
+      const subject = new jasmineUnderTest.ExceptionFormatter({
         jasmineFile: 'http://localhost:8888/__jasmine__/jasmine.js'
       });
-      var result = subject.stack(error);
+      const result = subject.stack(error);
       expect(result).toEqual(
         'Error: nope\n' +
           '    at fn1 (http://localhost:8888/__spec__/core/UtilSpec.js:115:19)\n' +
@@ -140,17 +135,17 @@ describe('ExceptionFormatter', function() {
     });
 
     it('filters Jasmine stack frames from Webkit style traces', function() {
-      var error = {
+      const error = {
         stack:
           'http://localhost:8888/__spec__/core/UtilSpec.js:115:28\n' +
           'fn1@http://localhost:8888/__jasmine__/jasmine.js:4320:27\n' +
           'fn2@http://localhost:8888/__jasmine__/jasmine.js:4320:27\n' +
           'http://localhost:8888/__spec__/core/UtilSpec.js:115:28'
       };
-      var subject = new jasmineUnderTest.ExceptionFormatter({
+      const subject = new jasmineUnderTest.ExceptionFormatter({
         jasmineFile: 'http://localhost:8888/__jasmine__/jasmine.js'
       });
-      var result = subject.stack(error);
+      const result = subject.stack(error);
       expect(result).toEqual(
         'http://localhost:8888/__spec__/core/UtilSpec.js:115:28\n' +
           '<Jasmine>\n' +
@@ -159,17 +154,12 @@ describe('ExceptionFormatter', function() {
     });
 
     it('filters Jasmine stack frames in this environment', function() {
-      var error, i;
+      const error = new Error('an error');
-      try {
+      const subject = new jasmineUnderTest.ExceptionFormatter({
-        throw new Error('an error');
-      } catch (e) {
-        error = e;
-      }
-      var subject = new jasmineUnderTest.ExceptionFormatter({
         jasmineFile: jasmine.util.jasmineFile()
       });
-      var result = subject.stack(error);
+      const result = subject.stack(error);
-      var lines = result.split('\n');
+      const lines = result.split('\n');
 
       if (lines[0].match(/an error/)) {
         lines.shift();
@@ -179,28 +169,23 @@ describe('ExceptionFormatter', function() {
       expect(lines[1]).toMatch(/<Jasmine>/);
 
       // Node has some number of additional frames below Jasmine.
-      for (i = 2; i < lines.length; i++) {
+      for (let i = 2; i < lines.length; i++) {
         expect(lines[i]).not.toMatch(/jasmine.js/);
       }
     });
 
     it('handles multiline error messages in this environment', function() {
-      var error,
+      const msg = 'an error\nwith two lines';
-        msg = 'an error\nwith two lines';
+      const error = new Error(msg);
-      try {
-        throw new Error(msg);
-      } catch (e) {
-        error = e;
-      }
 
       if (error.stack.indexOf(msg) === -1) {
         pending("Stack traces don't have messages in this environment");
       }
-      var subject = new jasmineUnderTest.ExceptionFormatter({
+      const subject = new jasmineUnderTest.ExceptionFormatter({
         jasmineFile: jasmine.util.jasmineFile()
       });
-      var result = subject.stack(error);
+      const result = subject.stack(error);
-      var lines = result.split('\n');
+      const lines = result.split('\n');
 
       expect(lines[0]).toMatch(/an error/);
       expect(lines[1]).toMatch(/with two lines/);
@@ -213,15 +198,10 @@ describe('ExceptionFormatter', function() {
     });
 
     it('includes error properties in stack', function() {
-      var error;
+      const error = new Error('an error');
-      try {
-        throw new Error('an error');
-      } catch (e) {
-        error = e;
-      }
       error.someProperty = 'hello there';
 
-      var result = new jasmineUnderTest.ExceptionFormatter().stack(error);
+      const result = new jasmineUnderTest.ExceptionFormatter().stack(error);
 
       expect(result).toMatch(/error properties:.*someProperty.*hello there/);
     });
@@ -268,12 +248,7 @@ describe('ExceptionFormatter', function() {
       });
 
       it('ensures that stack traces do not include the message in this environment', function() {
-        let error;
+        const error = new Error('an error');
-        try {
-          throw new Error('an error');
-        } catch (e) {
-          error = e;
-        }
         const subject = new jasmineUnderTest.ExceptionFormatter({
           jasmineFile: jasmine.util.jasmineFile()
         });

spec/core/ExceptionsSpec.js

@@ -1,5 +1,5 @@
 describe('Exceptions:', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -10,7 +10,7 @@ describe('Exceptions:', function() {
   });
 
   it('should handle exceptions thrown, but continue', function(done) {
-    var secondTest = jasmine.createSpy('second test');
+    const secondTest = jasmine.createSpy('second test');
     env.describe('Suite for handles exceptions', function() {
       env.it(
         'should be a test that fails because it throws an exception',
@@ -24,7 +24,7 @@ describe('Exceptions:', function() {
       );
     });
 
-    var expectations = function() {
+    const expectations = function() {
       expect(secondTest).toHaveBeenCalled();
       done();
     };
@@ -33,7 +33,7 @@ describe('Exceptions:', function() {
   });
 
   it('should handle exceptions thrown directly in top-level describe blocks and continue', function(done) {
-    var secondDescribe = jasmine
+    const secondDescribe = jasmine
       .createSpy('second describe')
       .and.callFake(function() {
         env.it('has a test', function() {});
@@ -47,7 +47,7 @@ describe('Exceptions:', function() {
     });
     env.describe("a suite that doesn't throw an exception", secondDescribe);
 
-    var expectations = function() {
+    const expectations = function() {
       expect(secondDescribe).toHaveBeenCalled();
       done();
     };

spec/core/ExpectationFilterChainSpec.js

@@ -1,7 +1,7 @@
 describe('ExpectationFilterChain', function() {
   describe('#addFilter', function() {
     it('returns a new filter chain with the added filter', function() {
-      var first = jasmine.createSpy('first'),
+      const first = jasmine.createSpy('first'),
         second = jasmine.createSpy('second'),
         orig = new jasmineUnderTest.ExpectationFilterChain({
           modifyFailureMessage: first
@@ -15,7 +15,7 @@ describe('ExpectationFilterChain', function() {
     });
 
     it('does not modify the original filter chain', function() {
-      var orig = new jasmineUnderTest.ExpectationFilterChain({}),
+      const orig = new jasmineUnderTest.ExpectationFilterChain({}),
         f = jasmine.createSpy('f');
 
       orig.addFilter({ selectComparisonFunc: f });
@@ -28,7 +28,7 @@ describe('ExpectationFilterChain', function() {
   describe('#selectComparisonFunc', function() {
     describe('When no filters have #selectComparisonFunc', function() {
       it('returns undefined', function() {
-        var chain = new jasmineUnderTest.ExpectationFilterChain();
+        const chain = new jasmineUnderTest.ExpectationFilterChain();
         chain.addFilter({});
         expect(chain.selectComparisonFunc()).toBeUndefined();
       });
@@ -36,15 +36,13 @@ describe('ExpectationFilterChain', function() {
 
     describe('When some filters have #selectComparisonFunc', function() {
       it('calls the first filter that has #selectComparisonFunc', function() {
-        var first = jasmine.createSpy('first').and.returnValue('first'),
+        const first = jasmine.createSpy('first').and.returnValue('first'),
           second = jasmine.createSpy('second').and.returnValue('second'),
           chain = new jasmineUnderTest.ExpectationFilterChain()
             .addFilter({ selectComparisonFunc: first })
             .addFilter({ selectComparisonFunc: second }),
           matcher = {},
-          result;
+          result = chain.selectComparisonFunc(matcher);
-
-        result = chain.selectComparisonFunc(matcher);
 
         expect(first).toHaveBeenCalledWith(matcher);
         expect(second).not.toHaveBeenCalled();
@@ -56,7 +54,7 @@ describe('ExpectationFilterChain', function() {
   describe('#buildFailureMessage', function() {
     describe('When no filters have #buildFailureMessage', function() {
       it('returns undefined', function() {
-        var chain = new jasmineUnderTest.ExpectationFilterChain();
+        const chain = new jasmineUnderTest.ExpectationFilterChain();
         chain.addFilter({});
         expect(chain.buildFailureMessage()).toBeUndefined();
       });
@@ -64,7 +62,7 @@ describe('ExpectationFilterChain', function() {
 
     describe('When some filters have #buildFailureMessage', function() {
       it('calls the first filter that has #buildFailureMessage', function() {
-        var first = jasmine.createSpy('first').and.returnValue('first'),
+        const first = jasmine.createSpy('first').and.returnValue('first'),
           second = jasmine.createSpy('second').and.returnValue('second'),
           chain = new jasmineUnderTest.ExpectationFilterChain()
             .addFilter({ buildFailureMessage: first })
@@ -72,10 +70,9 @@ describe('ExpectationFilterChain', function() {
           matcherResult = { pass: false },
           matcherName = 'foo',
           args = [],
-          matchersUtil = {},
+          matchersUtil = {};
-          result;
 
-        result = chain.buildFailureMessage(
+        const result = chain.buildFailureMessage(
           matcherResult,
           matcherName,
           args,
@@ -97,7 +94,7 @@ describe('ExpectationFilterChain', function() {
   describe('#modifyFailureMessage', function() {
     describe('When no filters have #modifyFailureMessage', function() {
       it('returns the original message', function() {
-        var chain = new jasmineUnderTest.ExpectationFilterChain();
+        const chain = new jasmineUnderTest.ExpectationFilterChain();
         chain.addFilter({});
         expect(chain.modifyFailureMessage('msg')).toEqual('msg');
       });
@@ -105,14 +102,12 @@ describe('ExpectationFilterChain', function() {
 
     describe('When some filters have #modifyFailureMessage', function() {
       it('calls the first filter that has #modifyFailureMessage', function() {
-        var first = jasmine.createSpy('first').and.returnValue('first'),
+        const first = jasmine.createSpy('first').and.returnValue('first'),
           second = jasmine.createSpy('second').and.returnValue('second'),
           chain = new jasmineUnderTest.ExpectationFilterChain()
             .addFilter({ modifyFailureMessage: first })
             .addFilter({ modifyFailureMessage: second }),
-          result;
+          result = chain.modifyFailureMessage('original');
-
-        result = chain.modifyFailureMessage('original');
 
         expect(first).toHaveBeenCalledWith('original');
         expect(second).not.toHaveBeenCalled();

spec/core/ExpectationResultSpec.js

@@ -1,130 +0,0 @@
-describe('buildExpectationResult', function() {
-  it('defaults to passed', function() {
-    var result = jasmineUnderTest.buildExpectationResult({
-      passed: 'some-value'
-    });
-    expect(result.passed).toBe('some-value');
-  });
-
-  it('message defaults to Passed for passing specs', function() {
-    var result = jasmineUnderTest.buildExpectationResult({
-      passed: true,
-      message: 'some-value'
-    });
-    expect(result.message).toBe('Passed.');
-  });
-
-  it('message returns the message for failing expectations', function() {
-    var result = jasmineUnderTest.buildExpectationResult({
-      passed: false,
-      message: 'some-value'
-    });
-    expect(result.message).toBe('some-value');
-  });
-
-  it('delegates message formatting to the provided formatter if there was an Error', function() {
-    var fakeError = { message: 'foo' },
-      messageFormatter = jasmine
-        .createSpy('exception message formatter')
-        .and.returnValue(fakeError.message);
-
-    var result = jasmineUnderTest.buildExpectationResult({
-      passed: false,
-      error: fakeError,
-      messageFormatter: messageFormatter
-    });
-
-    expect(messageFormatter).toHaveBeenCalledWith(fakeError);
-    expect(result.message).toEqual('foo');
-  });
-
-  it('delegates stack formatting to the provided formatter if there was an Error', function() {
-    var fakeError = { stack: 'foo' },
-      stackFormatter = jasmine
-        .createSpy('stack formatter')
-        .and.returnValue(fakeError.stack);
-
-    var result = jasmineUnderTest.buildExpectationResult({
-      passed: false,
-      error: fakeError,
-      stackFormatter: stackFormatter
-    });
-
-    expect(stackFormatter).toHaveBeenCalledWith(fakeError, {
-      omitMessage: true
-    });
-    expect(result.stack).toEqual('foo');
-  });
-
-  it('delegates stack formatting to the provided formatter if there was a provided errorForStack', function() {
-    var fakeError = { stack: 'foo' },
-      stackFormatter = jasmine
-        .createSpy('stack formatter')
-        .and.returnValue(fakeError.stack);
-
-    var result = jasmineUnderTest.buildExpectationResult({
-      passed: false,
-      errorForStack: fakeError,
-      stackFormatter: stackFormatter
-    });
-
-    expect(stackFormatter).toHaveBeenCalledWith(fakeError, {
-      omitMessage: true
-    });
-    expect(result.stack).toEqual('foo');
-  });
-
-  it('matcherName returns passed matcherName', function() {
-    var result = jasmineUnderTest.buildExpectationResult({
-      matcherName: 'some-value'
-    });
-    expect(result.matcherName).toBe('some-value');
-  });
-
-  it('expected returns passed expected', function() {
-    var result = jasmineUnderTest.buildExpectationResult({
-      expected: 'some-value'
-    });
-    expect(result.expected).toBe('some-value');
-  });
-
-  it('actual returns passed actual', function() {
-    var result = jasmineUnderTest.buildExpectationResult({
-      actual: 'some-value'
-    });
-    expect(result.actual).toBe('some-value');
-  });
-
-  it('handles nodejs assertions', function() {
-    if (typeof require === 'undefined') {
-      return;
-    }
-    var assert = require('assert');
-    var error;
-    var value = 8421;
-    var expectedValue = 'JasmineExpectationTestValue';
-    try {
-      assert.equal(value, expectedValue);
-    } catch (e) {
-      error = e;
-    }
-
-    expect(error.code).toEqual('ERR_ASSERTION');
-    expect(error.actual).toEqual(value);
-    expect(error.expected).toEqual(expectedValue);
-    expect(error.operator).toEqual('==');
-
-    var result = jasmineUnderTest.buildExpectationResult({
-      passed: false,
-      matcherName: '',
-      expected: '',
-      actual: '',
-      error: error
-    });
-
-    expect(result.code).toEqual('ERR_ASSERTION');
-    expect(result.actual).toEqual(value);
-    expect(result.expected).toEqual(expectedValue);
-    expect(result.matcherName).toEqual('assert ==');
-  });
-});

spec/core/ExpectationSpec.js

@@ -1,34 +1,31 @@
 describe('Expectation', function() {
   it('makes custom matchers available to this expectation', function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {},
         toBar: function() {}
       },
-      expectation;
+      expectation = jasmineUnderTest.Expectation.factory({
-
+        customMatchers: matchers
-    expectation = jasmineUnderTest.Expectation.factory({
+      });
-      customMatchers: matchers
-    });
 
     expect(expectation.toFoo).toBeDefined();
     expect(expectation.toBar).toBeDefined();
   });
 
   it('.addCoreMatchers makes matchers available to any expectation', function() {
-    var coreMatchers = {
+    const coreMatchers = {
-        toQuux: function() {}
+      toQuux: function() {}
-      },
+    };
-      expectation;
 
     jasmineUnderTest.Expectation.addCoreMatchers(coreMatchers);
 
-    expectation = jasmineUnderTest.Expectation.factory({});
+    const expectation = jasmineUnderTest.Expectation.factory({});
 
     expect(expectation.toQuux).toBeDefined();
   });
 
   it("wraps matchers's compare functions, passing in matcher dependencies", function() {
-    var fakeCompare = function() {
+    const fakeCompare = function() {
         return { pass: true };
       },
       matcherFactory = jasmine
@@ -40,10 +37,9 @@ describe('Expectation', function() {
       matchersUtil = {
         buildFailureMessage: jasmine.createSpy('buildFailureMessage')
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       matchersUtil: matchersUtil,
       customMatchers: matchers,
       actual: 'an actual',
@@ -56,7 +52,7 @@ describe('Expectation', function() {
   });
 
   it("wraps matchers's compare functions, passing the actual and expected", function() {
-    var fakeCompare = jasmine
+    const fakeCompare = jasmine
         .createSpy('fake-compare')
         .and.returnValue({ pass: true }),
       matchers = {
@@ -69,10 +65,9 @@ describe('Expectation', function() {
       matchersUtil = {
         buildFailureMessage: jasmine.createSpy('buildFailureMessage')
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       matchersUtil: matchersUtil,
       customMatchers: matchers,
       actual: 'an actual',
@@ -85,7 +80,7 @@ describe('Expectation', function() {
   });
 
   it('reports a passing result to the spec when the comparison passes', function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -97,10 +92,9 @@ describe('Expectation', function() {
       matchersUtil = {
         buildFailureMessage: jasmine.createSpy('buildFailureMessage')
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       customMatchers: matchers,
       matchersUtil: matchersUtil,
       actual: 'an actual',
@@ -121,7 +115,7 @@ describe('Expectation', function() {
   });
 
   it('reports a failing result to the spec when the comparison fails', function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -135,10 +129,9 @@ describe('Expectation', function() {
           return '';
         }
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       customMatchers: matchers,
       matchersUtil: matchersUtil,
       actual: 'an actual',
@@ -159,7 +152,7 @@ describe('Expectation', function() {
   });
 
   it('reports a failing result and a custom fail message to the spec when the comparison fails', function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -171,10 +164,9 @@ describe('Expectation', function() {
           };
         }
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       actual: 'an actual',
       customMatchers: matchers,
       addExpectationResult: addExpectationResult
@@ -194,7 +186,7 @@ describe('Expectation', function() {
   });
 
   it('reports a failing result with a custom fail message function to the spec when the comparison fails', function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -208,10 +200,9 @@ describe('Expectation', function() {
           };
         }
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       customMatchers: matchers,
       actual: 'an actual',
       addExpectationResult: addExpectationResult
@@ -231,7 +222,7 @@ describe('Expectation', function() {
   });
 
   it('reports a passing result to the spec when the comparison fails for a negative expectation', function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -241,10 +232,9 @@ describe('Expectation', function() {
         }
       },
       addExpectationResult = jasmine.createSpy('addExpectationResult'),
-      actual = 'an actual',
+      actual = 'an actual';
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       customMatchers: matchers,
       actual: 'an actual',
       addExpectationResult: addExpectationResult
@@ -264,7 +254,7 @@ describe('Expectation', function() {
   });
 
   it('reports a failing result to the spec when the comparison passes for a negative expectation', function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -279,10 +269,9 @@ describe('Expectation', function() {
         }
       },
       addExpectationResult = jasmine.createSpy('addExpectationResult'),
-      actual = 'an actual',
+      actual = 'an actual';
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       customMatchers: matchers,
       actual: 'an actual',
       matchersUtil: matchersUtil,
@@ -303,7 +292,7 @@ describe('Expectation', function() {
   });
 
   it('reports a failing result and a custom fail message to the spec when the comparison passes for a negative expectation', function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -316,10 +305,9 @@ describe('Expectation', function() {
         }
       },
       addExpectationResult = jasmine.createSpy('addExpectationResult'),
-      actual = 'an actual',
+      actual = 'an actual';
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       customMatchers: matchers,
       actual: 'an actual',
       addExpectationResult: addExpectationResult
@@ -339,7 +327,7 @@ describe('Expectation', function() {
   });
 
   it("reports a passing result to the spec when the 'not' comparison passes, given a negativeCompare", function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -352,10 +340,9 @@ describe('Expectation', function() {
         }
       },
       addExpectationResult = jasmine.createSpy('addExpectationResult'),
-      actual = 'an actual',
+      actual = 'an actual';
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       customMatchers: matchers,
       actual: 'an actual',
       addExpectationResult: addExpectationResult
@@ -375,7 +362,7 @@ describe('Expectation', function() {
   });
 
   it("reports a failing result and a custom fail message to the spec when the 'not' comparison fails, given a negativeCompare", function() {
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -391,10 +378,9 @@ describe('Expectation', function() {
         }
       },
       addExpectationResult = jasmine.createSpy('addExpectationResult'),
-      actual = 'an actual',
+      actual = 'an actual';
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       customMatchers: matchers,
       actual: 'an actual',
       addExpectationResult: addExpectationResult
@@ -414,8 +400,8 @@ describe('Expectation', function() {
   });
 
   it('reports a custom error message to the spec', function() {
-    var customError = new Error('I am a custom error');
+    const customError = new Error('I am a custom error');
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -428,10 +414,9 @@ describe('Expectation', function() {
           };
         }
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       actual: 'an actual',
       customMatchers: matchers,
       addExpectationResult: addExpectationResult
@@ -451,8 +436,8 @@ describe('Expectation', function() {
   });
 
   it("reports a custom message to the spec when a 'not' comparison fails", function() {
-    var customError = new Error('I am a custom error');
+    const customError = new Error('I am a custom error');
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -465,10 +450,9 @@ describe('Expectation', function() {
           };
         }
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       actual: 'an actual',
       customMatchers: matchers,
       addExpectationResult: addExpectationResult
@@ -488,8 +472,8 @@ describe('Expectation', function() {
   });
 
   it("reports a custom message func to the spec when a 'not' comparison fails", function() {
-    var customError = new Error('I am a custom error');
+    const customError = new Error('I am a custom error');
-    var matchers = {
+    const matchers = {
         toFoo: function() {
           return {
             compare: function() {
@@ -504,10 +488,9 @@ describe('Expectation', function() {
           };
         }
       },
-      addExpectationResult = jasmine.createSpy('addExpectationResult'),
+      addExpectationResult = jasmine.createSpy('addExpectationResult');
-      expectation;
 
-    expectation = jasmineUnderTest.Expectation.factory({
+    const expectation = jasmineUnderTest.Expectation.factory({
       actual: 'an actual',
       customMatchers: matchers,
       addExpectationResult: addExpectationResult
@@ -528,7 +511,7 @@ describe('Expectation', function() {
 
   describe('#withContext', function() {
     it('prepends the context to the generated failure message', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -561,7 +544,7 @@ describe('Expectation', function() {
     });
 
     it('prepends the context to a custom failure message', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -588,7 +571,7 @@ describe('Expectation', function() {
     });
 
     it('indents a multiline failure message', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -602,19 +585,18 @@ describe('Expectation', function() {
           customMatchers: matchers,
           actual: 'an actual',
           addExpectationResult: addExpectationResult
-        }),
+        });
-        actualMessage;
 
       expectation.withContext('Some context').toFoo('hello');
 
-      actualMessage = addExpectationResult.calls.argsFor(0)[1].message;
+      const actualMessage = addExpectationResult.calls.argsFor(0)[1].message;
       expect(actualMessage).toEqual(
         'Some context:\n    a\n    multiline\n    message'
       );
     });
 
     it('prepends the context to a custom failure message from a function', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -646,7 +628,7 @@ describe('Expectation', function() {
     });
 
     it('works with #not', function() {
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {
@@ -675,8 +657,8 @@ describe('Expectation', function() {
     });
 
     it('works with #not and a custom message', function() {
-      var customError = new Error('I am a custom error');
+      const customError = new Error('I am a custom error');
-      var matchers = {
+      const matchers = {
           toFoo: function() {
             return {
               compare: function() {

spec/core/GlobalErrorsSpec.js

@@ -1,6 +1,6 @@
 describe('GlobalErrors', function() {
   it('calls the added handler on error', function() {
-    var fakeGlobal = { onerror: null },
+    const fakeGlobal = { onerror: null },
       handler = jasmine.createSpy('errorHandler'),
       errors = new jasmineUnderTest.GlobalErrors(fakeGlobal);
 
@@ -13,7 +13,7 @@ describe('GlobalErrors', function() {
   });
 
   it('enables external interception of error by overriding global.onerror', function() {
-    var fakeGlobal = { onerror: null },
+    const fakeGlobal = { onerror: null },
       handler = jasmine.createSpy('errorHandler'),
       hijackHandler = jasmine.createSpy('hijackErrorHandler'),
       errors = new jasmineUnderTest.GlobalErrors(fakeGlobal);
@@ -30,7 +30,7 @@ describe('GlobalErrors', function() {
   });
 
   it('calls the global error handler with all parameters', function() {
-    var fakeGlobal = { onerror: null },
+    const fakeGlobal = { onerror: null },
       handler = jasmine.createSpy('errorHandler'),
       errors = new jasmineUnderTest.GlobalErrors(fakeGlobal),
       fooError = new Error('foo');
@@ -50,7 +50,7 @@ describe('GlobalErrors', function() {
   });
 
   it('only calls the most recent handler', function() {
-    var fakeGlobal = { onerror: null },
+    const fakeGlobal = { onerror: null },
       handler1 = jasmine.createSpy('errorHandler1'),
       handler2 = jasmine.createSpy('errorHandler2'),
       errors = new jasmineUnderTest.GlobalErrors(fakeGlobal);
@@ -66,7 +66,7 @@ describe('GlobalErrors', function() {
   });
 
   it('calls previous handlers when one is removed', function() {
-    var fakeGlobal = { onerror: null },
+    const fakeGlobal = { onerror: null },
       handler1 = jasmine.createSpy('errorHandler1'),
       handler2 = jasmine.createSpy('errorHandler2'),
       errors = new jasmineUnderTest.GlobalErrors(fakeGlobal);
@@ -84,14 +84,14 @@ describe('GlobalErrors', function() {
   });
 
   it('throws when no listener is passed to #popListener', function() {
-    var errors = new jasmineUnderTest.GlobalErrors({});
+    const errors = new jasmineUnderTest.GlobalErrors({});
     expect(function() {
       errors.popListener();
     }).toThrowError('popListener expects a listener');
   });
 
   it('uninstalls itself, putting back a previous callback', function() {
-    var originalCallback = jasmine.createSpy('error'),
+    const originalCallback = jasmine.createSpy('error'),
       fakeGlobal = { onerror: originalCallback },
       errors = new jasmineUnderTest.GlobalErrors(fakeGlobal);
 
@@ -107,7 +107,7 @@ describe('GlobalErrors', function() {
   });
 
   it('rethrows the original error when there is no handler', function() {
-    var fakeGlobal = {},
+    const fakeGlobal = {},
       errors = new jasmineUnderTest.GlobalErrors(fakeGlobal),
       originalError = new Error('nope');
 
@@ -123,7 +123,7 @@ describe('GlobalErrors', function() {
   });
 
   it('reports uncaught exceptions in node.js', function() {
-    var fakeGlobal = {
+    const fakeGlobal = {
         process: {
           on: jasmine.createSpy('process.on'),
           removeListener: jasmine.createSpy('process.removeListener'),
@@ -150,7 +150,7 @@ describe('GlobalErrors', function() {
 
     errors.pushListener(handler);
 
-    var addedListener = fakeGlobal.process.on.calls.argsFor(0)[1];
+    const addedListener = fakeGlobal.process.on.calls.argsFor(0)[1];
     addedListener(new Error('bar'));
 
     expect(handler).toHaveBeenCalledWith(new Error('bar'));
@@ -172,7 +172,7 @@ describe('GlobalErrors', function() {
 
   describe('Reporting unhandled promise rejections in node.js', function() {
     it('reports rejections with `Error` reasons', function() {
-      var fakeGlobal = {
+      const fakeGlobal = {
           process: {
             on: jasmine.createSpy('process.on'),
             removeListener: jasmine.createSpy('process.removeListener'),
@@ -199,7 +199,7 @@ describe('GlobalErrors', function() {
 
       errors.pushListener(handler);
 
-      var addedListener = fakeGlobal.process.on.calls.argsFor(1)[1];
+      const addedListener = fakeGlobal.process.on.calls.argsFor(1)[1];
       addedListener(new Error('bar'));
 
       expect(handler).toHaveBeenCalledWith(new Error('bar'));
@@ -220,7 +220,7 @@ describe('GlobalErrors', function() {
     });
 
     it('reports rejections with non-`Error` reasons', function() {
-      var fakeGlobal = {
+      const fakeGlobal = {
           process: {
             on: jasmine.createSpy('process.on'),
             removeListener: function() {},
@@ -239,7 +239,7 @@ describe('GlobalErrors', function() {
       expect(fakeGlobal.process.on.calls.argsFor(1)[0]).toEqual(
         'unhandledRejection'
       );
-      var addedListener = fakeGlobal.process.on.calls.argsFor(1)[1];
+      const addedListener = fakeGlobal.process.on.calls.argsFor(1)[1];
       addedListener(17);
 
       expect(handler).toHaveBeenCalledWith(
@@ -252,7 +252,7 @@ describe('GlobalErrors', function() {
     });
 
     it('reports rejections with no reason provided', function() {
-      var fakeGlobal = {
+      const fakeGlobal = {
           process: {
             on: jasmine.createSpy('process.on'),
             removeListener: function() {},
@@ -271,7 +271,7 @@ describe('GlobalErrors', function() {
       expect(fakeGlobal.process.on.calls.argsFor(1)[0]).toEqual(
         'unhandledRejection'
       );
-      var addedListener = fakeGlobal.process.on.calls.argsFor(1)[1];
+      const addedListener = fakeGlobal.process.on.calls.argsFor(1)[1];
       addedListener(undefined);
 
       expect(handler).toHaveBeenCalledWith(
@@ -286,7 +286,7 @@ describe('GlobalErrors', function() {
 
   describe('Reporting unhandled promise rejections in the browser', function() {
     it('subscribes and unsubscribes from the unhandledrejection event', function() {
-      var fakeGlobal = jasmine.createSpyObj('globalErrors', [
+      const fakeGlobal = jasmine.createSpyObj('globalErrors', [
           'addEventListener',
           'removeEventListener',
           'onerror'
@@ -299,7 +299,7 @@ describe('GlobalErrors', function() {
         jasmine.any(Function)
       );
 
-      var addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
+      const addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
       errors.uninstall();
 
       expect(fakeGlobal.removeEventListener).toHaveBeenCalledWith(
@@ -309,7 +309,7 @@ describe('GlobalErrors', function() {
     });
 
     it('reports rejections whose reason is a string', function() {
-      var fakeGlobal = jasmine.createSpyObj('globalErrors', [
+      const fakeGlobal = jasmine.createSpyObj('globalErrors', [
           'addEventListener',
           'removeEventListener',
           'onerror'
@@ -320,14 +320,14 @@ describe('GlobalErrors', function() {
       errors.install();
       errors.pushListener(handler);
 
-      var addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
+      const addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
       addedListener({ reason: 'nope' });
 
       expect(handler).toHaveBeenCalledWith('Unhandled promise rejection: nope');
     });
 
     it('reports rejections whose reason is an Error', function() {
-      var fakeGlobal = jasmine.createSpyObj('globalErrors', [
+      const fakeGlobal = jasmine.createSpyObj('globalErrors', [
           'addEventListener',
           'removeEventListener',
           'onerror'
@@ -338,15 +338,8 @@ describe('GlobalErrors', function() {
       errors.install();
       errors.pushListener(handler);
 
-      var addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
+      const addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
-      var reason;
+      const reason = new Error('bar');
-
-      try {
-        // Throwing ensures that we get a stack property in all browsers
-        throw new Error('bar');
-      } catch (e) {
-        reason = e;
-      }
 
       addedListener({ reason: reason });
 
@@ -361,7 +354,7 @@ describe('GlobalErrors', function() {
 
     describe('Enabling external interception of reported rejections by overriding global.onerror', function() {
       it('overriding global.onerror intercepts rejections whose reason is a string', function() {
-        var fakeGlobal = jasmine.createSpyObj('globalErrors', [
+        const fakeGlobal = jasmine.createSpyObj('globalErrors', [
             'addEventListener'
           ]),
           handler = jasmine.createSpy('errorHandler'),
@@ -373,7 +366,7 @@ describe('GlobalErrors', function() {
 
         fakeGlobal.onerror = hijackHandler;
 
-        var addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
+        const addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
         addedListener({ reason: 'nope' });
 
         expect(hijackHandler).toHaveBeenCalledWith(
@@ -383,7 +376,7 @@ describe('GlobalErrors', function() {
       });
 
       it('overriding global.onerror intercepts rejections whose reason is an Error', function() {
-        var fakeGlobal = jasmine.createSpyObj('globalErrors', [
+        const fakeGlobal = jasmine.createSpyObj('globalErrors', [
             'addEventListener'
           ]),
           handler = jasmine.createSpy('errorHandler'),
@@ -395,15 +388,8 @@ describe('GlobalErrors', function() {
 
         fakeGlobal.onerror = hijackHandler;
 
-        var addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
+        const addedListener = fakeGlobal.addEventListener.calls.argsFor(0)[1];
-        var reason;
+        const reason = new Error('bar');
-
-        try {
-          // Throwing ensures that we get a stack property in all browsers
-          throw new Error('bar');
-        } catch (e) {
-          reason = e;
-        }
 
         addedListener({ reason: reason });
 

spec/core/JsApiReporterSpec.js

@@ -1,6 +1,6 @@
 describe('JsApiReporter', function() {
   it('knows when a full environment is started', function() {
-    var reporter = new jasmineUnderTest.JsApiReporter({});
+    const reporter = new jasmineUnderTest.JsApiReporter({});
 
     expect(reporter.started).toBe(false);
     expect(reporter.finished).toBe(false);
@@ -12,7 +12,7 @@ describe('JsApiReporter', function() {
   });
 
   it('knows when a full environment is done', function() {
-    var reporter = new jasmineUnderTest.JsApiReporter({});
+    const reporter = new jasmineUnderTest.JsApiReporter({});
 
     expect(reporter.started).toBe(false);
     expect(reporter.finished).toBe(false);
@@ -24,13 +24,13 @@ describe('JsApiReporter', function() {
   });
 
   it("defaults to 'loaded' status", function() {
-    var reporter = new jasmineUnderTest.JsApiReporter({});
+    const reporter = new jasmineUnderTest.JsApiReporter({});
 
     expect(reporter.status()).toEqual('loaded');
   });
 
   it("reports 'started' when Jasmine has started", function() {
-    var reporter = new jasmineUnderTest.JsApiReporter({});
+    const reporter = new jasmineUnderTest.JsApiReporter({});
 
     reporter.jasmineStarted();
 
@@ -38,7 +38,7 @@ describe('JsApiReporter', function() {
   });
 
   it("reports 'done' when Jasmine is done", function() {
-    var reporter = new jasmineUnderTest.JsApiReporter({});
+    const reporter = new jasmineUnderTest.JsApiReporter({});
 
     reporter.jasmineDone({});
 
@@ -46,14 +46,14 @@ describe('JsApiReporter', function() {
   });
 
   it('tracks a suite', function() {
-    var reporter = new jasmineUnderTest.JsApiReporter({});
+    const reporter = new jasmineUnderTest.JsApiReporter({});
 
     reporter.suiteStarted({
       id: 123,
       description: 'A suite'
     });
 
-    var suites = reporter.suites();
+    const suites = reporter.suites();
 
     expect(suites).toEqual({ 123: { id: 123, description: 'A suite' } });
 
@@ -69,7 +69,7 @@ describe('JsApiReporter', function() {
   });
 
   describe('#specResults', function() {
-    var reporter, specResult1, specResult2;
+    let reporter, specResult1, specResult2;
     beforeEach(function() {
       reporter = new jasmineUnderTest.JsApiReporter({});
       specResult1 = {
@@ -99,7 +99,7 @@ describe('JsApiReporter', function() {
   });
 
   describe('#suiteResults', function() {
-    var reporter, suiteStarted1, suiteResult1, suiteResult2;
+    let reporter, suiteStarted1, suiteResult1, suiteResult2;
     beforeEach(function() {
       reporter = new jasmineUnderTest.JsApiReporter({});
       suiteStarted1 = {
@@ -137,7 +137,7 @@ describe('JsApiReporter', function() {
 
   describe('#executionTime', function() {
     it('should start the timer when jasmine starts', function() {
-      var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
+      const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
         reporter = new jasmineUnderTest.JsApiReporter({
           timer: timerSpy
         });
@@ -147,7 +147,7 @@ describe('JsApiReporter', function() {
     });
 
     it('should return the time it took the specs to run, in ms', function() {
-      var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
+      const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
         reporter = new jasmineUnderTest.JsApiReporter({
           timer: timerSpy
         });
@@ -159,7 +159,7 @@ describe('JsApiReporter', function() {
 
     describe("when the specs haven't finished being run", function() {
       it('should return undefined', function() {
-        var timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
+        const timerSpy = jasmine.createSpyObj('timer', ['start', 'elapsed']),
           reporter = new jasmineUnderTest.JsApiReporter({
             timer: timerSpy
           });
@@ -171,7 +171,7 @@ describe('JsApiReporter', function() {
 
   describe('#runDetails', function() {
     it('should have details about the run', function() {
-      var reporter = new jasmineUnderTest.JsApiReporter({});
+      const reporter = new jasmineUnderTest.JsApiReporter({});
       reporter.jasmineDone({ some: { run: 'details' } });
       expect(reporter.runDetails).toEqual({ some: { run: 'details' } });
     });

spec/core/MockDateSpec.js

@@ -1,6 +1,6 @@
 describe('FakeDate', function() {
   it('does not fail if no global date is found', function() {
-    var fakeGlobal = {},
+    const fakeGlobal = {},
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     expect(function() {
@@ -11,11 +11,13 @@ describe('FakeDate', function() {
   });
 
   it('replaces the global Date when it is installed', function() {
-    var globalDate = jasmine.createSpy('global Date').and.callFake(function() {
+    const globalDate = jasmine
-        return {
+        .createSpy('global Date')
-          getTime: function() {}
+        .and.callFake(function() {
-        };
+          return {
-      }),
+            getTime: function() {}
+          };
+        }),
       fakeGlobal = { Date: globalDate },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
@@ -26,11 +28,13 @@ describe('FakeDate', function() {
   });
 
   it('replaces the global Date on uninstall', function() {
-    var globalDate = jasmine.createSpy('global Date').and.callFake(function() {
+    const globalDate = jasmine
-        return {
+        .createSpy('global Date')
-          getTime: function() {}
+        .and.callFake(function() {
-        };
+          return {
-      }),
+            getTime: function() {}
+          };
+        }),
       fakeGlobal = { Date: globalDate },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
@@ -41,13 +45,15 @@ describe('FakeDate', function() {
   });
 
   it('takes the current time as the base when installing without parameters', function() {
-    var globalDate = jasmine.createSpy('global Date').and.callFake(function() {
+    const globalDate = jasmine
-        return {
+        .createSpy('global Date')
-          getTime: function() {
+        .and.callFake(function() {
-            return 1000;
+          return {
-          }
+            getTime: function() {
-        };
+              return 1000;
-      }),
+            }
+          };
+        }),
       fakeGlobal = { Date: globalDate },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
@@ -59,7 +65,7 @@ describe('FakeDate', function() {
   });
 
   it('can accept a date as time base when installing', function() {
-    var fakeGlobal = { Date: Date },
+    const fakeGlobal = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal),
       baseDate = new Date();
 
@@ -70,7 +76,7 @@ describe('FakeDate', function() {
   });
 
   it('makes real dates', function() {
-    var fakeGlobal = { Date: Date },
+    const fakeGlobal = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
@@ -79,17 +85,19 @@ describe('FakeDate', function() {
   });
 
   it('fakes current time when using Date.now()', function() {
-    var globalDate = jasmine.createSpy('global Date').and.callFake(function() {
+    const globalDate = jasmine
-        return {
+        .createSpy('global Date')
-          getTime: function() {
+        .and.callFake(function() {
-            return 1000;
+          return {
-          }
+            getTime: function() {
-        };
+              return 1000;
-      }),
+            }
+          };
+        }),
       fakeGlobal = { Date: globalDate };
 
     globalDate.now = function() {};
-    var mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
+    const mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -97,17 +105,19 @@ describe('FakeDate', function() {
   });
 
   it('makes time passes using tick', function() {
-    var globalDate = jasmine.createSpy('global Date').and.callFake(function() {
+    const globalDate = jasmine
-        return {
+        .createSpy('global Date')
-          getTime: function() {
+        .and.callFake(function() {
-            return 1000;
+          return {
-          }
+            getTime: function() {
-        };
+              return 1000;
-      }),
+            }
+          };
+        }),
       fakeGlobal = { Date: globalDate };
 
     globalDate.now = function() {};
-    var mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
+    const mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -121,17 +131,19 @@ describe('FakeDate', function() {
   });
 
   it('allows to increase 0 milliseconds using tick', function() {
-    var globalDate = jasmine.createSpy('global Date').and.callFake(function() {
+    const globalDate = jasmine
-        return {
+        .createSpy('global Date')
-          getTime: function() {
+        .and.callFake(function() {
-            return 1000;
+          return {
-          }
+            getTime: function() {
-        };
+              return 1000;
-      }),
+            }
+          };
+        }),
       fakeGlobal = { Date: globalDate };
 
     globalDate.now = function() {};
-    var mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
+    const mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
@@ -143,40 +155,40 @@ describe('FakeDate', function() {
   });
 
   it('allows creation of a Date in a different time than the mocked time', function() {
-    var fakeGlobal = { Date: Date },
+    const fakeGlobal = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
-    var otherDate = new fakeGlobal.Date(2013, 9, 23, 0, 0, 1, 0);
+    const otherDate = new fakeGlobal.Date(2013, 9, 23, 0, 0, 1, 0);
     expect(otherDate.getTime()).toEqual(
       new Date(2013, 9, 23, 0, 0, 1, 0).getTime()
     );
   });
 
   it("allows creation of a Date that isn't fully specified", function() {
-    var fakeGlobal = { Date: Date },
+    const fakeGlobal = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();
 
-    var otherDate = new fakeGlobal.Date(2013, 9, 23);
+    const otherDate = new fakeGlobal.Date(2013, 9, 23);
     expect(otherDate.getTime()).toEqual(new Date(2013, 9, 23).getTime());
   });
 
   it('allows creation of a Date with millis', function() {
-    var fakeGlobal = { Date: Date },
+    const fakeGlobal = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal),
       now = new Date(2014, 3, 15).getTime();
 
     mockDate.install();
 
-    var otherDate = new fakeGlobal.Date(now);
+    const otherDate = new fakeGlobal.Date(now);
     expect(otherDate.getTime()).toEqual(now);
   });
 
   it('copies all Date properties to the mocked date', function() {
-    var fakeGlobal = { Date: Date },
+    const fakeGlobal = { Date: Date },
       mockDate = new jasmineUnderTest.MockDate(fakeGlobal);
 
     mockDate.install();

spec/core/PrettyPrintSpec.js

@@ -1,12 +1,20 @@
 describe('PrettyPrinter', function() {
   it('should wrap strings in single quotes', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
     expect(pp('some string')).toEqual("'some string'");
     expect(pp("som' string")).toEqual("'som' string'");
   });
 
+  it('stringifies empty string primitives and objects recognizably', function() {
+    const pp = jasmineUnderTest.makePrettyPrinter();
+    expect(pp(new String(''))).toEqual(pp(''));
+    expect(pp(new String(''))).toEqual("''");
+    expect(pp([new String('')])).toEqual(pp(['']));
+    expect(pp([new String('')])).toEqual("[ '' ]");
+  });
+
   it('should stringify primitives properly', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
     expect(pp(true)).toEqual('true');
     expect(pp(false)).toEqual('false');
     expect(pp(null)).toEqual('null');
@@ -18,23 +26,23 @@ describe('PrettyPrinter', function() {
 
   describe('stringify sets', function() {
     it('should stringify sets properly', function() {
-      var set = new Set();
+      const set = new Set();
       set.add(1);
       set.add(2);
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
       expect(pp(set)).toEqual('Set( 1, 2 )');
     });
 
     it('should truncate sets with more elements than jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH', function() {
-      var originalMaxSize = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+      const originalMaxSize = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
 
       try {
         jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
-        var set = new Set();
+        const set = new Set();
         set.add('a');
         set.add('b');
         set.add('c');
-        var pp = jasmineUnderTest.makePrettyPrinter();
+        const pp = jasmineUnderTest.makePrettyPrinter();
         expect(pp(set)).toEqual("Set( 'a', 'b', ... )");
       } finally {
         jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxSize;
@@ -44,22 +52,22 @@ describe('PrettyPrinter', function() {
 
   describe('stringify maps', function() {
     it('should stringify maps properly', function() {
-      var map = new Map();
+      const map = new Map();
       map.set(1, 2);
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
       expect(pp(map)).toEqual('Map( [ 1, 2 ] )');
     });
 
     it('should truncate maps with more elements than jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH', function() {
-      var originalMaxSize = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+      const originalMaxSize = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
 
       try {
         jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
-        var map = new Map();
+        const map = new Map();
         map.set('a', 1);
         map.set('b', 2);
         map.set('c', 3);
-        var pp = jasmineUnderTest.makePrettyPrinter();
+        const pp = jasmineUnderTest.makePrettyPrinter();
         expect(pp(map)).toEqual("Map( [ 'a', 1 ], [ 'b', 2 ], ... )");
       } finally {
         jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxSize;
@@ -69,17 +77,22 @@ describe('PrettyPrinter', function() {
 
   describe('stringify arrays', function() {
     it('should stringify arrays properly', function() {
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
       expect(pp([1, 2])).toEqual('[ 1, 2 ]');
       expect(pp([1, 'foo', {}, jasmine.undefined, null])).toEqual(
         "[ 1, 'foo', Object({  }), undefined, null ]"
       );
     });
 
+    it('includes symbols', function() {
+      const pp = jasmineUnderTest.makePrettyPrinter();
+      expect(pp([1, Symbol('foo'), 2])).toEqual('[ 1, Symbol(foo), 2 ]');
+    });
+
     it('should truncate arrays that are longer than jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH', function() {
-      var originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+      const originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
-      var array = [1, 2, 3];
+      const array = [1, 2, 3];
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
 
       try {
         jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
@@ -90,25 +103,25 @@ describe('PrettyPrinter', function() {
     });
 
     it('should stringify arrays with properties properly', function() {
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
-      var arr = [1, 2];
+      const arr = [1, 2];
       arr.foo = 'bar';
       arr.baz = {};
       expect(pp(arr)).toEqual("[ 1, 2, foo: 'bar', baz: Object({  }) ]");
     });
 
     it('should stringify empty arrays with properties properly', function() {
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
-      var empty = [];
+      const empty = [];
       empty.foo = 'bar';
       empty.baz = {};
       expect(pp(empty)).toEqual("[ foo: 'bar', baz: Object({  }) ]");
     });
 
     it('should stringify long arrays with properties properly', function() {
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
-      var originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+      const originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
-      var long = [1, 2, 3];
+      const long = [1, 2, 3];
       long.foo = 'bar';
       long.baz = {};
 
@@ -123,22 +136,22 @@ describe('PrettyPrinter', function() {
     });
 
     it('should indicate circular array references', function() {
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
-      var array1 = [1, 2];
+      const array1 = [1, 2];
-      var array2 = [array1];
+      const array2 = [array1];
       array1.push(array2);
       expect(pp(array1)).toEqual('[ 1, 2, [ <circular reference: Array> ] ]');
     });
 
     it('should not indicate circular references incorrectly', function() {
-      var pp = jasmineUnderTest.makePrettyPrinter();
+      const pp = jasmineUnderTest.makePrettyPrinter();
-      var array = [[1]];
+      const array = [[1]];
       expect(pp(array)).toEqual('[ [ 1 ] ]');
     });
   });
 
   it('should stringify objects properly', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
     expect(pp({ foo: 'bar' })).toEqual("Object({ foo: 'bar' })");
     expect(
       pp({
@@ -155,15 +168,34 @@ describe('PrettyPrinter', function() {
     );
   });
 
+  it('includes symbol keys in objects', function() {
+    const pp = jasmineUnderTest.makePrettyPrinter();
+    const obj = {};
+    obj[Symbol('foo')] = 'bar';
+    expect(pp(obj)).toEqual("Object({ Symbol(foo): 'bar' })");
+  });
+
+  it('stringifies string and symbol keys differently', function() {
+    const pp = jasmineUnderTest.makePrettyPrinter();
+    const symObj = {};
+    const strObj = {};
+    const k = 'foo';
+    const v = 'bar';
+    symObj[Symbol(k)] = v;
+    strObj[k] = v;
+
+    expect(pp(symObj)).not.toEqual(pp(strObj));
+  });
+
   it('should stringify objects that almost look like DOM nodes', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
     expect(pp({ nodeType: 1 })).toEqual('Object({ nodeType: 1 })');
   });
 
   it('should truncate objects with too many keys', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+    const originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
-    var long = { a: 1, b: 2, c: 3 };
+    const long = { a: 1, b: 2, c: 3 };
 
     try {
       jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
@@ -174,7 +206,7 @@ describe('PrettyPrinter', function() {
   });
 
   function withMaxChars(maxChars, fn) {
-    var originalMaxChars = jasmineUnderTest.MAX_PRETTY_PRINT_CHARS;
+    const originalMaxChars = jasmineUnderTest.MAX_PRETTY_PRINT_CHARS;
 
     try {
       jasmineUnderTest.MAX_PRETTY_PRINT_CHARS = maxChars;
@@ -185,8 +217,8 @@ describe('PrettyPrinter', function() {
   }
 
   it('should truncate outputs that are too long', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var big = [{ a: 1, b: 'a long string' }, {}];
+    const big = [{ a: 1, b: 'a long string' }, {}];
 
     withMaxChars(34, function() {
       expect(pp(big)).toEqual("[ Object({ a: 1, b: 'a long st ...");
@@ -194,7 +226,7 @@ describe('PrettyPrinter', function() {
   });
 
   it('should not serialize more objects after hitting MAX_PRETTY_PRINT_CHARS', function() {
-    var a = {
+    const a = {
         jasmineToString: function() {
           return 'object a';
         }
@@ -224,25 +256,25 @@ describe('PrettyPrinter', function() {
   });
 
   it("should print 'null' as the constructor of an object with its own constructor property", function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
     expect(pp({ constructor: function() {} })).toContain('null({');
     expect(pp({ constructor: 'foo' })).toContain('null({');
   });
 
   it('should not include inherited properties when stringifying an object', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var SomeClass = function SomeClass() {};
+    const SomeClass = function SomeClass() {};
     SomeClass.prototype.foo = 'inherited foo';
-    var instance = new SomeClass();
+    const instance = new SomeClass();
     instance.bar = 'my own bar';
     expect(pp(instance)).toEqual("SomeClass({ bar: 'my own bar' })");
   });
 
   it('should not recurse objects and arrays more deeply than jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var originalMaxDepth = jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH;
+    const originalMaxDepth = jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH;
-    var nestedObject = { level1: { level2: { level3: { level4: 'leaf' } } } };
+    const nestedObject = { level1: { level2: { level3: { level4: 'leaf' } } } };
-    var nestedArray = [1, [2, [3, [4, 'leaf']]]];
+    const nestedArray = [1, [2, [3, [4, 'leaf']]]];
 
     try {
       jasmineUnderTest.MAX_PRETTY_PRINT_DEPTH = 2;
@@ -268,8 +300,8 @@ describe('PrettyPrinter', function() {
   });
 
   it('should stringify immutable circular objects', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var frozenObject = { foo: { bar: 'baz' } };
+    let frozenObject = { foo: { bar: 'baz' } };
     frozenObject.circular = frozenObject;
     frozenObject = Object.freeze(frozenObject);
     expect(pp(frozenObject)).toEqual(
@@ -278,52 +310,52 @@ describe('PrettyPrinter', function() {
   });
 
   it('should stringify RegExp objects properly', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
     expect(pp(/x|y|z/)).toEqual('/x|y|z/');
   });
 
   it('should indicate circular object references', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var sampleValue = { foo: 'hello' };
+    const sampleValue = { foo: 'hello' };
     sampleValue.nested = sampleValue;
     expect(pp(sampleValue)).toEqual(
       "Object({ foo: 'hello', nested: <circular reference: Object> })"
     );
   });
 
-  it('should indicate getters on objects as such', function() {
+  it('should use the return value of getters', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var sampleValue = {
+    const sampleValue = {
       id: 1,
       get calculatedValue() {
-        throw new Error("don't call me!");
+        return 'the getter return value';
       }
     };
     expect(pp(sampleValue)).toEqual(
-      'Object({ id: 1, calculatedValue: <getter> })'
+      "Object({ id: 1, calculatedValue: 'the getter return value' })"
     );
   });
 
   it('should not do HTML escaping of strings', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
     expect(pp('some <b>html string</b> &', false)).toEqual(
       "'some <b>html string</b> &'"
     );
   });
 
   it('should abbreviate the global (usually window) object', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
     expect(pp(jasmine.getGlobal())).toEqual('<global>');
   });
 
   it('should stringify Date objects properly', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var now = new Date();
+    const now = new Date();
     expect(pp(now)).toEqual('Date(' + now.toString() + ')');
   });
 
   describe('with a spy object', function() {
-    var env, pp;
+    let env, pp;
 
     beforeEach(function() {
       env = new jasmineUnderTest.Env();
@@ -335,11 +367,11 @@ describe('PrettyPrinter', function() {
     });
 
     it('should stringify spy objects properly', function() {
-      var TestObject = {
+      const TestObject = {
         someFunction: function() {}
       };
 
-      var spyRegistry = new jasmineUnderTest.SpyRegistry({
+      const spyRegistry = new jasmineUnderTest.SpyRegistry({
         currentSpies: function() {
           return [];
         },
@@ -355,13 +387,13 @@ describe('PrettyPrinter', function() {
     });
 
     it('should stringify spyOn toString properly', function() {
-      var TestObject = {
+      const TestObject = {
           someFunction: function() {}
         },
         env = new jasmineUnderTest.Env(),
         pp = jasmineUnderTest.makePrettyPrinter();
 
-      var spyRegistry = new jasmineUnderTest.SpyRegistry({
+      const spyRegistry = new jasmineUnderTest.SpyRegistry({
         currentSpies: function() {
           return [];
         },
@@ -371,15 +403,15 @@ describe('PrettyPrinter', function() {
       });
 
       spyRegistry.spyOn(TestObject, 'toString');
-      var testSpyObj = env.createSpyObj('TheClassName', ['toString']);
+      const testSpyObj = env.createSpyObj('TheClassName', ['toString']);
 
       expect(pp(testSpyObj)).toEqual('spy on TheClassName.toString');
     });
   });
 
   it('should stringify objects that implement jasmineToString', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var obj = {
+    const obj = {
       jasmineToString: function() {
         return 'strung';
       }
@@ -389,8 +421,8 @@ describe('PrettyPrinter', function() {
   });
 
   it('should pass itself to jasmineToString', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter([]);
+    const pp = jasmineUnderTest.makePrettyPrinter([]);
-    var obj = {
+    const obj = {
       jasmineToString: jasmine.createSpy('jasmineToString').and.returnValue('')
     };
 
@@ -399,8 +431,8 @@ describe('PrettyPrinter', function() {
   });
 
   it('should stringify objects that implement custom toString', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var obj = {
+    const obj = {
       toString: function() {
         return 'my toString';
       }
@@ -410,7 +442,7 @@ describe('PrettyPrinter', function() {
 
     // Simulate object from another global context (e.g. an iframe or Web Worker) that does not actually have a custom
     // toString despite obj.toString !== Object.prototype.toString
-    var objFromOtherContext = {
+    const objFromOtherContext = {
       foo: 'bar',
       toString: function() {
         return Object.prototype.toString.call(this);
@@ -423,8 +455,8 @@ describe('PrettyPrinter', function() {
   });
 
   it("should stringify objects have have a toString that isn't a function", function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var obj = {
+    const obj = {
       toString: 'foo'
     };
 
@@ -432,30 +464,30 @@ describe('PrettyPrinter', function() {
   });
 
   it('should stringify objects from anonymous constructors with custom toString', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var MyAnonymousConstructor = (function() {
+    const MyAnonymousConstructor = (function() {
       return function() {};
     })();
     MyAnonymousConstructor.toString = function() {
       return '';
     };
 
-    var a = new MyAnonymousConstructor();
+    const a = new MyAnonymousConstructor();
 
     expect(pp(a)).toEqual('<anonymous>({  })');
   });
 
   it('should handle objects with null prototype', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var obj = Object.create(null);
+    const obj = Object.create(null);
     obj.foo = 'bar';
 
     expect(pp(obj)).toEqual("null({ foo: 'bar' })");
   });
 
   it('should gracefully handle objects with invalid toString implementations', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter();
+    const pp = jasmineUnderTest.makePrettyPrinter();
-    var obj = {
+    const obj = {
       foo: {
         toString: function() {
           // Invalid: toString returning a number
@@ -491,8 +523,8 @@ describe('PrettyPrinter', function() {
 
   describe('Custom object formatters', function() {
     it('should use the first custom object formatter that does not return undefined', function() {
-      var customObjectFormatters = [
+      const customObjectFormatters = [
-          function(obj) {
+          function() {
             return undefined;
           },
           function(obj) {
@@ -509,8 +541,8 @@ describe('PrettyPrinter', function() {
     });
 
     it('should fall back to built in logic if all custom object formatters return undefined', function() {
-      var customObjectFormatters = [
+      const customObjectFormatters = [
-          function(obj) {
+          function() {
             return undefined;
           }
         ],
@@ -523,8 +555,8 @@ describe('PrettyPrinter', function() {
 
   describe('#customFormat_', function() {
     it('should use the first custom object formatter that does not return undefined', function() {
-      var customObjectFormatters = [
+      const customObjectFormatters = [
-          function(obj) {
+          function() {
             return undefined;
           },
           function(obj) {
@@ -541,8 +573,8 @@ describe('PrettyPrinter', function() {
     });
 
     it('should return undefined if all custom object formatters return undefined', function() {
-      var customObjectFormatters = [
+      const customObjectFormatters = [
-          function(obj) {
+          function() {
             return undefined;
           }
         ],

spec/core/QueueRunnerSpec.js

@@ -1,6 +1,6 @@
 describe('QueueRunner', function() {
   it("runs all the functions it's passed", function() {
-    var calls = [],
+    const calls = [],
       queueableFn1 = { fn: jasmine.createSpy('fn1') },
       queueableFn2 = { fn: jasmine.createSpy('fn2') },
       queueRunner = new jasmineUnderTest.QueueRunner({
@@ -19,9 +19,10 @@ describe('QueueRunner', function() {
   });
 
   it("calls each function with a consistent 'this'-- an empty object", function() {
-    var queueableFn1 = { fn: jasmine.createSpy('fn1') },
+    const queueableFn1 = { fn: jasmine.createSpy('fn1') };
-      queueableFn2 = { fn: jasmine.createSpy('fn2') },
+    const queueableFn2 = { fn: jasmine.createSpy('fn2') };
-      queueableFn3 = {
+    let asyncContext;
+    const queueableFn3 = {
         fn: function(done) {
           asyncContext = this;
           done();
@@ -29,12 +30,11 @@ describe('QueueRunner', function() {
       },
       queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn1, queueableFn2, queueableFn3]
-      }),
+      });
-      asyncContext;
 
     queueRunner.execute();
 
-    var context = queueableFn1.fn.calls.first().object;
+    const context = queueableFn1.fn.calls.first().object;
     expect(context).toEqual(new jasmineUnderTest.UserContext());
     expect(queueableFn2.fn.calls.first().object).toBe(context);
     expect(asyncContext).toBe(context);
@@ -53,7 +53,7 @@ describe('QueueRunner', function() {
       //TODO: it would be nice if spy arity could match the fake, so we could do something like:
       //createSpy('asyncfn').and.callFake(function(done) {});
 
-      var onComplete = jasmine.createSpy('onComplete'),
+      const onComplete = jasmine.createSpy('onComplete'),
         beforeCallback = jasmine.createSpy('beforeCallback'),
         fnCallback = jasmine.createSpy('fnCallback'),
         afterCallback = jasmine.createSpy('afterCallback'),
@@ -104,7 +104,7 @@ describe('QueueRunner', function() {
     });
 
     it('explicitly fails an async function with a provided fail function and moves to the next function', function() {
-      var queueableFn1 = {
+      const queueableFn1 = {
           fn: function(done) {
             setTimeout(function() {
               done.fail('foo');
@@ -131,7 +131,7 @@ describe('QueueRunner', function() {
 
     describe('When next is called with an argument', function() {
       it('explicitly fails and moves to the next function', function() {
-        var err = 'anything except undefined',
+        const err = 'anything except undefined',
           queueableFn1 = {
             fn: function(done) {
               setTimeout(function() {
@@ -156,10 +156,85 @@ describe('QueueRunner', function() {
         expect(failFn).toHaveBeenCalledWith(err);
         expect(queueableFn2.fn).toHaveBeenCalled();
       });
+
+      describe('as a result of a promise', function() {
+        describe('and the argument is an Error', function() {
+          // Since promise support was added, Jasmine has failed specs that
+          // return a promise that resolves to an error. That's probably not
+          // the desired behavior but it's also not something we should change
+          // except on a major release and with a deprecation warning in
+          // advance.
+          it('explicitly fails and moves to the next function', function(done) {
+            const err = new Error('foo'),
+              queueableFn1 = {
+                fn: function() {
+                  return Promise.resolve(err);
+                }
+              },
+              queueableFn2 = { fn: jasmine.createSpy('fn2') },
+              failFn = jasmine.createSpy('fail'),
+              queueRunner = new jasmineUnderTest.QueueRunner({
+                queueableFns: [queueableFn1, queueableFn2],
+                fail: failFn,
+                onComplete: function() {
+                  expect(failFn).toHaveBeenCalledWith(err);
+                  expect(queueableFn2.fn).toHaveBeenCalled();
+                  done();
+                }
+              });
+
+            queueRunner.execute();
+          });
+
+          it('does not log a deprecation', function(done) {
+            const err = new Error('foo'),
+              queueableFn1 = {
+                fn: function() {
+                  return Promise.resolve(err);
+                }
+              },
+              deprecated = jasmine.createSpy('deprecated'),
+              queueRunner = new jasmineUnderTest.QueueRunner({
+                queueableFns: [queueableFn1],
+                deprecated: deprecated,
+                onComplete: function() {
+                  expect(deprecated).not.toHaveBeenCalled();
+                  done();
+                }
+              });
+
+            queueRunner.execute();
+          });
+        });
+
+        describe('and the argument is not an Error', function() {
+          it('does not log a deprecation or report a failure', function(done) {
+            const queueableFn1 = {
+                fn: function() {
+                  return Promise.resolve('not an error');
+                }
+              },
+              failFn = jasmine.createSpy('fail'),
+              deprecated = jasmine.createSpy('deprecated'),
+              queueRunner = new jasmineUnderTest.QueueRunner({
+                queueableFns: [queueableFn1],
+                deprecated: deprecated,
+                fail: failFn,
+                onComplete: function() {
+                  expect(deprecated).not.toHaveBeenCalled();
+                  expect(failFn).not.toHaveBeenCalled();
+                  done();
+                }
+              });
+
+            queueRunner.execute();
+          });
+        });
+      });
     });
 
     it('does not cause an explicit fail if execution is being stopped', function() {
-      var err = new jasmineUnderTest.StopExecutionError('foo'),
+      const err = new jasmineUnderTest.StopExecutionError('foo'),
         queueableFn1 = {
           fn: function(done) {
             setTimeout(function() {
@@ -186,7 +261,8 @@ describe('QueueRunner', function() {
     });
 
     it("sets a timeout if requested for asynchronous functions so they don't go on forever", function() {
-      var timeout = 3,
+      const timeout = 3,
+        // eslint-disable-next-line no-unused-vars
         beforeFn = { fn: function(done) {}, type: 'before', timeout: timeout },
         queueableFn = { fn: jasmine.createSpy('fn'), type: 'queueable' },
         onComplete = jasmine.createSpy('onComplete'),
@@ -208,22 +284,22 @@ describe('QueueRunner', function() {
     });
 
     it('does not call onMultipleDone if an asynchrnous function completes after timing out', function() {
-      var timeout = 3,
+      const timeout = 3;
-        queueableFn = {
+      let queueableFnDone;
-          fn: function(done) {
+      const queueableFn = {
-            queueableFnDone = done;
+        fn: function(done) {
-          },
+          queueableFnDone = done;
-          type: 'queueable',
-          timeout: timeout
         },
-        onComplete = jasmine.createSpy('onComplete'),
+        type: 'queueable',
-        onMultipleDone = jasmine.createSpy('onMultipleDone'),
+        timeout: timeout
-        queueRunner = new jasmineUnderTest.QueueRunner({
+      };
-          queueableFns: [queueableFn],
+      const onComplete = jasmine.createSpy('onComplete');
-          onComplete: onComplete,
+      const onMultipleDone = jasmine.createSpy('onMultipleDone');
-          onMultipleDone: onMultipleDone
+      const queueRunner = new jasmineUnderTest.QueueRunner({
-        }),
+        queueableFns: [queueableFn],
-        queueableFnDone;
+        onComplete: onComplete,
+        onMultipleDone: onMultipleDone
+      });
 
       queueRunner.execute();
       jasmine.clock().tick(timeout);
@@ -234,7 +310,8 @@ describe('QueueRunner', function() {
     });
 
     it('by default does not set a timeout for asynchronous functions', function() {
-      var beforeFn = { fn: function(done) {} },
+      // eslint-disable-next-line no-unused-vars
+      const beforeFn = { fn: function(done) {} },
         queueableFn = { fn: jasmine.createSpy('fn') },
         onComplete = jasmine.createSpy('onComplete'),
         onException = jasmine.createSpy('onException'),
@@ -255,7 +332,8 @@ describe('QueueRunner', function() {
     });
 
     it('clears the timeout when an async function throws an exception, to prevent additional exception reporting', function() {
-      var queueableFn = {
+      const queueableFn = {
+          // eslint-disable-next-line no-unused-vars
           fn: function(done) {
             throw new Error('error!');
           }
@@ -278,7 +356,7 @@ describe('QueueRunner', function() {
     });
 
     it('clears the timeout when the done callback is called', function() {
-      var queueableFn = {
+      const queueableFn = {
           fn: function(done) {
             done();
           }
@@ -301,7 +379,7 @@ describe('QueueRunner', function() {
     });
 
     it('only moves to the next spec the first time you call done', function() {
-      var queueableFn = {
+      const queueableFn = {
           fn: function(done) {
             done();
             done();
@@ -321,7 +399,7 @@ describe('QueueRunner', function() {
     });
 
     it('does not move to the next spec if done is called after an exception has ended the spec', function() {
-      var queueableFn = {
+      const queueableFn = {
           fn: function(done) {
             setTimeout(done, 1);
             throw new Error('error!');
@@ -343,22 +421,23 @@ describe('QueueRunner', function() {
 
     it('should return a null when you call done', function() {
       // Some promises want handlers to return anything but undefined to help catch "forgotten returns".
-      var doneReturn,
+      let doneReturn;
-        queueableFn = {
+      const queueableFn = {
-          fn: function(done) {
+        fn: function(done) {
-            doneReturn = done();
+          doneReturn = done();
-          }
+        }
-        },
+      };
-        queueRunner = new jasmineUnderTest.QueueRunner({
+      const queueRunner = new jasmineUnderTest.QueueRunner({
-          queueableFns: [queueableFn]
+        queueableFns: [queueableFn]
-        });
+      });
 
       queueRunner.execute();
       expect(doneReturn).toBe(null);
     });
 
     it('continues running functions when an exception is thrown in async code without timing out', function() {
-      var queueableFn = {
+      const queueableFn = {
+          // eslint-disable-next-line no-unused-vars
           fn: function(done) {
             throwAsync();
           },
@@ -409,7 +488,7 @@ describe('QueueRunner', function() {
     });
 
     it('handles exceptions thrown while waiting for the stack to clear', function() {
-      var queueableFn = {
+      const queueableFn = {
           fn: function(done) {
             done();
           }
@@ -460,7 +539,7 @@ describe('QueueRunner', function() {
     });
 
     it('runs the function asynchronously, advancing once the promise is settled', function() {
-      var onComplete = jasmine.createSpy('onComplete'),
+      const onComplete = jasmine.createSpy('onComplete'),
         fnCallback = jasmine.createSpy('fnCallback'),
         p1 = new StubPromise(),
         p2 = new StubPromise(),
@@ -501,7 +580,7 @@ describe('QueueRunner', function() {
     });
 
     it('handles a rejected promise like an unhandled exception', function() {
-      var promise = new StubPromise(),
+      const promise = new StubPromise(),
         queueableFn1 = {
           fn: function() {
             setTimeout(function() {
@@ -529,7 +608,8 @@ describe('QueueRunner', function() {
     });
 
     it('issues an error if the function also takes a parameter', function() {
-      var queueableFn = {
+      const queueableFn = {
+          // eslint-disable-next-line no-unused-vars
           fn: function(done) {
             return new StubPromise();
           }
@@ -552,8 +632,9 @@ describe('QueueRunner', function() {
     });
 
     it('issues a more specific error if the function is `async`', function() {
-      eval('var fn = async function(done){};');
+      // eslint-disable-next-line no-unused-vars
-      var onException = jasmine.createSpy('onException'),
+      async function fn(done) {}
+      const onException = jasmine.createSpy('onException'),
         queueRunner = new jasmineUnderTest.QueueRunner({
           queueableFns: [{ fn: fn }],
           onException: onException
@@ -571,7 +652,7 @@ describe('QueueRunner', function() {
   });
 
   it('passes the error instance to exception handlers in HTML browsers', function() {
-    var error = new Error('fake error'),
+    const error = new Error('fake error'),
       onExceptionCallback = jasmine.createSpy('on exception callback'),
       queueRunner = new jasmineUnderTest.QueueRunner({
         onException: onExceptionCallback
@@ -584,7 +665,7 @@ describe('QueueRunner', function() {
   });
 
   it('passes the first argument to exception handlers for compatibility', function() {
-    var error = new Error('fake error'),
+    const error = new Error('fake error'),
       onExceptionCallback = jasmine.createSpy('on exception callback'),
       queueRunner = new jasmineUnderTest.QueueRunner({
         onException: onExceptionCallback
@@ -597,7 +678,7 @@ describe('QueueRunner', function() {
   });
 
   it('calls exception handlers when an exception is thrown in a fn', function() {
-    var queueableFn = {
+    const queueableFn = {
         type: 'queueable',
         fn: function() {
           throw new Error('fake error');
@@ -615,7 +696,8 @@ describe('QueueRunner', function() {
   });
 
   it('continues running the functions even after an exception is thrown in an async spec', function() {
-    var queueableFn = {
+    const queueableFn = {
+        // eslint-disable-next-line no-unused-vars
         fn: function(done) {
           throw new Error('error');
         }
@@ -692,7 +774,7 @@ describe('QueueRunner', function() {
 
   describe('When configured to complete on first error', function() {
     it('skips to cleanup functions on the first exception', function() {
-      var queueableFn = {
+      const queueableFn = {
           fn: function() {
             throw new Error('error');
           }
@@ -718,7 +800,7 @@ describe('QueueRunner', function() {
     });
 
     it('does not skip when a cleanup function throws', function() {
-      var queueableFn = { fn: function() {} },
+      const queueableFn = { fn: function() {} },
         cleanupFn1 = {
           fn: function() {
             throw new Error('error');
@@ -748,27 +830,30 @@ describe('QueueRunner', function() {
       });
 
       it('skips to cleanup functions once the fn completes after an unhandled exception', function() {
-        var errorListeners = [],
+        const errorListeners = [];
-          queueableFn = {
+        let queueableFnDone;
-            fn: function(done) {
+        const queueableFn = {
-              queueableFnDone = done;
+          fn: function(done) {
+            queueableFnDone = done;
+          }
+        };
+        const nextQueueableFn = { fn: jasmine.createSpy('nextFunction') };
+        const cleanupFn = {
+          fn: jasmine.createSpy('cleanup'),
+          type: 'specCleanup'
+        };
+        const queueRunner = new jasmineUnderTest.QueueRunner({
+          globalErrors: {
+            pushListener: function(f) {
+              errorListeners.push(f);
+            },
+            popListener: function() {
+              errorListeners.pop();
             }
           },
-          nextQueueableFn = { fn: jasmine.createSpy('nextFunction') },
+          queueableFns: [queueableFn, nextQueueableFn, cleanupFn],
-          cleanupFn = { fn: jasmine.createSpy('cleanup'), type: 'specCleanup' },
+          SkipPolicy: jasmineUnderTest.CompleteOnFirstErrorSkipPolicy
-          queueRunner = new jasmineUnderTest.QueueRunner({
+        });
-            globalErrors: {
-              pushListener: function(f) {
-                errorListeners.push(f);
-              },
-              popListener: function() {
-                errorListeners.pop();
-              }
-            },
-            queueableFns: [queueableFn, nextQueueableFn, cleanupFn],
-            SkipPolicy: jasmineUnderTest.CompleteOnFirstErrorSkipPolicy
-          }),
-          queueableFnDone;
 
         queueRunner.execute();
         errorListeners[errorListeners.length - 1](new Error('error'));
@@ -779,7 +864,7 @@ describe('QueueRunner', function() {
       });
 
       it('skips to cleanup functions when next.fail is called', function() {
-        var queueableFn = {
+        const queueableFn = {
             fn: function(done) {
               done.fail('nope');
             }
@@ -798,7 +883,7 @@ describe('QueueRunner', function() {
       });
 
       it('skips to cleanup functions when next is called with an Error', function() {
-        var queueableFn = {
+        const queueableFn = {
             fn: function(done) {
               done(new Error('nope'));
             }
@@ -822,7 +907,7 @@ describe('QueueRunner', function() {
   });
 
   it('calls a provided complete callback when done', function() {
-    var queueableFn = { fn: jasmine.createSpy('fn') },
+    const queueableFn = { fn: jasmine.createSpy('fn') },
       completeCallback = jasmine.createSpy('completeCallback'),
       queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [queueableFn],
@@ -844,7 +929,7 @@ describe('QueueRunner', function() {
     });
 
     it('calls a provided stack clearing function when done', function() {
-      var asyncFn = {
+      const asyncFn = {
           fn: function(done) {
             done();
           }
@@ -873,16 +958,16 @@ describe('QueueRunner', function() {
 
   describe('when user context has not been defined', function() {
     beforeEach(function() {
-      var fn;
+      const fn = jasmine.createSpy('fn1');
 
-      this.fn = fn = jasmine.createSpy('fn1');
+      this.fn = fn;
       this.queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [{ fn: fn }]
       });
     });
 
     it('runs the functions on the scope of a UserContext', function() {
-      var context;
+      let context;
       this.fn.and.callFake(function() {
         context = this;
       });
@@ -895,9 +980,10 @@ describe('QueueRunner', function() {
 
   describe('when user context has been defined', function() {
     beforeEach(function() {
-      var fn, context;
+      const fn = jasmine.createSpy('fn1');
+      let context;
 
-      this.fn = fn = jasmine.createSpy('fn1');
+      this.fn = fn;
       this.context = context = new jasmineUnderTest.UserContext();
       this.queueRunner = new jasmineUnderTest.QueueRunner({
         queueableFns: [{ fn: fn }],
@@ -906,7 +992,7 @@ describe('QueueRunner', function() {
     });
 
     it('runs the functions on the scope of a UserContext', function() {
-      var context;
+      let context;
       this.fn.and.callFake(function() {
         context = this;
       });

spec/core/ReportDispatcherSpec.js

@@ -1,6 +1,6 @@
 describe('ReportDispatcher', function() {
   it('builds an interface of requested methods', function() {
-    var dispatcher = new jasmineUnderTest.ReportDispatcher([
+    const dispatcher = new jasmineUnderTest.ReportDispatcher([
       'foo',
       'bar',
       'baz'
@@ -12,7 +12,7 @@ describe('ReportDispatcher', function() {
   });
 
   it('dispatches requested methods to added reporters', function() {
-    var queueRunnerFactory = jasmine.createSpy('queueRunner'),
+    const queueRunnerFactory = jasmine.createSpy('queueRunner'),
       dispatcher = new jasmineUnderTest.ReportDispatcher(
         ['foo', 'bar'],
         queueRunnerFactory
@@ -36,7 +36,7 @@ describe('ReportDispatcher', function() {
       })
     );
 
-    var fns = queueRunnerFactory.calls.mostRecent().args[0].queueableFns;
+    let fns = queueRunnerFactory.calls.mostRecent().args[0].queueableFns;
     fns[0].fn();
     expect(reporter.foo).toHaveBeenCalledWith(123, 456);
     expect(reporter.foo.calls.mostRecent().object).toBe(reporter);
@@ -68,7 +68,7 @@ describe('ReportDispatcher', function() {
   });
 
   it("does not dispatch to a reporter if the reporter doesn't accept the method", function() {
-    var queueRunnerFactory = jasmine.createSpy('queueRunner'),
+    const queueRunnerFactory = jasmine.createSpy('queueRunner'),
       dispatcher = new jasmineUnderTest.ReportDispatcher(
         ['foo'],
         queueRunnerFactory
@@ -86,7 +86,7 @@ describe('ReportDispatcher', function() {
   });
 
   it("allows providing a fallback reporter in case there's no other reporter", function() {
-    var queueRunnerFactory = jasmine.createSpy('queueRunner'),
+    const queueRunnerFactory = jasmine.createSpy('queueRunner'),
       dispatcher = new jasmineUnderTest.ReportDispatcher(
         ['foo', 'bar'],
         queueRunnerFactory
@@ -104,13 +104,13 @@ describe('ReportDispatcher', function() {
       })
     );
 
-    var fns = queueRunnerFactory.calls.mostRecent().args[0].queueableFns;
+    const fns = queueRunnerFactory.calls.mostRecent().args[0].queueableFns;
     fns[0].fn();
     expect(reporter.foo).toHaveBeenCalledWith(123, 456);
   });
 
   it('does not call fallback reporting methods when another reporter is provided', function() {
-    var queueRunnerFactory = jasmine.createSpy('queueRunner'),
+    const queueRunnerFactory = jasmine.createSpy('queueRunner'),
       dispatcher = new jasmineUnderTest.ReportDispatcher(
         ['foo', 'bar'],
         queueRunnerFactory
@@ -130,14 +130,14 @@ describe('ReportDispatcher', function() {
       })
     );
 
-    var fns = queueRunnerFactory.calls.mostRecent().args[0].queueableFns;
+    const fns = queueRunnerFactory.calls.mostRecent().args[0].queueableFns;
     fns[0].fn();
     expect(reporter.foo).toHaveBeenCalledWith(123, 456);
     expect(fallbackReporter.foo).not.toHaveBeenCalledWith(123, 456);
   });
 
   it('allows registered reporters to be cleared', function() {
-    var queueRunnerFactory = jasmine.createSpy('queueRunner'),
+    const queueRunnerFactory = jasmine.createSpy('queueRunner'),
       dispatcher = new jasmineUnderTest.ReportDispatcher(
         ['foo', 'bar'],
         queueRunnerFactory
@@ -155,7 +155,7 @@ describe('ReportDispatcher', function() {
       })
     );
 
-    var fns = queueRunnerFactory.calls.mostRecent().args[0].queueableFns;
+    let fns = queueRunnerFactory.calls.mostRecent().args[0].queueableFns;
     fns[0].fn();
     expect(reporter1.foo).toHaveBeenCalledWith(123);
 

spec/core/SpecSpec.js

@@ -1,12 +1,12 @@
 describe('Spec', function() {
   it('#isPendingSpecException returns true for a pending spec exception', function() {
-    var e = new Error(jasmineUnderTest.Spec.pendingSpecExceptionMessage);
+    const e = new Error(jasmineUnderTest.Spec.pendingSpecExceptionMessage);
 
     expect(jasmineUnderTest.Spec.isPendingSpecException(e)).toBe(true);
   });
 
   it('#isPendingSpecException returns true for a pending spec exception (even when FF bug is present)', function() {
-    var fakeError = {
+    const fakeError = {
       toString: function() {
         return 'Error: ' + jasmineUnderTest.Spec.pendingSpecExceptionMessage;
       }
@@ -24,7 +24,7 @@ describe('Spec', function() {
   });
 
   it('#isPendingSpecException returns false for not a pending spec exception', function() {
-    var e = new Error('foo');
+    const e = new Error('foo');
 
     expect(jasmineUnderTest.Spec.isPendingSpecException(e)).toBe(false);
   });
@@ -34,7 +34,7 @@ describe('Spec', function() {
   });
 
   it('delegates execution to a QueueRunner', function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       spec = new jasmineUnderTest.Spec({
         description: 'my test',
         id: 'some-id',
@@ -48,7 +48,7 @@ describe('Spec', function() {
   });
 
   it('should call the start callback on execution', function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       startCallback = jasmine.createSpy('startCallback'),
       spec = new jasmineUnderTest.Spec({
         id: 123,
@@ -66,25 +66,25 @@ describe('Spec', function() {
   });
 
   it('should call the start callback on execution but before any befores are called', function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('fakeQueueRunner');
-      beforesWereCalled = false,
+    let beforesWereCalled = false;
-      startCallback = jasmine
+    const startCallback = jasmine
-        .createSpy('start-callback')
+      .createSpy('start-callback')
-        .and.callFake(function() {
+      .and.callFake(function() {
-          expect(beforesWereCalled).toBe(false);
+        expect(beforesWereCalled).toBe(false);
-        }),
-      spec = new jasmineUnderTest.Spec({
-        queueableFn: { fn: function() {} },
-        beforeFns: function() {
-          return [
-            function() {
-              beforesWereCalled = true;
-            }
-          ];
-        },
-        onStart: startCallback,
-        queueRunnerFactory: fakeQueueRunner
       });
+    const spec = new jasmineUnderTest.Spec({
+      queueableFn: { fn: function() {} },
+      beforeFns: function() {
+        return [
+          function() {
+            beforesWereCalled = true;
+          }
+        ];
+      },
+      onStart: startCallback,
+      queueRunnerFactory: fakeQueueRunner
+    });
 
     spec.execute();
 
@@ -93,7 +93,7 @@ describe('Spec', function() {
   });
 
   it('provides all before fns and after fns to be run', function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       before = jasmine.createSpy('before'),
       after = jasmine.createSpy('after'),
       queueableFn = {
@@ -112,7 +112,7 @@ describe('Spec', function() {
 
     spec.execute();
 
-    var options = fakeQueueRunner.calls.mostRecent().args[0];
+    const options = fakeQueueRunner.calls.mostRecent().args[0];
     expect(options.queueableFns).toEqual([
       { fn: jasmine.any(Function) },
       before,
@@ -126,7 +126,7 @@ describe('Spec', function() {
   });
 
   it("tells the queue runner that it's a leaf node", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
         beforeAndAfterFns: function() {
@@ -145,7 +145,7 @@ describe('Spec', function() {
   });
 
   it('is marked pending if created without a function body', function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       startCallback = jasmine.createSpy('startCallback'),
       resultCallback = jasmine.createSpy('resultCallback'),
       spec = new jasmineUnderTest.Spec({
@@ -159,7 +159,7 @@ describe('Spec', function() {
   });
 
   it('can be excluded at execution time by a parent', function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       startCallback = jasmine.createSpy('startCallback'),
       specBody = jasmine.createSpy('specBody'),
       resultCallback = jasmine.createSpy('resultCallback'),
@@ -186,7 +186,7 @@ describe('Spec', function() {
     );
     expect(specBody).not.toHaveBeenCalled();
 
-    var args = fakeQueueRunner.calls.mostRecent().args[0];
+    const args = fakeQueueRunner.calls.mostRecent().args[0];
     args.queueableFns[0].fn();
     expect(startCallback).toHaveBeenCalled();
     args.queueableFns[args.queueableFns.length - 1].fn();
@@ -196,7 +196,7 @@ describe('Spec', function() {
   });
 
   it('can be marked pending, but still calls callbacks when executed', function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
       startCallback = jasmine.createSpy('startCallback'),
       resultCallback = jasmine.createSpy('resultCallback'),
       spec = new jasmineUnderTest.Spec({
@@ -218,7 +218,7 @@ describe('Spec', function() {
 
     expect(fakeQueueRunner).toHaveBeenCalled();
 
-    var args = fakeQueueRunner.calls.mostRecent().args[0];
+    const args = fakeQueueRunner.calls.mostRecent().args[0];
     args.queueableFns[0].fn();
     expect(startCallback).toHaveBeenCalled();
     args.queueableFns[1].fn('things');
@@ -241,7 +241,7 @@ describe('Spec', function() {
   });
 
   it('should call the done callback on execution complete', function() {
-    var done = jasmine.createSpy('done callback'),
+    const done = jasmine.createSpy('done callback'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
         catchExceptions: function() {
@@ -259,7 +259,7 @@ describe('Spec', function() {
   });
 
   it('should call the done callback with an error if the spec is failed', function() {
-    var done = jasmine.createSpy('done callback'),
+    const done = jasmine.createSpy('done callback'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
         catchExceptions: function() {
@@ -280,31 +280,34 @@ describe('Spec', function() {
   });
 
   it('should report the duration of the test', function() {
-    var timer = jasmine.createSpyObj('timer', { start: null, elapsed: 77000 }),
+    const timer = jasmine.createSpyObj('timer', {
-      spec = new jasmineUnderTest.Spec({
+      start: null,
-        queueableFn: { fn: jasmine.createSpy('spec body') },
+      elapsed: 77000
-        catchExceptions: function() {
+    });
-          return false;
+    let duration = undefined;
-        },
+    const spec = new jasmineUnderTest.Spec({
-        resultCallback: function(result) {
+      queueableFn: { fn: jasmine.createSpy('spec body') },
-          duration = result.duration;
+      catchExceptions: function() {
-        },
+        return false;
-        queueRunnerFactory: function(config) {
+      },
-          config.queueableFns.forEach(function(qf) {
+      resultCallback: function(result) {
-            qf.fn();
+        duration = result.duration;
-          });
+      },
-          config.onComplete();
+      queueRunnerFactory: function(config) {
-        },
+        config.queueableFns.forEach(function(qf) {
-        timer: timer
+          qf.fn();
-      }),
+        });
-      duration = undefined;
+        config.onComplete();
+      },
+      timer: timer
+    });
 
     spec.execute(function() {});
     expect(duration).toBe(77000);
   });
 
   it('should report properties set during the test', function() {
-    var done = jasmine.createSpy('done callback'),
+    const done = jasmine.createSpy('done callback'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: jasmine.createSpy('spec body') },
         catchExceptions: function() {
@@ -321,42 +324,39 @@ describe('Spec', function() {
   });
 
   it('#status returns passing by default', function() {
-    var spec = new jasmineUnderTest.Spec({
+    const spec = new jasmineUnderTest.Spec({
       queueableFn: { fn: jasmine.createSpy('spec body') }
     });
     expect(spec.status()).toBe('passed');
   });
 
   it('#status returns passed if all expectations in the spec have passed', function() {
-    var spec = new jasmineUnderTest.Spec({
+    const spec = new jasmineUnderTest.Spec({
       queueableFn: { fn: jasmine.createSpy('spec body') }
     });
-    spec.addExpectationResult(true);
+    spec.addExpectationResult(true, {});
     expect(spec.status()).toBe('passed');
   });
 
   it('#status returns failed if any expectations in the spec have failed', function() {
-    var spec = new jasmineUnderTest.Spec({
+    const spec = new jasmineUnderTest.Spec({
       queueableFn: { fn: jasmine.createSpy('spec body') }
     });
-    spec.addExpectationResult(true);
+    spec.addExpectationResult(true, {});
-    spec.addExpectationResult(false);
+    spec.addExpectationResult(false, {});
     expect(spec.status()).toBe('failed');
   });
 
   it('keeps track of passed and failed expectations', function() {
-    var fakeQueueRunner = jasmine.createSpy('queueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('queueRunner'),
       resultCallback = jasmine.createSpy('resultCallback'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: jasmine.createSpy('spec body') },
-        expectationResultFactory: function(data) {
-          return data;
-        },
         queueRunnerFactory: fakeQueueRunner,
         resultCallback: resultCallback
       });
-    spec.addExpectationResult(true, 'expectation1');
+    spec.addExpectationResult(true, { message: 'expectation1' });
-    spec.addExpectationResult(false, 'expectation2');
+    spec.addExpectationResult(false, { message: 'expectation2' });
 
     spec.execute();
 
@@ -364,29 +364,26 @@ describe('Spec', function() {
     fns[fns.length - 1].fn();
 
     expect(resultCallback.calls.first().args[0].passedExpectations).toEqual([
-      'expectation1'
+      jasmine.objectContaining({ message: 'expectation1' })
     ]);
     expect(resultCallback.calls.first().args[0].failedExpectations).toEqual([
-      'expectation2'
+      jasmine.objectContaining({ message: 'expectation2' })
     ]);
   });
 
   it("throws an ExpectationFailed error upon receiving a failed expectation when 'throwOnExpectationFailure' is set", function() {
-    var fakeQueueRunner = jasmine.createSpy('queueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('queueRunner'),
       resultCallback = jasmine.createSpy('resultCallback'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
-        expectationResultFactory: function(data) {
-          return data;
-        },
         queueRunnerFactory: fakeQueueRunner,
         resultCallback: resultCallback,
         throwOnExpectationFailure: true
       });
 
-    spec.addExpectationResult(true, 'passed');
+    spec.addExpectationResult(true, { message: 'passed' });
     expect(function() {
-      spec.addExpectationResult(false, 'failed');
+      spec.addExpectationResult(false, { message: 'failed' });
     }).toThrowError(jasmineUnderTest.errors.ExpectationFailed);
 
     spec.execute();
@@ -394,20 +391,104 @@ describe('Spec', function() {
     const fns = fakeQueueRunner.calls.mostRecent().args[0].queueableFns;
     fns[fns.length - 1].fn();
     expect(resultCallback.calls.first().args[0].passedExpectations).toEqual([
-      'passed'
+      jasmine.objectContaining({ message: 'passed' })
     ]);
     expect(resultCallback.calls.first().args[0].failedExpectations).toEqual([
-      'failed'
+      jasmine.objectContaining({ message: 'failed' })
     ]);
   });
 
+  it('forwards late expectation failures to onLateError', function() {
+    const onLateError = jasmine.createSpy('onLateError');
+    const spec = new jasmineUnderTest.Spec({
+      onLateError,
+      queueableFn: { fn: function() {} }
+    });
+    const data = {
+      matcherName: '',
+      passed: false,
+      expected: '',
+      actual: '',
+      error: new Error('nope')
+    };
+
+    spec.reportedDone = true;
+    spec.addExpectationResult(false, data, true);
+
+    expect(onLateError).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        message: jasmine.stringMatching(/^Error: nope/)
+      })
+    );
+    expect(spec.result.failedExpectations).toEqual([]);
+  });
+
+  it('does not forward non-late expectation failures to onLateError', function() {
+    const onLateError = jasmine.createSpy('onLateError');
+    const spec = new jasmineUnderTest.Spec({
+      onLateError,
+      queueableFn: { fn: function() {} }
+    });
+    const data = {
+      matcherName: '',
+      passed: false,
+      expected: '',
+      actual: '',
+      error: new Error('nope')
+    };
+
+    spec.addExpectationResult(false, data, true);
+
+    expect(onLateError).not.toHaveBeenCalled();
+  });
+
+  it('forwards late handleException calls to onLateError', function() {
+    const onLateError = jasmine.createSpy('onLateError');
+    const spec = new jasmineUnderTest.Spec({
+      onLateError,
+      queueableFn: { fn: function() {} }
+    });
+
+    spec.reportedDone = true;
+    spec.handleException(new Error('oops'));
+
+    expect(onLateError).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        message: jasmine.stringMatching(/^Error: oops/)
+      })
+    );
+    expect(spec.result.failedExpectations).toEqual([]);
+  });
+
+  it('does not forward non-late handleException calls to onLateError', function() {
+    const onLateError = jasmine.createSpy('onLateError');
+    const spec = new jasmineUnderTest.Spec({
+      onLateError,
+      queueableFn: { fn: function() {} }
+    });
+    const error = new Error('oops');
+
+    spec.handleException(error);
+
+    expect(onLateError).not.toHaveBeenCalled();
+    expect(spec.result.failedExpectations.length).toEqual(1);
+  });
+
+  it('clears the reportedDone flag when reset', function() {
+    const spec = new jasmineUnderTest.Spec({
+      queueableFn: { fn: function() {} }
+    });
+    spec.reportedDone = true;
+
+    spec.reset();
+
+    expect(spec.reportedDone).toBeFalse();
+  });
+
   it('does not throw an ExpectationFailed error when handling an error', function() {
-    var resultCallback = jasmine.createSpy('resultCallback'),
+    const resultCallback = jasmine.createSpy('resultCallback'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
-        expectationResultFactory: function(data) {
-          return data;
-        },
         queueRunnerFactory: function(attrs) {
           attrs.onComplete();
         },
@@ -415,15 +496,15 @@ describe('Spec', function() {
         throwOnExpectationFailure: true
       });
 
-    spec.onException('failing exception');
+    spec.handleException('failing exception');
   });
 
   it('can return its full name', function() {
-    var specNameSpy = jasmine
+    const specNameSpy = jasmine
       .createSpy('specNameSpy')
       .and.returnValue('expected val');
 
-    var spec = new jasmineUnderTest.Spec({
+    const spec = new jasmineUnderTest.Spec({
       getSpecName: specNameSpy,
       queueableFn: { fn: null }
     });
@@ -434,7 +515,7 @@ describe('Spec', function() {
 
   describe('when a spec is marked pending during execution', function() {
     it('should mark the spec as pending', function() {
-      var fakeQueueRunner = function(opts) {
+      const fakeQueueRunner = function(opts) {
           opts.onException(
             new Error(jasmineUnderTest.Spec.pendingSpecExceptionMessage)
           );
@@ -453,7 +534,7 @@ describe('Spec', function() {
     });
 
     it('should set the pendingReason', function() {
-      var fakeQueueRunner = function(opts) {
+      const fakeQueueRunner = function(opts) {
           opts.onException(
             new Error(
               jasmineUnderTest.Spec.pendingSpecExceptionMessage +
@@ -476,55 +557,50 @@ describe('Spec', function() {
   });
 
   it('should log a failure when handling an exception', function() {
-    var fakeQueueRunner = jasmine.createSpy('queueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('queueRunner'),
       resultCallback = jasmine.createSpy('resultCallback'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
-        expectationResultFactory: function(data) {
-          return data;
-        },
         queueRunnerFactory: fakeQueueRunner,
         resultCallback: resultCallback
       });
 
-    spec.onException('foo');
+    spec.handleException('foo');
     spec.execute();
 
-    var args = fakeQueueRunner.calls.mostRecent().args[0];
+    const args = fakeQueueRunner.calls.mostRecent().args[0];
     args.queueableFns[args.queueableFns.length - 1].fn();
     expect(resultCallback.calls.first().args[0].failedExpectations).toEqual([
       {
-        error: 'foo',
+        message: 'foo thrown',
         matcherName: '',
         passed: false,
         expected: '',
-        actual: ''
+        actual: '',
+        stack: null
       }
     ]);
   });
 
   it('should not log an additional failure when handling an ExpectationFailed error', function() {
-    var fakeQueueRunner = jasmine.createSpy('queueRunner'),
+    const fakeQueueRunner = jasmine.createSpy('queueRunner'),
       resultCallback = jasmine.createSpy('resultCallback'),
       spec = new jasmineUnderTest.Spec({
         queueableFn: { fn: function() {} },
-        expectationResultFactory: function(data) {
-          return data;
-        },
         queueRunnerFactory: fakeQueueRunner,
         resultCallback: resultCallback
       });
 
-    spec.onException(new jasmineUnderTest.errors.ExpectationFailed());
+    spec.handleException(new jasmineUnderTest.errors.ExpectationFailed());
     spec.execute();
 
-    var args = fakeQueueRunner.calls.mostRecent().args[0];
+    const args = fakeQueueRunner.calls.mostRecent().args[0];
     args.queueableFns[args.queueableFns.length - 1].fn();
     expect(resultCallback.calls.first().args[0].failedExpectations).toEqual([]);
   });
 
   it('treats multiple done calls as late errors', function() {
-    var queueRunnerFactory = jasmine.createSpy('queueRunnerFactory'),
+    const queueRunnerFactory = jasmine.createSpy('queueRunnerFactory'),
       onLateError = jasmine.createSpy('onLateError'),
       spec = new jasmineUnderTest.Spec({
         onLateError: onLateError,
@@ -550,7 +626,7 @@ describe('Spec', function() {
 
   describe('#trace', function() {
     it('adds the messages to the result', function() {
-      var timer = jasmine.createSpyObj('timer', ['start', 'elapsed']),
+      const timer = jasmine.createSpyObj('timer', ['start', 'elapsed']),
         spec = new jasmineUnderTest.Spec({
           queueableFn: {
             fn: function() {}
@@ -578,7 +654,7 @@ describe('Spec', function() {
 
     describe('When the spec passes', function() {
       it('omits the messages from the reported result', function() {
-        var resultCallback = jasmine.createSpy('resultCallback'),
+        const resultCallback = jasmine.createSpy('resultCallback'),
           spec = new jasmineUnderTest.Spec({
             queueableFn: {
               fn: function() {}
@@ -601,7 +677,7 @@ describe('Spec', function() {
       });
 
       it('removes the messages to save memory', function() {
-        var resultCallback = jasmine.createSpy('resultCallback'),
+        const resultCallback = jasmine.createSpy('resultCallback'),
           spec = new jasmineUnderTest.Spec({
             queueableFn: {
               fn: function() {}
@@ -624,7 +700,7 @@ describe('Spec', function() {
 
     describe('When the spec fails', function() {
       it('includes the messages in the reported result', function() {
-        var resultCallback = jasmine.createSpy('resultCallback'),
+        const resultCallback = jasmine.createSpy('resultCallback'),
           timer = jasmine.createSpyObj('timer', ['start', 'elapsed']),
           spec = new jasmineUnderTest.Spec({
             queueableFn: {
@@ -633,7 +709,7 @@ describe('Spec', function() {
             resultCallback: resultCallback,
             queueRunnerFactory: function(config) {
               spec.debugLog('msg');
-              spec.onException(new Error('nope'));
+              spec.handleException(new Error('nope'));
               for (const fn of config.queueableFns) {
                 fn.fn();
               }

spec/core/SpyRegistrySpec.js

@@ -5,7 +5,7 @@ describe('SpyRegistry', function() {
 
   describe('#spyOn', function() {
     it('checks for the existence of the object', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry({
+      const spyRegistry = new jasmineUnderTest.SpyRegistry({
         createSpy: createSpy
       });
       expect(function() {
@@ -14,7 +14,7 @@ describe('SpyRegistry', function() {
     });
 
     it('checks that a method name was passed', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry(),
+      const spyRegistry = new jasmineUnderTest.SpyRegistry(),
         subject = {};
 
       expect(function() {
@@ -23,14 +23,14 @@ describe('SpyRegistry', function() {
     });
 
     it('checks that the object is not `null`', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry();
+      const spyRegistry = new jasmineUnderTest.SpyRegistry();
       expect(function() {
         spyRegistry.spyOn(null, 'pants');
       }).toThrowError(/could not find an object/);
     });
 
     it('checks that the method name is not `null`', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry(),
+      const spyRegistry = new jasmineUnderTest.SpyRegistry(),
         subject = {};
 
       expect(function() {
@@ -39,7 +39,7 @@ describe('SpyRegistry', function() {
     });
 
     it('checks for the existence of the method', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry(),
+      const spyRegistry = new jasmineUnderTest.SpyRegistry(),
         subject = {};
 
       expect(function() {
@@ -48,7 +48,7 @@ describe('SpyRegistry', function() {
     });
 
     it('checks if it has already been spied upon', function() {
-      var spies = [],
+      const spies = [],
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
             return spies;
@@ -65,7 +65,7 @@ describe('SpyRegistry', function() {
     });
 
     it('checks if it can be spied upon', function() {
-      var scope = {};
+      const scope = {};
 
       function myFunc() {
         return 1;
@@ -77,7 +77,7 @@ describe('SpyRegistry', function() {
         }
       });
 
-      var spies = [],
+      const spies = [],
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
             return spies;
@@ -95,7 +95,7 @@ describe('SpyRegistry', function() {
     });
 
     it('overrides the method on the object and returns the spy', function() {
-      var originalFunctionWasCalled = false,
+      const originalFunctionWasCalled = false,
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: createSpy
         }),
@@ -105,7 +105,7 @@ describe('SpyRegistry', function() {
           }
         };
 
-      var spy = spyRegistry.spyOn(subject, 'spiedFunc');
+      const spy = spyRegistry.spyOn(subject, 'spiedFunc');
 
       expect(subject.spiedFunc).toEqual(spy);
       subject.spiedFunc();
@@ -115,14 +115,14 @@ describe('SpyRegistry', function() {
 
   describe('#spyOnProperty', function() {
     it('checks for the existence of the object', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry();
+      const spyRegistry = new jasmineUnderTest.SpyRegistry();
       expect(function() {
         spyRegistry.spyOnProperty(void 0, 'pants');
       }).toThrowError(/could not find an object/);
     });
 
     it('checks that a property name was passed', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry(),
+      const spyRegistry = new jasmineUnderTest.SpyRegistry(),
         subject = {};
 
       expect(function() {
@@ -131,7 +131,7 @@ describe('SpyRegistry', function() {
     });
 
     it('checks for the existence of the method', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry(),
+      const spyRegistry = new jasmineUnderTest.SpyRegistry(),
         subject = {};
 
       expect(function() {
@@ -140,7 +140,7 @@ describe('SpyRegistry', function() {
     });
 
     it('checks for the existence of access type', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry(),
+      const spyRegistry = new jasmineUnderTest.SpyRegistry(),
         subject = {};
 
       Object.defineProperty(subject, 'pants', {
@@ -156,7 +156,7 @@ describe('SpyRegistry', function() {
     });
 
     it('checks if it can be spied upon', function() {
-      var subject = {};
+      const subject = {};
 
       Object.defineProperty(subject, 'myProp', {
         get: function() {}
@@ -167,7 +167,7 @@ describe('SpyRegistry', function() {
         configurable: true
       });
 
-      var spyRegistry = new jasmineUnderTest.SpyRegistry();
+      const spyRegistry = new jasmineUnderTest.SpyRegistry();
 
       expect(function() {
         spyRegistry.spyOnProperty(subject, 'myProp');
@@ -179,7 +179,7 @@ describe('SpyRegistry', function() {
     });
 
     it('overrides the property getter on the object and returns the spy', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry({
+      const spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: createSpy
         }),
         subject = {},
@@ -194,8 +194,8 @@ describe('SpyRegistry', function() {
 
       expect(subject.spiedProperty).toEqual(returnValue);
 
-      var spy = spyRegistry.spyOnProperty(subject, 'spiedProperty');
+      const spy = spyRegistry.spyOnProperty(subject, 'spiedProperty');
-      var getter = Object.getOwnPropertyDescriptor(subject, 'spiedProperty')
+      const getter = Object.getOwnPropertyDescriptor(subject, 'spiedProperty')
         .get;
 
       expect(getter).toEqual(spy);
@@ -203,7 +203,7 @@ describe('SpyRegistry', function() {
     });
 
     it('overrides the property setter on the object and returns the spy', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry({
+      const spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: createSpy
         }),
         subject = {},
@@ -217,8 +217,8 @@ describe('SpyRegistry', function() {
         configurable: true
       });
 
-      var spy = spyRegistry.spyOnProperty(subject, 'spiedProperty', 'set');
+      const spy = spyRegistry.spyOnProperty(subject, 'spiedProperty', 'set');
-      var setter = Object.getOwnPropertyDescriptor(subject, 'spiedProperty')
+      const setter = Object.getOwnPropertyDescriptor(subject, 'spiedProperty')
         .set;
 
       expect(subject.spiedProperty).toEqual(returnValue);
@@ -227,7 +227,7 @@ describe('SpyRegistry', function() {
 
     describe('when the property is already spied upon', function() {
       it('throws an error if respy is not allowed', function() {
-        var spyRegistry = new jasmineUnderTest.SpyRegistry({
+        const spyRegistry = new jasmineUnderTest.SpyRegistry({
             createSpy: createSpy
           }),
           subject = {};
@@ -247,7 +247,7 @@ describe('SpyRegistry', function() {
       });
 
       it('returns the original spy if respy is allowed', function() {
-        var spyRegistry = new jasmineUnderTest.SpyRegistry({
+        const spyRegistry = new jasmineUnderTest.SpyRegistry({
             createSpy: createSpy
           }),
           subject = {};
@@ -261,7 +261,7 @@ describe('SpyRegistry', function() {
           configurable: true
         });
 
-        var originalSpy = spyRegistry.spyOnProperty(subject, 'spiedProp');
+        const originalSpy = spyRegistry.spyOnProperty(subject, 'spiedProp');
 
         expect(spyRegistry.spyOnProperty(subject, 'spiedProp')).toBe(
           originalSpy
@@ -272,33 +272,33 @@ describe('SpyRegistry', function() {
 
   describe('#spyOnAllFunctions', function() {
     it('checks for the existence of the object', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry();
+      const spyRegistry = new jasmineUnderTest.SpyRegistry();
       expect(function() {
         spyRegistry.spyOnAllFunctions(void 0);
       }).toThrowError(/spyOnAllFunctions could not find an object to spy upon/);
     });
 
     it('overrides all writable and configurable functions of the object and its parents', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry({
+      const spyRegistry = new jasmineUnderTest.SpyRegistry({
         createSpy: function() {
           return 'I am a spy';
         }
       });
-      var createNoop = function() {
+      const createNoop = function() {
         return function() {
           /**/
         };
       };
-      var noop1 = createNoop();
+      const noop1 = createNoop();
-      var noop2 = createNoop();
+      const noop2 = createNoop();
-      var noop3 = createNoop();
+      const noop3 = createNoop();
-      var noop4 = createNoop();
+      const noop4 = createNoop();
-      var noop5 = createNoop();
+      const noop5 = createNoop();
 
-      var parent = {
+      const parent = {
         parentSpied1: noop1
       };
-      var subject = Object.create(parent);
+      const subject = Object.create(parent);
       Object.defineProperty(subject, 'spied1', {
         value: noop1,
         writable: true,
@@ -311,7 +311,7 @@ describe('SpyRegistry', function() {
         configurable: true,
         enumerable: true
       });
-      var _spied3 = noop3;
+      let _spied3 = noop3;
       Object.defineProperty(subject, 'spied3', {
         configurable: true,
         set: function(val) {
@@ -337,7 +337,7 @@ describe('SpyRegistry', function() {
       });
       Object.defineProperty(subject, 'notSpied4', {
         configurable: false,
-        set: function(val) {
+        set: function() {
           /**/
         },
         get: function() {
@@ -353,7 +353,7 @@ describe('SpyRegistry', function() {
       });
       subject.notSpied6 = 6;
 
-      var spiedObject = spyRegistry.spyOnAllFunctions(subject);
+      const spiedObject = spyRegistry.spyOnAllFunctions(subject);
 
       expect(subject.parentSpied1).toBe('I am a spy');
       expect(subject.notSpied2).toBe(noop2);
@@ -369,21 +369,21 @@ describe('SpyRegistry', function() {
     });
 
     it('overrides prototype methods on the object', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry({
+      const spyRegistry = new jasmineUnderTest.SpyRegistry({
         createSpy: function() {
           return 'I am a spy';
         }
       });
 
-      var noop1 = function() {};
+      const noop1 = function() {};
-      var noop2 = function() {};
+      const noop2 = function() {};
 
-      var MyClass = function() {
+      const MyClass = function() {
         this.spied1 = noop1;
       };
       MyClass.prototype.spied2 = noop2;
 
-      var subject = new MyClass();
+      const subject = new MyClass();
       spyRegistry.spyOnAllFunctions(subject);
 
       expect(subject.spied1).toBe('I am a spy');
@@ -392,12 +392,12 @@ describe('SpyRegistry', function() {
     });
 
     it('does not override non-enumerable properties (like Object.prototype methods)', function() {
-      var spyRegistry = new jasmineUnderTest.SpyRegistry({
+      const spyRegistry = new jasmineUnderTest.SpyRegistry({
         createSpy: function() {
           return 'I am a spy';
         }
       });
-      var subject = {
+      const subject = {
         spied1: function() {}
       };
 
@@ -409,12 +409,12 @@ describe('SpyRegistry', function() {
     });
     describe('when includeNonEnumerable is true', function() {
       it('does not override Object.prototype methods', function() {
-        var spyRegistry = new jasmineUnderTest.SpyRegistry({
+        const spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: function() {
             return 'I am a spy';
           }
         });
-        var subject = {
+        const subject = {
           spied1: function() {}
         };
 
@@ -426,12 +426,12 @@ describe('SpyRegistry', function() {
       });
 
       it('overrides non-enumerable properties', function() {
-        var spyRegistry = new jasmineUnderTest.SpyRegistry({
+        const spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: function() {
             return 'I am a spy';
           }
         });
-        var subject = {
+        const subject = {
           spied1: function() {},
           spied2: function() {}
         };
@@ -449,12 +449,12 @@ describe('SpyRegistry', function() {
       });
 
       it('should not spy on non-enumerable functions named constructor', function() {
-        var spyRegistry = new jasmineUnderTest.SpyRegistry({
+        const spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: function() {
             return 'I am a spy';
           }
         });
-        var subject = {
+        const subject = {
           constructor: function() {}
         };
 
@@ -470,12 +470,12 @@ describe('SpyRegistry', function() {
       });
 
       it('should spy on enumerable functions named constructor', function() {
-        var spyRegistry = new jasmineUnderTest.SpyRegistry({
+        const spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: function() {
             return 'I am a spy';
           }
         });
-        var subject = {
+        const subject = {
           constructor: function() {}
         };
 
@@ -485,13 +485,13 @@ describe('SpyRegistry', function() {
       });
 
       it('should not throw an exception if we try and access strict mode restricted properties', function() {
-        var spyRegistry = new jasmineUnderTest.SpyRegistry({
+        const spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: function() {
             return 'I am a spy';
           }
         });
-        var subject = function() {};
+        const subject = function() {};
-        var fn = function() {
+        const fn = function() {
           spyRegistry.spyOnAllFunctions(subject, true);
         };
 
@@ -499,24 +499,24 @@ describe('SpyRegistry', function() {
       });
 
       it('should not spy on properties which are more permissable further up the prototype chain', function() {
-        var spyRegistry = new jasmineUnderTest.SpyRegistry({
+        const spyRegistry = new jasmineUnderTest.SpyRegistry({
           createSpy: function() {
             return 'I am a spy';
           }
         });
-        var subjectParent = Object.defineProperty({}, 'sharedProp', {
+        const subjectParent = Object.defineProperty({}, 'sharedProp', {
           value: function() {},
           writable: true,
           configurable: true
         });
 
-        var subject = Object.create(subjectParent);
+        const subject = Object.create(subjectParent);
 
         Object.defineProperty(subject, 'sharedProp', {
           value: function() {}
         });
 
-        var fn = function() {
+        const fn = function() {
           spyRegistry.spyOnAllFunctions(subject, true);
         };
 
@@ -528,7 +528,7 @@ describe('SpyRegistry', function() {
 
   describe('#clearSpies', function() {
     it('restores the original functions on the spied-upon objects', function() {
-      var spies = [],
+      const spies = [],
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
             return spies;
@@ -545,7 +545,7 @@ describe('SpyRegistry', function() {
     });
 
     it('restores the original functions, even when that spy has been replace and re-spied upon', function() {
-      var spies = [],
+      const spies = [],
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
             return spies;
@@ -569,7 +569,7 @@ describe('SpyRegistry', function() {
     });
 
     it("does not add a property that the spied-upon object didn't originally have", function() {
-      var spies = [],
+      const spies = [],
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
             return spies;
@@ -579,7 +579,7 @@ describe('SpyRegistry', function() {
         originalFunction = function() {},
         subjectParent = { spiedFunc: originalFunction };
 
-      var subject = Object.create(subjectParent);
+      const subject = Object.create(subjectParent);
 
       expect(subject.hasOwnProperty('spiedFunc')).toBe(false);
 
@@ -591,7 +591,7 @@ describe('SpyRegistry', function() {
     });
 
     it("restores the original function when it's inherited and cannot be deleted", function() {
-      var spies = [],
+      const spies = [],
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
             return spies;
@@ -601,7 +601,7 @@ describe('SpyRegistry', function() {
         originalFunction = function() {},
         subjectParent = { spiedFunc: originalFunction };
 
-      var subject = Object.create(subjectParent);
+      const subject = Object.create(subjectParent);
 
       spyRegistry.spyOn(subject, 'spiedFunc');
 
@@ -619,7 +619,7 @@ describe('SpyRegistry', function() {
       function FakeWindow() {}
       FakeWindow.prototype.onerror = function() {};
 
-      var spies = [],
+      const spies = [],
         global = new FakeWindow(),
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
@@ -638,7 +638,7 @@ describe('SpyRegistry', function() {
 
   describe('spying on properties', function() {
     it('restores the original properties on the spied-upon objects', function() {
-      var spies = [],
+      const spies = [],
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
             return spies;
@@ -662,7 +662,7 @@ describe('SpyRegistry', function() {
     });
 
     it("does not add a property that the spied-upon object didn't originally have", function() {
-      var spies = [],
+      const spies = [],
         spyRegistry = new jasmineUnderTest.SpyRegistry({
           currentSpies: function() {
             return spies;
@@ -679,7 +679,7 @@ describe('SpyRegistry', function() {
         configurable: true
       });
 
-      var subject = Object.create(subjectParent);
+      const subject = Object.create(subjectParent);
 
       expect(subject.hasOwnProperty('spiedProp')).toBe(false);
 

spec/core/SpySpec.js

@@ -1,5 +1,5 @@
 describe('Spies', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -10,7 +10,7 @@ describe('Spies', function() {
   });
 
   describe('createSpy', function() {
-    var TestClass;
+    let TestClass;
 
     beforeEach(function() {
       TestClass = function() {};
@@ -19,7 +19,7 @@ describe('Spies', function() {
     });
 
     it('preserves the properties of the spied function', function() {
-      var spy = env.createSpy(
+      const spy = env.createSpy(
         TestClass.prototype,
         TestClass.prototype.someFunction
       );
@@ -28,8 +28,8 @@ describe('Spies', function() {
     });
 
     it('should allow you to omit the name argument and only pass the originalFn argument', function() {
-      var fn = function test() {};
+      const fn = function test() {};
-      var spy = env.createSpy(fn);
+      const spy = env.createSpy(fn);
 
       expect(spy.and.identity).toEqual('test');
     });
@@ -45,7 +45,7 @@ describe('Spies', function() {
     });
 
     it('adds a spyStrategy and callTracker to the spy', function() {
-      var spy = env.createSpy(
+      const spy = env.createSpy(
         TestClass.prototype,
         TestClass.prototype.someFunction
       );
@@ -55,11 +55,11 @@ describe('Spies', function() {
     });
 
     it('tracks the argument of calls', function() {
-      var spy = env.createSpy(
+      const spy = env.createSpy(
         TestClass.prototype,
         TestClass.prototype.someFunction
       );
-      var trackSpy = spyOn(spy.calls, 'track');
+      const trackSpy = spyOn(spy.calls, 'track');
 
       spy('arg');
 
@@ -67,24 +67,24 @@ describe('Spies', function() {
     });
 
     it('tracks the context of calls', function() {
-      var spy = env.createSpy(
+      const spy = env.createSpy(
         TestClass.prototype,
         TestClass.prototype.someFunction
       );
-      var trackSpy = spyOn(spy.calls, 'track');
+      const trackSpy = spyOn(spy.calls, 'track');
 
-      var contextObject = { spyMethod: spy };
+      const contextObject = { spyMethod: spy };
       contextObject.spyMethod();
 
       expect(trackSpy.calls.mostRecent().args[0].object).toEqual(contextObject);
     });
 
     it('tracks the return value of calls', function() {
-      var spy = env.createSpy(
+      const spy = env.createSpy(
         TestClass.prototype,
         TestClass.prototype.someFunction
       );
-      var trackSpy = spyOn(spy.calls, 'track');
+      const trackSpy = spyOn(spy.calls, 'track');
 
       spy.and.returnValue('return value');
       spy();
@@ -95,18 +95,24 @@ describe('Spies', function() {
     });
 
     it('preserves arity of original function', function() {
-      var functions = [
+      const functions = [
         function nullary() {},
+        // eslint-disable-next-line no-unused-vars
         function unary(arg) {},
+        // eslint-disable-next-line no-unused-vars
         function binary(arg1, arg2) {},
+        // eslint-disable-next-line no-unused-vars
         function ternary(arg1, arg2, arg3) {},
+        // eslint-disable-next-line no-unused-vars
         function quaternary(arg1, arg2, arg3, arg4) {},
+        // eslint-disable-next-line no-unused-vars
         function quinary(arg1, arg2, arg3, arg4, arg5) {},
+        // eslint-disable-next-line no-unused-vars
         function senary(arg1, arg2, arg3, arg4, arg5, arg6) {}
       ];
 
-      for (var arity = 0; arity < functions.length; arity++) {
+      for (let arity = 0; arity < functions.length; arity++) {
-        var someFunction = functions[arity],
+        const someFunction = functions[arity],
           spy = env.createSpy(someFunction.name, someFunction);
 
         expect(spy.length).toEqual(arity);
@@ -116,7 +122,7 @@ describe('Spies', function() {
 
   describe('createSpyObj', function() {
     it('should create an object with spy methods and corresponding return values when you call jasmine.createSpyObj() with an object', function() {
-      var spyObj = env.createSpyObj('BaseName', {
+      const spyObj = env.createSpyObj('BaseName', {
         method1: 42,
         method2: 'special sauce'
       });
@@ -129,7 +135,7 @@ describe('Spies', function() {
     });
 
     it('should create an object with a bunch of spy methods when you call jasmine.createSpyObj()', function() {
-      var spyObj = env.createSpyObj('BaseName', ['method1', 'method2']);
+      const spyObj = env.createSpyObj('BaseName', ['method1', 'method2']);
 
       expect(spyObj).toEqual({
         method1: jasmine.any(Function),
@@ -140,7 +146,7 @@ describe('Spies', function() {
     });
 
     it('should allow you to omit the baseName', function() {
-      var spyObj = env.createSpyObj(['method1', 'method2']);
+      const spyObj = env.createSpyObj(['method1', 'method2']);
 
       expect(spyObj).toEqual({
         method1: jasmine.any(Function),
@@ -175,20 +181,20 @@ describe('Spies', function() {
     });
 
     it('creates an object with spy properties if a second list is passed', function() {
-      var spyObj = env.createSpyObj('base', ['method1'], ['prop1']);
+      const spyObj = env.createSpyObj('base', ['method1'], ['prop1']);
 
       expect(spyObj).toEqual({
         method1: jasmine.any(Function),
         prop1: undefined
       });
 
-      var descriptor = Object.getOwnPropertyDescriptor(spyObj, 'prop1');
+      const descriptor = Object.getOwnPropertyDescriptor(spyObj, 'prop1');
       expect(descriptor.get.and.identity).toEqual('base.prop1.get');
       expect(descriptor.set.and.identity).toEqual('base.prop1.set');
     });
 
     it('creates an object with property names and return values if second object is passed', function() {
-      var spyObj = env.createSpyObj('base', ['method1'], {
+      const spyObj = env.createSpyObj('base', ['method1'], {
         prop1: 'foo',
         prop2: 37
       });
@@ -209,7 +215,7 @@ describe('Spies', function() {
     });
 
     it('allows base name to be omitted when assigning methods and properties', function() {
-      var spyObj = env.createSpyObj({ m: 3 }, { p: 4 });
+      const spyObj = env.createSpyObj({ m: 3 }, { p: 4 });
 
       expect(spyObj.m()).toEqual(3);
       expect(spyObj.p).toEqual(4);
@@ -220,7 +226,7 @@ describe('Spies', function() {
   });
 
   it('can use different strategies for different arguments', function() {
-    var spy = env.createSpy('foo');
+    const spy = env.createSpy('foo');
     spy.and.returnValue(42);
     spy.withArgs('baz', 'grault').and.returnValue(-1);
     spy.withArgs('thud').and.returnValue('bob');
@@ -232,7 +238,7 @@ describe('Spies', function() {
   });
 
   it('uses asymmetric equality testers when selecting a strategy', function() {
-    var spy = env.createSpy('foo');
+    const spy = env.createSpy('foo');
     spy.and.returnValue(42);
     spy.withArgs(jasmineUnderTest.any(String)).and.returnValue(-1);
 
@@ -258,7 +264,7 @@ describe('Spies', function() {
   });
 
   it('can reconfigure an argument-specific strategy', function() {
-    var spy = env.createSpy('foo');
+    const spy = env.createSpy('foo');
     spy.withArgs('foo').and.returnValue(42);
     spy.withArgs('foo').and.returnValue(17);
     expect(spy('foo')).toEqual(17);
@@ -266,7 +272,7 @@ describe('Spies', function() {
 
   describe('any promise-based strategy', function() {
     it('works with global Promise library', function(done) {
-      var spy = env.createSpy('foo').and.resolveTo(42);
+      const spy = env.createSpy('foo').and.resolveTo(42);
       spy()
         .then(function(result) {
           expect(result).toEqual(42);
@@ -278,14 +284,14 @@ describe('Spies', function() {
 
   describe('when withArgs is used without a base strategy', function() {
     it('uses the matching strategy', function() {
-      var spy = env.createSpy('foo');
+      const spy = env.createSpy('foo');
       spy.withArgs('baz').and.returnValue(-1);
 
       expect(spy('baz')).toEqual(-1);
     });
 
     it("throws if the args don't match", function() {
-      var spy = env.createSpy('foo');
+      const spy = env.createSpy('foo');
       spy.withArgs('bar').and.returnValue(-1);
 
       expect(function() {

spec/core/SpyStrategySpec.js

@@ -1,18 +1,18 @@
 describe('SpyStrategy', function() {
   it('defaults its name to unknown', function() {
-    var spyStrategy = new jasmineUnderTest.SpyStrategy();
+    const spyStrategy = new jasmineUnderTest.SpyStrategy();
 
     expect(spyStrategy.identity).toEqual('unknown');
   });
 
   it('takes a name', function() {
-    var spyStrategy = new jasmineUnderTest.SpyStrategy({ name: 'foo' });
+    const spyStrategy = new jasmineUnderTest.SpyStrategy({ name: 'foo' });
 
     expect(spyStrategy.identity).toEqual('foo');
   });
 
   it('stubs an original function, if provided', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
 
     spyStrategy.exec();
@@ -21,12 +21,11 @@ describe('SpyStrategy', function() {
   });
 
   it("allows an original function to be called, passed through the params and returns it's value", function() {
-    var originalFn = jasmine.createSpy('original').and.returnValue(42),
+    const originalFn = jasmine.createSpy('original').and.returnValue(42),
-      spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }),
+      spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
-      returnValue;
 
     spyStrategy.callThrough();
-    returnValue = spyStrategy.exec(null, ['foo']);
+    const returnValue = spyStrategy.exec(null, ['foo']);
 
     expect(originalFn).toHaveBeenCalled();
     expect(originalFn.calls.mostRecent().args).toEqual(['foo']);
@@ -34,19 +33,18 @@ describe('SpyStrategy', function() {
   });
 
   it('can return a specified value when executed', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
-      spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }),
+      spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
-      returnValue;
 
     spyStrategy.returnValue(17);
-    returnValue = spyStrategy.exec();
+    const returnValue = spyStrategy.exec();
 
     expect(originalFn).not.toHaveBeenCalled();
     expect(returnValue).toEqual(17);
   });
 
   it('can return specified values in order specified when executed', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
 
     spyStrategy.returnValues('value1', 'value2', 'value3');
@@ -59,7 +57,7 @@ describe('SpyStrategy', function() {
   });
 
   it('allows an exception to be thrown when executed', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
 
     spyStrategy.throwError(new TypeError('bar'));
@@ -71,7 +69,7 @@ describe('SpyStrategy', function() {
   });
 
   it('allows a string to be thrown, wrapping it into an exception when executed', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
 
     spyStrategy.throwError('bar');
@@ -83,7 +81,7 @@ describe('SpyStrategy', function() {
   });
 
   it('allows a non-Error to be thrown when executed', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
 
     spyStrategy.throwError({ code: 'ESRCH' });
@@ -95,23 +93,22 @@ describe('SpyStrategy', function() {
   });
 
   it('allows a fake function to be called instead', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       fakeFn = jasmine.createSpy('fake').and.returnValue(67),
-      spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }),
+      spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
-      returnValue;
 
     spyStrategy.callFake(fakeFn);
-    returnValue = spyStrategy.exec();
+    const returnValue = spyStrategy.exec();
 
     expect(originalFn).not.toHaveBeenCalled();
     expect(returnValue).toEqual(67);
   });
 
   it('allows a fake async function to be called instead', function(done) {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
-      fakeFn = jasmine
+      fakeFn = jasmine.createSpy('fake').and.callFake(async () => {
-        .createSpy('fake')
+        return 67;
-        .and.callFake(eval('async () => { return 67; }')),
+      }),
       spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
 
     spyStrategy.callFake(fakeFn);
@@ -130,7 +127,7 @@ describe('SpyStrategy', function() {
 
   describe('#resolveTo', function() {
     it('allows a resolved promise to be returned', function(done) {
-      var originalFn = jasmine.createSpy('original'),
+      const originalFn = jasmine.createSpy('original'),
         spyStrategy = new jasmineUnderTest.SpyStrategy({
           fn: originalFn
         });
@@ -146,7 +143,7 @@ describe('SpyStrategy', function() {
     });
 
     it('allows an empty resolved promise to be returned', function(done) {
-      var originalFn = jasmine.createSpy('original'),
+      const originalFn = jasmine.createSpy('original'),
         spyStrategy = new jasmineUnderTest.SpyStrategy({
           fn: originalFn
         });
@@ -164,7 +161,7 @@ describe('SpyStrategy', function() {
 
   describe('#rejectWith', function() {
     it('allows a rejected promise to be returned', function(done) {
-      var originalFn = jasmine.createSpy('original'),
+      const originalFn = jasmine.createSpy('original'),
         spyStrategy = new jasmineUnderTest.SpyStrategy({
           fn: originalFn
         });
@@ -181,7 +178,7 @@ describe('SpyStrategy', function() {
     });
 
     it('allows an empty rejected promise to be returned', function(done) {
-      var originalFn = jasmine.createSpy('original'),
+      const originalFn = jasmine.createSpy('original'),
         spyStrategy = new jasmineUnderTest.SpyStrategy({
           fn: originalFn
         });
@@ -198,7 +195,7 @@ describe('SpyStrategy', function() {
     });
 
     it('allows a non-Error to be rejected', function(done) {
-      var originalFn = jasmine.createSpy('original'),
+      const originalFn = jasmine.createSpy('original'),
         spyStrategy = new jasmineUnderTest.SpyStrategy({
           fn: originalFn
         });
@@ -216,7 +213,7 @@ describe('SpyStrategy', function() {
   });
 
   it('allows a custom strategy to be used', function() {
-    var plan = jasmine
+    const plan = jasmine
         .createSpy('custom strategy')
         .and.returnValue('custom strategy result'),
       customStrategy = jasmine
@@ -239,7 +236,7 @@ describe('SpyStrategy', function() {
   });
 
   it("throws an error if a custom strategy doesn't return a function", function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       spyStrategy = new jasmineUnderTest.SpyStrategy({
         fn: originalFn,
         customStrategies: {
@@ -255,7 +252,7 @@ describe('SpyStrategy', function() {
   });
 
   it('does not allow custom strategies to overwrite existing methods', function() {
-    var spyStrategy = new jasmineUnderTest.SpyStrategy({
+    const spyStrategy = new jasmineUnderTest.SpyStrategy({
       fn: function() {},
       customStrategies: {
         exec: function() {}
@@ -266,7 +263,7 @@ describe('SpyStrategy', function() {
   });
 
   it('throws an error when a non-function is passed to callFake strategy', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
 
     spyOn(jasmineUnderTest, 'isFunction_').and.returnValue(false);
@@ -282,7 +279,7 @@ describe('SpyStrategy', function() {
   });
 
   it('allows generator functions to be passed to callFake strategy', function() {
-    var generator = function*() {
+    const generator = function*() {
         yield 'ok';
       },
       spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: function() {} });
@@ -293,13 +290,12 @@ describe('SpyStrategy', function() {
   });
 
   it('allows a return to plan stubbing after another strategy', function() {
-    var originalFn = jasmine.createSpy('original'),
+    const originalFn = jasmine.createSpy('original'),
       fakeFn = jasmine.createSpy('fake').and.returnValue(67),
-      spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }),
+      spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn });
-      returnValue;
 
     spyStrategy.callFake(fakeFn);
-    returnValue = spyStrategy.exec();
+    let returnValue = spyStrategy.exec();
 
     expect(originalFn).not.toHaveBeenCalled();
     expect(returnValue).toEqual(67);
@@ -311,7 +307,7 @@ describe('SpyStrategy', function() {
   });
 
   it('returns the spy after changing the strategy', function() {
-    var spy = {},
+    const spy = {},
       spyFn = jasmine.createSpy('spyFn').and.returnValue(spy),
       spyStrategy = new jasmineUnderTest.SpyStrategy({ getSpy: spyFn });
 

spec/core/StackTraceSpec.js

@@ -1,6 +1,6 @@
 describe('StackTrace', function() {
   it('understands Chrome/Edge style traces', function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack:
         'Error: nope\n' +
@@ -8,7 +8,7 @@ describe('StackTrace', function() {
         '    at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)'
     };
 
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
 
     expect(result.message).toEqual('Error: nope');
     expect(result.style).toEqual('v8');
@@ -31,7 +31,7 @@ describe('StackTrace', function() {
   });
 
   it('understands Chrome/Edge style traces with multiline messages', function() {
-    var error = {
+    const error = {
       message: 'line 1\nline 2',
       stack:
         'Error: line 1\nline 2\n' +
@@ -39,10 +39,10 @@ describe('StackTrace', function() {
         '    at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)'
     };
 
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
 
     expect(result.message).toEqual('Error: line 1\nline 2');
-    var rawFrames = result.frames.map(function(f) {
+    const rawFrames = result.frames.map(function(f) {
       return f.raw;
     });
     expect(rawFrames).toEqual([
@@ -52,7 +52,7 @@ describe('StackTrace', function() {
   });
 
   it('understands Node style traces', function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack:
         'Error\n' +
@@ -61,7 +61,7 @@ describe('StackTrace', function() {
         '  at Immediate.<anonymous> (/somewhere/jasmine/lib/jasmine-core/jasmine.js:4314:12)\n' +
         '  at runCallback (timers.js:672:20)'
     };
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
 
     expect(result.message).toEqual('Error');
     expect(result.style).toEqual('v8');
@@ -96,13 +96,13 @@ describe('StackTrace', function() {
   });
 
   it('understands Safari <=14/Firefox/Phantom-OS X style traces', function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack:
         'http://localhost:8888/__spec__/core/UtilSpec.js:115:28\n' +
         'run@http://localhost:8888/__jasmine__/jasmine.js:4320:27'
     };
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
 
     expect(result.message).toBeFalsy();
     expect(result.style).toEqual('webkit');
@@ -123,13 +123,13 @@ describe('StackTrace', function() {
   });
 
   it('understands Safari 15 style traces', function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack:
         '@http://localhost:8888/__spec__/core/FooSpec.js:164:24\n' +
         'attempt@http://localhost:8888/__jasmine__/jasmine.js:8074:44\n'
     };
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
 
     expect(result.message).toBeFalsy();
     expect(result.style).toEqual('webkit');
@@ -150,24 +150,24 @@ describe('StackTrace', function() {
   });
 
   it('does not mistake gibberish for Safari/Firefox/Phantom-OS X style traces', function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack: 'randomcharsnotincludingwhitespace'
     };
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
     expect(result.style).toBeNull();
     expect(result.frames).toEqual([{ raw: error.stack }]);
   });
 
   it('understands Phantom-Linux style traces', function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack:
         '    at UserContext.<anonymous> (http://localhost:8888/__spec__/core/UtilSpec.js:115:19)\n' +
         '    at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)'
     };
 
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
 
     expect(result.message).toBeFalsy();
     expect(result.style).toEqual('v8');
@@ -190,13 +190,13 @@ describe('StackTrace', function() {
   });
 
   it('ignores blank lines', function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack:
         '    at UserContext.<anonymous> (http://localhost:8888/__spec__/core/UtilSpec.js:115:19)\n'
     };
 
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
 
     expect(result.frames).toEqual([
       {
@@ -210,7 +210,7 @@ describe('StackTrace', function() {
   });
 
   it("omits properties except 'raw' for frames that are not understood", function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack:
         '    at UserContext.<anonymous> (http://localhost:8888/__spec__/core/UtilSpec.js:115:19)\n' +
@@ -218,7 +218,7 @@ describe('StackTrace', function() {
         '    at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)'
     };
 
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
     expect(result.style).toEqual('v8');
     expect(result.frames).toEqual([
       {
@@ -242,7 +242,7 @@ describe('StackTrace', function() {
   });
 
   it('consideres different types of errors', function() {
-    var error = {
+    const error = {
       message: 'nope',
       stack:
         'TypeError: nope\n' +
@@ -250,7 +250,7 @@ describe('StackTrace', function() {
         '    at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)'
     };
 
-    var result = new jasmineUnderTest.StackTrace(error);
+    const result = new jasmineUnderTest.StackTrace(error);
 
     expect(result.message).toEqual('TypeError: nope');
     expect(result.frames).toEqual([
@@ -270,7 +270,7 @@ describe('StackTrace', function() {
       }
     ]);
 
-    var no_error = {
+    const no_error = {
       message: 'nope',
       stack:
         'Type Error: nope\n' +
@@ -278,7 +278,7 @@ describe('StackTrace', function() {
         '    at QueueRunner.run (http://localhost:8888/__jasmine__/jasmine.js:4320:20)'
     };
 
-    var result_no_error = new jasmineUnderTest.StackTrace(no_error);
+    const result_no_error = new jasmineUnderTest.StackTrace(no_error);
 
     expect(result_no_error.message).not.toEqual(jasmine.anything());
   });

spec/core/SuiteSpec.js

@@ -1,5 +1,5 @@
 describe('Suite', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -10,7 +10,7 @@ describe('Suite', function() {
   });
 
   it('keeps its id', function() {
-    var suite = new jasmineUnderTest.Suite({
+    const suite = new jasmineUnderTest.Suite({
       env: env,
       id: 456,
       description: 'I am a suite'
@@ -20,7 +20,7 @@ describe('Suite', function() {
   });
 
   it('returns blank full name for top level suite', function() {
-    var suite = new jasmineUnderTest.Suite({
+    const suite = new jasmineUnderTest.Suite({
       env: env,
       description: 'I am a suite'
     });
@@ -29,7 +29,7 @@ describe('Suite', function() {
   });
 
   it('returns its full name when it has parent suites', function() {
-    var parentSuite = new jasmineUnderTest.Suite({
+    const parentSuite = new jasmineUnderTest.Suite({
         env: env,
         description: 'I am a parent suite',
         parentSuite: jasmine.createSpy('pretend top level suite')
@@ -44,7 +44,7 @@ describe('Suite', function() {
   });
 
   it('adds beforeEach functions in order of needed execution', function() {
-    var suite = new jasmineUnderTest.Suite({
+    const suite = new jasmineUnderTest.Suite({
         env: env,
         description: 'I am a suite'
       }),
@@ -61,7 +61,7 @@ describe('Suite', function() {
   });
 
   it('adds beforeAll functions in order of needed execution', function() {
-    var suite = new jasmineUnderTest.Suite({
+    const suite = new jasmineUnderTest.Suite({
         env: env,
         description: 'I am a suite'
       }),
@@ -71,25 +71,14 @@ describe('Suite', function() {
     suite.beforeAll(outerBefore);
     suite.beforeAll(innerBefore);
 
-    function sameInstance(expected) {
-      return {
-        asymmetricMatch: function(actual) {
-          return actual === expected;
-        },
-        jasmineToString: function() {
-          return `<same instance as ${expected}>`;
-        }
-      };
-    }
-
     expect(suite.beforeAllFns).toEqual([
-      { fn: outerBefore.fn, type: 'beforeAll', suite: sameInstance(suite) },
+      { fn: outerBefore.fn, type: 'beforeAll', suite: jasmine.is(suite) },
-      { fn: innerBefore.fn, type: 'beforeAll', suite: sameInstance(suite) }
+      { fn: innerBefore.fn, type: 'beforeAll', suite: jasmine.is(suite) }
     ]);
   });
 
   it('adds afterEach functions in order of needed execution', function() {
-    var suite = new jasmineUnderTest.Suite({
+    const suite = new jasmineUnderTest.Suite({
         env: env,
         description: 'I am a suite'
       }),
@@ -123,55 +112,133 @@ describe('Suite', function() {
   });
 
   it('has a status of failed if any expectations have failed', function() {
-    var suite = new jasmineUnderTest.Suite({
+    const suite = new jasmineUnderTest.Suite({});
-      expectationResultFactory: function() {
-        return 'hi';
-      }
-    });
 
-    suite.addExpectationResult(false);
+    suite.addExpectationResult(false, {});
     expect(suite.status()).toBe('failed');
   });
 
   it('retrieves a result with updated status', function() {
-    var suite = new jasmineUnderTest.Suite({});
+    const suite = new jasmineUnderTest.Suite({});
 
     expect(suite.getResult().status).toBe('passed');
   });
 
   it('retrieves a result with pending status', function() {
-    var suite = new jasmineUnderTest.Suite({});
+    const suite = new jasmineUnderTest.Suite({});
     suite.pend();
 
     expect(suite.getResult().status).toBe('pending');
   });
 
   it('throws an ExpectationFailed when receiving a failed expectation when throwOnExpectationFailure is set', function() {
-    var suite = new jasmineUnderTest.Suite({
+    const suite = new jasmineUnderTest.Suite({
-      expectationResultFactory: function(data) {
-        return data;
-      },
       throwOnExpectationFailure: true
     });
 
     expect(function() {
-      suite.addExpectationResult(false, 'failed');
+      suite.addExpectationResult(false, { message: 'failed' });
     }).toThrowError(jasmineUnderTest.errors.ExpectationFailed);
 
     expect(suite.status()).toBe('failed');
-    expect(suite.result.failedExpectations).toEqual(['failed']);
+    expect(suite.result.failedExpectations).toEqual([
+      jasmine.objectContaining({ message: 'failed' })
+    ]);
   });
 
   it('does not add an additional failure when an expectation fails', function() {
-    var suite = new jasmineUnderTest.Suite({});
+    const suite = new jasmineUnderTest.Suite({});
 
-    suite.onException(new jasmineUnderTest.errors.ExpectationFailed());
+    suite.handleException(new jasmineUnderTest.errors.ExpectationFailed());
 
     expect(suite.getResult().failedExpectations).toEqual([]);
   });
 
+  it('forwards late expectation failures to onLateError', function() {
+    const onLateError = jasmine.createSpy('onLateError');
+    const suite = new jasmineUnderTest.Suite({ onLateError });
+    const data = {
+      matcherName: '',
+      passed: false,
+      expected: '',
+      actual: '',
+      error: new Error('nope')
+    };
+
+    suite.reportedDone = true;
+    suite.addExpectationResult(false, data, true);
+
+    expect(onLateError).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        message: jasmine.stringMatching(/^Error: nope/)
+      })
+    );
+    expect(suite.result.failedExpectations).toEqual([]);
+  });
+
+  it('does not forward non-late expectation failures to onLateError', function() {
+    const onLateError = jasmine.createSpy('onLateError');
+    const suite = new jasmineUnderTest.Suite({
+      onLateError
+    });
+    const data = {
+      matcherName: '',
+      passed: false,
+      expected: '',
+      actual: '',
+      error: new Error('nope')
+    };
+
+    suite.addExpectationResult(false, data, true);
+
+    expect(onLateError).not.toHaveBeenCalled();
+    expect(suite.result.failedExpectations.length).toEqual(1);
+  });
+
+  it('forwards late handleException calls to onLateError', function() {
+    const onLateError = jasmine.createSpy('onLateError');
+    const suite = new jasmineUnderTest.Suite({
+      onLateError
+    });
+    const error = new Error('oops');
+
+    suite.reportedDone = true;
+    suite.handleException(error);
+
+    expect(onLateError).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        message: jasmine.stringMatching(/^Error: oops/)
+      })
+    );
+    expect(suite.result.failedExpectations).toEqual([]);
+  });
+
+  it('does not forward non-late handleException calls to onLateError', function() {
+    const onLateError = jasmine.createSpy('onLateError');
+    const suite = new jasmineUnderTest.Suite({
+      onLateError
+    });
+    const error = new Error('oops');
+
+    suite.handleException(error);
+
+    expect(onLateError).not.toHaveBeenCalled();
+    expect(suite.result.failedExpectations.length).toEqual(1);
+  });
+
+  it('clears the reportedDone flag when reset', function() {
+    const suite = new jasmineUnderTest.Suite({
+      queueableFn: { fn: function() {} }
+    });
+    suite.reportedDone = true;
+
+    suite.reset();
+
+    expect(suite.reportedDone).toBeFalse();
+  });
+
   it('calls timer to compute duration', function() {
-    var suite = new jasmineUnderTest.Suite({
+    const suite = new jasmineUnderTest.Suite({
       env: env,
       id: 456,
       description: 'I am a suite',
@@ -196,7 +263,7 @@ describe('Suite', function() {
 
   describe('attr.autoCleanClosures', function() {
     function arrangeSuite(attrs) {
-      var suite = new jasmineUnderTest.Suite(attrs);
+      const suite = new jasmineUnderTest.Suite(attrs);
       suite.beforeAll(function() {});
       suite.beforeEach(function() {});
       suite.afterEach(function() {});
@@ -205,7 +272,7 @@ describe('Suite', function() {
     }
 
     it('should clean closures when "attr.autoCleanClosures" is missing', function() {
-      var suite = arrangeSuite({});
+      const suite = arrangeSuite({});
       suite.cleanupBeforeAfter();
       expect(suite.beforeAllFns[0].fn).toBe(null);
       expect(suite.beforeFns[0].fn).toBe(null);
@@ -214,7 +281,7 @@ describe('Suite', function() {
     });
 
     it('should clean closures when "attr.autoCleanClosures" is true', function() {
-      var suite = arrangeSuite({ autoCleanClosures: true });
+      const suite = arrangeSuite({ autoCleanClosures: true });
       suite.cleanupBeforeAfter();
       expect(suite.beforeAllFns[0].fn).toBe(null);
       expect(suite.beforeFns[0].fn).toBe(null);
@@ -223,7 +290,7 @@ describe('Suite', function() {
     });
 
     it('should NOT clean closures when "attr.autoCleanClosures" is false', function() {
-      var suite = arrangeSuite({ autoCleanClosures: false });
+      const suite = arrangeSuite({ autoCleanClosures: false });
       suite.cleanupBeforeAfter();
       expect(suite.beforeAllFns[0].fn).not.toBe(null);
       expect(suite.beforeFns[0].fn).not.toBe(null);
@@ -234,23 +301,23 @@ describe('Suite', function() {
 
   describe('#reset', function() {
     it('should reset the "pending" status', function() {
-      var suite = new jasmineUnderTest.Suite({});
+      const suite = new jasmineUnderTest.Suite({});
       suite.pend();
       suite.reset();
       expect(suite.getResult().status).toBe('passed');
     });
 
     it('should not reset the "pending" status when the suite was excluded', function() {
-      var suite = new jasmineUnderTest.Suite({});
+      const suite = new jasmineUnderTest.Suite({});
       suite.exclude();
       suite.reset();
       expect(suite.getResult().status).toBe('pending');
     });
 
     it('should also reset the children', function() {
-      var suite = new jasmineUnderTest.Suite({});
+      const suite = new jasmineUnderTest.Suite({});
-      var child1 = jasmine.createSpyObj(['reset']);
+      const child1 = jasmine.createSpyObj(['reset']);
-      var child2 = jasmine.createSpyObj(['reset']);
+      const child2 = jasmine.createSpyObj(['reset']);
       suite.addChild(child1);
       suite.addChild(child2);
 
@@ -261,16 +328,12 @@ describe('Suite', function() {
     });
 
     it('should reset the failedExpectations', function() {
-      var suite = new jasmineUnderTest.Suite({
+      const suite = new jasmineUnderTest.Suite({});
-        expectationResultFactory: function(error) {
+      suite.handleException(new Error());
-          return error;
-        }
-      });
-      suite.onException(new Error());
 
       suite.reset();
 
-      var result = suite.getResult();
+      const result = suite.getResult();
       expect(result.status).toBe('passed');
       expect(result.failedExpectations).toHaveSize(0);
     });
@@ -296,7 +359,7 @@ describe('Suite', function() {
 
     it('reports an error including the suite name when it is a normal suite', function() {
       const onLateError = jasmine.createSpy('onLateError');
-      var suite = new jasmineUnderTest.Suite({
+      const suite = new jasmineUnderTest.Suite({
         onLateError,
         description: 'the suite',
         parentSuite: {

spec/core/TimerSpec.js

@@ -1,6 +1,6 @@
 describe('Timer', function() {
   it('reports the time elapsed', function() {
-    var fakeNow = jasmine.createSpy('fake Date.now'),
+    const fakeNow = jasmine.createSpy('fake Date.now'),
       timer = new jasmineUnderTest.Timer({ now: fakeNow });
 
     fakeNow.and.returnValue(100);
@@ -12,7 +12,7 @@ describe('Timer', function() {
   });
 
   describe('when date is stubbed, perhaps by other testing helpers', function() {
-    var origDate = Date;
+    const origDate = Date;
     beforeEach(function() {
       // eslint-disable-next-line no-implicit-globals
       Date = jasmine.createSpy('date spy');
@@ -24,7 +24,7 @@ describe('Timer', function() {
     });
 
     it('does not throw even though Date was taken away', function() {
-      var timer = new jasmineUnderTest.Timer();
+      const timer = new jasmineUnderTest.Timer();
 
       expect(timer.start).not.toThrow();
       expect(timer.elapsed()).toEqual(jasmine.any(Number));

spec/core/TreeProcessorSpec.js

@@ -1,5 +1,5 @@
 describe('TreeProcessor', function() {
-  var nodeNumber = 0,
+  let nodeNumber = 0,
     leafNumber = 0;
 
   function Node(attrs) {
@@ -27,7 +27,7 @@ describe('TreeProcessor', function() {
   }
 
   it('processes a single leaf', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       processor = new jasmineUnderTest.TreeProcessor({
         tree: leaf,
         runnableIds: [leaf.id]
@@ -44,7 +44,7 @@ describe('TreeProcessor', function() {
   });
 
   it('processes a single pending leaf', function() {
-    var leaf = new Leaf({ markedPending: true }),
+    const leaf = new Leaf({ markedPending: true }),
       processor = new jasmineUnderTest.TreeProcessor({
         tree: leaf,
         runnableIds: [leaf.id]
@@ -61,7 +61,7 @@ describe('TreeProcessor', function() {
   });
 
   it('processes a single non-specified leaf', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       processor = new jasmineUnderTest.TreeProcessor({
         tree: leaf,
         runnableIds: []
@@ -78,11 +78,11 @@ describe('TreeProcessor', function() {
   });
 
   it('processes a single excluded leaf', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       processor = new jasmineUnderTest.TreeProcessor({
         tree: leaf,
         runnableIds: [leaf.id],
-        excludeNode: function(node) {
+        excludeNode: function() {
           return true;
         }
       }),
@@ -98,7 +98,7 @@ describe('TreeProcessor', function() {
   });
 
   it('processes a tree with a single leaf with the root specified', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       parent = new Node({ children: [leaf] }),
       processor = new jasmineUnderTest.TreeProcessor({
         tree: parent,
@@ -122,7 +122,7 @@ describe('TreeProcessor', function() {
   });
 
   it('processes a tree with a single pending leaf, with the root specified', function() {
-    var leaf = new Leaf({ markedPending: true }),
+    const leaf = new Leaf({ markedPending: true }),
       parent = new Node({ children: [leaf] }),
       processor = new jasmineUnderTest.TreeProcessor({
         tree: parent,
@@ -146,7 +146,7 @@ describe('TreeProcessor', function() {
   });
 
   it('processes a complicated tree with the root specified', function() {
-    var pendingLeaf = new Leaf({ markedPending: true }),
+    const pendingLeaf = new Leaf({ markedPending: true }),
       executableLeaf = new Leaf({ markedPending: false }),
       parent = new Node({ children: [pendingLeaf, executableLeaf] }),
       childless = new Node(),
@@ -218,7 +218,7 @@ describe('TreeProcessor', function() {
   });
 
   it('marks the run order invalid if it would re-enter a node that does not allow re-entry', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       leaf3 = new Leaf(),
       reentered = new Node({ noReenter: true, children: [leaf1, leaf2] }),
@@ -233,7 +233,7 @@ describe('TreeProcessor', function() {
   });
 
   it('marks the run order valid if a node being re-entered allows re-entry', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       leaf3 = new Leaf(),
       reentered = new Node({ children: [leaf1, leaf2] }),
@@ -248,7 +248,7 @@ describe('TreeProcessor', function() {
   });
 
   it("marks the run order valid if a node which can't be re-entered is only entered once", function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       leaf3 = new Leaf(),
       noReentry = new Node({ noReenter: true }),
@@ -263,7 +263,7 @@ describe('TreeProcessor', function() {
   });
 
   it("marks the run order valid if a node which can't be re-entered is run directly", function() {
-    var noReentry = new Node({ noReenter: true }),
+    const noReentry = new Node({ noReenter: true }),
       root = new Node({ children: [noReentry] }),
       processor = new jasmineUnderTest.TreeProcessor({
         tree: root,
@@ -275,7 +275,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs a single leaf', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       node = new Node({ children: [leaf], userContext: { root: 'context' } }),
       queueRunner = jasmine.createSpy('queueRunner'),
       processor = new jasmineUnderTest.TreeProcessor({
@@ -301,7 +301,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs a node with no children', function() {
-    var node = new Node({ userContext: { node: 'context' } }),
+    const node = new Node({ userContext: { node: 'context' } }),
       root = new Node({ children: [node], userContext: { root: 'context' } }),
       nodeStart = jasmine.createSpy('nodeStart'),
       nodeComplete = jasmine.createSpy('nodeComplete'),
@@ -351,7 +351,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs a node with children', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       node = new Node({ children: [leaf1, leaf2] }),
       root = new Node({ children: [node] }),
@@ -365,7 +365,7 @@ describe('TreeProcessor', function() {
       nodeDone = jasmine.createSpy('nodeDone');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    let queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn(nodeDone);
 
     queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
@@ -379,7 +379,7 @@ describe('TreeProcessor', function() {
   });
 
   it('cascades errors up the tree', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       node = new Node({ children: [leaf] }),
       root = new Node({ children: [node] }),
       queueRunner = jasmine.createSpy('queueRunner'),
@@ -394,7 +394,7 @@ describe('TreeProcessor', function() {
       nodeDone = jasmine.createSpy('nodeDone');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    let queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn(nodeDone);
 
     queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
@@ -410,7 +410,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs an excluded node with leaf', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       node = new Node({ children: [leaf1] }),
       root = new Node({ children: [node] }),
       queueRunner = jasmine.createSpy('queueRunner'),
@@ -427,7 +427,7 @@ describe('TreeProcessor', function() {
       nodeDone = jasmine.createSpy('nodeDone');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    let queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn(nodeDone);
 
     queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
@@ -450,7 +450,7 @@ describe('TreeProcessor', function() {
   });
 
   it('should execute node with correct arguments when failSpecWithNoExpectations option is set', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       node = new Node({ children: [leaf] }),
       root = new Node({ children: [node] }),
       queueRunner = jasmine.createSpy('queueRunner'),
@@ -468,7 +468,7 @@ describe('TreeProcessor', function() {
       nodeDone = jasmine.createSpy('nodeDone');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    let queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn(nodeDone);
 
     queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
@@ -479,7 +479,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs beforeAlls for a node with children', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       node = new Node({
         children: [leaf],
         beforeAllFns: [
@@ -498,7 +498,7 @@ describe('TreeProcessor', function() {
       nodeDone = jasmine.createSpy('nodeDone');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    let queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn(nodeDone);
 
     queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
@@ -512,7 +512,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs afterAlls for a node with children', function() {
-    var leaf = new Leaf(),
+    const leaf = new Leaf(),
       afterAllFns = [{ fn: 'afterAll1' }, { fn: 'afterAll2' }],
       node = new Node({
         children: [leaf],
@@ -529,7 +529,7 @@ describe('TreeProcessor', function() {
       nodeDone = jasmine.createSpy('nodeDone');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    let queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn(nodeDone);
 
     queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
@@ -543,7 +543,7 @@ describe('TreeProcessor', function() {
   });
 
   it('does not run beforeAlls or afterAlls for a node with no children', function() {
-    var node = new Node({
+    const node = new Node({
         beforeAllFns: [{ fn: 'before' }],
         afterAllFns: [{ fn: 'after' }]
       }),
@@ -558,7 +558,7 @@ describe('TreeProcessor', function() {
       nodeDone = jasmine.createSpy('nodeDone');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    let queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn(nodeDone);
 
     queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
@@ -567,7 +567,7 @@ describe('TreeProcessor', function() {
   });
 
   it('does not run beforeAlls or afterAlls for a node with only pending children', function() {
-    var leaf = new Leaf({ markedPending: true }),
+    const leaf = new Leaf({ markedPending: true }),
       node = new Node({
         children: [leaf],
         beforeAllFns: [{ fn: 'before' }],
@@ -585,7 +585,7 @@ describe('TreeProcessor', function() {
       nodeDone = jasmine.createSpy('nodeDone');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    let queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn(nodeDone);
 
     queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
@@ -597,7 +597,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs leaves in the order specified', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       root = new Node({ children: [leaf1, leaf2] }),
       queueRunner = jasmine.createSpy('queueRunner'),
@@ -609,7 +609,7 @@ describe('TreeProcessor', function() {
       treeComplete = jasmine.createSpy('treeComplete');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn();
 
     expect(leaf1.execute).not.toHaveBeenCalled();
@@ -621,7 +621,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs specified leaves before non-specified leaves within a parent node', function() {
-    var specified = new Leaf(),
+    const specified = new Leaf(),
       nonSpecified = new Leaf(),
       root = new Node({ children: [nonSpecified, specified] }),
       queueRunner = jasmine.createSpy('queueRunner'),
@@ -633,7 +633,7 @@ describe('TreeProcessor', function() {
       treeComplete = jasmine.createSpy('treeComplete');
 
     processor.execute(treeComplete);
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn();
 
     expect(nonSpecified.execute).not.toHaveBeenCalled();
@@ -645,7 +645,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs nodes and leaves with a specified order', function() {
-    var specifiedLeaf = new Leaf(),
+    const specifiedLeaf = new Leaf(),
       childLeaf = new Leaf(),
       specifiedNode = new Node({ children: [childLeaf] }),
       root = new Node({ children: [specifiedLeaf, specifiedNode] }),
@@ -657,11 +657,12 @@ describe('TreeProcessor', function() {
       });
 
     processor.execute();
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     queueableFns[0].fn();
 
     expect(specifiedLeaf.execute).not.toHaveBeenCalled();
-    var nodeQueueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const nodeQueueableFns = queueRunner.calls.mostRecent().args[0]
+      .queueableFns;
     nodeQueueableFns[1].fn();
 
     expect(childLeaf.execute).toHaveBeenCalled();
@@ -672,7 +673,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs a node multiple times if the order specified leaves and re-enters it', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       leaf3 = new Leaf(),
       leaf4 = new Leaf(),
@@ -687,7 +688,7 @@ describe('TreeProcessor', function() {
       });
 
     processor.execute();
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     expect(queueableFns.length).toBe(5);
 
     queueableFns[0].fn();
@@ -715,7 +716,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs a parent of a node with segments correctly', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       leaf3 = new Leaf(),
       leaf4 = new Leaf(),
@@ -731,7 +732,7 @@ describe('TreeProcessor', function() {
       });
 
     processor.execute();
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     expect(queueableFns.length).toBe(5);
 
     queueableFns[0].fn();
@@ -772,7 +773,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs nodes in the order they were declared', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       leaf3 = new Leaf(),
       parent = new Node({ children: [leaf2, leaf3] }),
@@ -785,7 +786,7 @@ describe('TreeProcessor', function() {
       });
 
     processor.execute();
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     expect(queueableFns.length).toBe(2);
 
     queueableFns[0].fn();
@@ -793,7 +794,7 @@ describe('TreeProcessor', function() {
 
     queueableFns[1].fn();
 
-    var childFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const childFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     expect(childFns.length).toBe(3);
     childFns[1].fn();
     expect(leaf2.execute).toHaveBeenCalled();
@@ -803,7 +804,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs large segments of nodes in the order they were declared', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       leaf3 = new Leaf(),
       leaf4 = new Leaf(),
@@ -837,7 +838,7 @@ describe('TreeProcessor', function() {
       });
 
     processor.execute();
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     expect(queueableFns.length).toBe(11);
 
     queueableFns[0].fn();
@@ -875,7 +876,7 @@ describe('TreeProcessor', function() {
   });
 
   it('runs nodes in a custom order when orderChildren is overridden', function() {
-    var leaf1 = new Leaf(),
+    const leaf1 = new Leaf(),
       leaf2 = new Leaf(),
       leaf3 = new Leaf(),
       leaf4 = new Leaf(),
@@ -907,13 +908,13 @@ describe('TreeProcessor', function() {
         runnableIds: [root.id],
         queueRunnerFactory: queueRunner,
         orderChildren: function(node) {
-          var children = node.children.slice();
+          const children = node.children.slice();
           return children.reverse();
         }
       });
 
     processor.execute();
-    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    const queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
     expect(queueableFns.length).toBe(11);
 
     queueableFns[0].fn();

spec/core/UserContextSpec.js

@@ -1,9 +1,9 @@
 describe('UserContext', function() {
   it('Behaves just like an plain object', function() {
-    var context = new jasmineUnderTest.UserContext(),
+    const context = new jasmineUnderTest.UserContext(),
       properties = [];
 
-    for (var prop in context) {
+    for (const prop in context) {
       if (obj.hasOwnProperty(prop)) {
         properties.push(prop);
       }

spec/core/UtilSpec.js

@@ -1,4 +1,4 @@
-describe('jasmineUnderTest.util', function() {
+describe('util', function() {
   describe('isArray_', function() {
     it('should return true if the argument is an array', function() {
       expect(jasmineUnderTest.isArray_([])).toBe(true);
@@ -32,14 +32,14 @@ describe('jasmineUnderTest.util', function() {
   });
 
   describe('promise utils', function() {
-    var mockNativePromise, mockPromiseLikeObject;
+    let mockNativePromise, mockPromiseLikeObject;
 
-    var mockPromiseLike = function() {
+    const mockPromiseLike = function() {
       this.then = function() {};
     };
 
     beforeEach(function() {
-      mockNativePromise = new Promise(function(res, rej) {});
+      mockNativePromise = new Promise(function() {});
       mockPromiseLikeObject = new mockPromiseLike();
     });
 
@@ -130,18 +130,44 @@ describe('jasmineUnderTest.util', function() {
 
   describe('isUndefined', function() {
     it('reports if a variable is defined', function() {
-      var a;
+      let a;
       expect(jasmineUnderTest.util.isUndefined(a)).toBe(true);
       expect(jasmineUnderTest.util.isUndefined(undefined)).toBe(true);
 
-      var undefined = 'diz be undefined yo';
+      const defined = 'diz be undefined yo';
-      expect(jasmineUnderTest.util.isUndefined(undefined)).toBe(false);
+      expect(jasmineUnderTest.util.isUndefined(defined)).toBe(false);
+    });
+  });
+
+  describe('cloneArgs', function() {
+    it('clones primitives as-is', function() {
+      expect(jasmineUnderTest.util.cloneArgs([true, false])).toEqual([
+        true,
+        false
+      ]);
+      expect(jasmineUnderTest.util.cloneArgs([0, 1])).toEqual([0, 1]);
+      expect(jasmineUnderTest.util.cloneArgs(['str'])).toEqual(['str']);
+    });
+
+    it('clones Regexp objects as-is', function() {
+      const regex = /match/;
+      expect(jasmineUnderTest.util.cloneArgs([regex])).toEqual([regex]);
+    });
+
+    it('clones Date objects as-is', function() {
+      const date = new Date(2022, 1, 1);
+      expect(jasmineUnderTest.util.cloneArgs([date])).toEqual([date]);
+    });
+
+    it('clones null and undefined', function() {
+      expect(jasmineUnderTest.util.cloneArgs([null])).toEqual([null]);
+      expect(jasmineUnderTest.util.cloneArgs([undefined])).toEqual([undefined]);
     });
   });
 
   describe('getPropertyDescriptor', function() {
     it('get property descriptor from object', function() {
-      var obj = { prop: 1 },
+      const obj = { prop: 1 },
         actual = jasmineUnderTest.util.getPropertyDescriptor(obj, 'prop'),
         expected = Object.getOwnPropertyDescriptor(obj, 'prop');
 
@@ -149,7 +175,7 @@ describe('jasmineUnderTest.util', function() {
     });
 
     it('get property descriptor from object property', function() {
-      var proto = { prop: 1 },
+      const proto = { prop: 1 },
         actual = jasmineUnderTest.util.getPropertyDescriptor(proto, 'prop'),
         expected = Object.getOwnPropertyDescriptor(proto, 'prop');
 
@@ -157,42 +183,6 @@ describe('jasmineUnderTest.util', function() {
     });
   });
 
-  describe('objectDifference', function() {
-    it('given two objects A and B, returns the properties in A not present in B', function() {
-      var a = {
-        foo: 3,
-        bar: 4,
-        baz: 5
-      };
-
-      var b = {
-        bar: 6,
-        quux: 7
-      };
-
-      expect(jasmineUnderTest.util.objectDifference(a, b)).toEqual({
-        foo: 3,
-        baz: 5
-      });
-    });
-
-    it('only looks at own properties of both objects', function() {
-      function Foo() {}
-
-      Foo.prototype.x = 1;
-      Foo.prototype.y = 2;
-
-      var a = new Foo();
-      a.x = 1;
-
-      var b = new Foo();
-      b.y = 2;
-
-      expect(jasmineUnderTest.util.objectDifference(a, b)).toEqual({ x: 1 });
-      expect(jasmineUnderTest.util.objectDifference(b, a)).toEqual({ y: 2 });
-    });
-  });
-
   describe('jasmineFile', function() {
     it('returns the file containing jasmine.util', function() {
       // Chrome sometimes reports foo.js as foo.js/, so tolerate

spec/core/asymmetric_equality/AnySpec.js

@@ -1,73 +1,73 @@
 describe('Any', function() {
   it('matches a string', function() {
-    var any = new jasmineUnderTest.Any(String);
+    const any = new jasmineUnderTest.Any(String);
 
     expect(any.asymmetricMatch('foo')).toBe(true);
   });
 
   it('matches a number', function() {
-    var any = new jasmineUnderTest.Any(Number);
+    const any = new jasmineUnderTest.Any(Number);
 
     expect(any.asymmetricMatch(1)).toBe(true);
   });
 
   it('matches a function', function() {
-    var any = new jasmineUnderTest.Any(Function);
+    const any = new jasmineUnderTest.Any(Function);
 
     expect(any.asymmetricMatch(function() {})).toBe(true);
   });
 
   it('matches an Object', function() {
-    var any = new jasmineUnderTest.Any(Object);
+    const any = new jasmineUnderTest.Any(Object);
 
     expect(any.asymmetricMatch({})).toBe(true);
   });
 
   it('matches a Boolean', function() {
-    var any = new jasmineUnderTest.Any(Boolean);
+    const any = new jasmineUnderTest.Any(Boolean);
 
     expect(any.asymmetricMatch(true)).toBe(true);
   });
 
   it('matches a Map', function() {
-    var any = new jasmineUnderTest.Any(Map);
+    const any = new jasmineUnderTest.Any(Map);
 
     expect(any.asymmetricMatch(new Map())).toBe(true);
   });
 
   it('matches a Set', function() {
-    var any = new jasmineUnderTest.Any(Set);
+    const any = new jasmineUnderTest.Any(Set);
 
     expect(any.asymmetricMatch(new Set())).toBe(true);
   });
 
   it('matches a TypedArray', function() {
-    var any = new jasmineUnderTest.Any(Uint32Array);
+    const any = new jasmineUnderTest.Any(Uint32Array);
 
     expect(any.asymmetricMatch(new Uint32Array([]))).toBe(true);
   });
 
   it('matches a Symbol', function() {
-    var any = new jasmineUnderTest.Any(Symbol);
+    const any = new jasmineUnderTest.Any(Symbol);
 
     expect(any.asymmetricMatch(Symbol())).toBe(true);
   });
 
   it('matches another constructed object', function() {
-    var Thing = function() {},
+    const Thing = function() {},
       any = new jasmineUnderTest.Any(Thing);
 
     expect(any.asymmetricMatch(new Thing())).toBe(true);
   });
 
   it('does not treat null as an Object', function() {
-    var any = new jasmineUnderTest.Any(Object);
+    const any = new jasmineUnderTest.Any(Object);
 
     expect(any.asymmetricMatch(null)).toBe(false);
   });
 
   it("jasmineToString's itself", function() {
-    var any = new jasmineUnderTest.Any(Number);
+    const any = new jasmineUnderTest.Any(Number);
 
     expect(any.jasmineToString()).toEqual('<jasmine.any(Number)>');
     expect(any.jasmineToString()).toEqual('<jasmine.any(Number)>');

spec/core/asymmetric_equality/AnythingSpec.js

@@ -1,67 +1,67 @@
 describe('Anything', function() {
   it('matches a string', function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch('foo')).toBe(true);
   });
 
   it('matches a number', function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch(42)).toBe(true);
   });
 
   it('matches an object', function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch({ foo: 'bar' })).toBe(true);
   });
 
   it('matches an array', function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch([1, 2, 3])).toBe(true);
   });
 
   it('matches a Map', function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch(new Map())).toBe(true);
   });
 
   it('matches a Set', function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch(new Set())).toBe(true);
   });
 
   it('matches a TypedArray', function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch(new Uint32Array([]))).toBe(true);
   });
 
   it('matches a Symbol', function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch(Symbol())).toBe(true);
   });
 
   it("doesn't match undefined", function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch()).toBe(false);
     expect(anything.asymmetricMatch(undefined)).toBe(false);
   });
 
   it("doesn't match null", function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.asymmetricMatch(null)).toBe(false);
   });
 
   it("jasmineToString's itself", function() {
-    var anything = new jasmineUnderTest.Anything();
+    const anything = new jasmineUnderTest.Anything();
 
     expect(anything.jasmineToString()).toEqual('<jasmine.anything>');
   });

spec/core/asymmetric_equality/ArrayContainingSpec.js

@@ -1,12 +1,12 @@
 describe('ArrayContaining', function() {
   it('matches any actual to an empty array', function() {
-    var containing = new jasmineUnderTest.ArrayContaining([]);
+    const containing = new jasmineUnderTest.ArrayContaining([]);
 
     expect(containing.asymmetricMatch('foo')).toBe(true);
   });
 
   it('does not work when not passed an array', function() {
-    var containing = new jasmineUnderTest.ArrayContaining('foo');
+    const containing = new jasmineUnderTest.ArrayContaining('foo');
 
     expect(function() {
       containing.asymmetricMatch([]);
@@ -14,35 +14,35 @@ describe('ArrayContaining', function() {
   });
 
   it('matches when the item is in the actual', function() {
-    var containing = new jasmineUnderTest.ArrayContaining(['foo']);
+    const containing = new jasmineUnderTest.ArrayContaining(['foo']);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(['foo'], matchersUtil)).toBe(true);
   });
 
   it('matches when additional items are in the actual', function() {
-    var containing = new jasmineUnderTest.ArrayContaining(['foo']);
+    const containing = new jasmineUnderTest.ArrayContaining(['foo']);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(['foo', 'bar'], matchersUtil)).toBe(true);
   });
 
   it('does not match when the item is not in the actual', function() {
-    var containing = new jasmineUnderTest.ArrayContaining(['foo']);
+    const containing = new jasmineUnderTest.ArrayContaining(['foo']);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(['bar'], matchersUtil)).toBe(false);
   });
 
   it('does not match when the actual is not an array', function() {
-    var containing = new jasmineUnderTest.ArrayContaining(['foo']);
+    const containing = new jasmineUnderTest.ArrayContaining(['foo']);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch('foo', matchersUtil)).toBe(false);
   });
 
   it('jasmineToStrings itself', function() {
-    var sample = [],
+    const sample = [],
       matcher = new jasmineUnderTest.ArrayContaining(sample),
       pp = jasmine.createSpy('pp').and.returnValue('sample');
 
@@ -53,19 +53,19 @@ describe('ArrayContaining', function() {
   });
 
   it('uses custom equality testers', function() {
-    var tester = function(a, b) {
+    const tester = function(a, b) {
       // All "foo*" strings match each other.
       if (
         typeof a == 'string' &&
         typeof b == 'string' &&
-        a.substr(0, 3) == 'foo' &&
+        a.slice(0, 3) == 'foo' &&
-        b.substr(0, 3) == 'foo'
+        b.slice(0, 3) == 'foo'
       ) {
         return true;
       }
     };
-    var containing = new jasmineUnderTest.ArrayContaining(['fooVal']);
+    const containing = new jasmineUnderTest.ArrayContaining(['fooVal']);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
       customTesters: [tester]
     });
 

spec/core/asymmetric_equality/ArrayWithExactContentsSpec.js

@@ -1,13 +1,13 @@
 describe('ArrayWithExactContents', function() {
   it('matches an array with the same items in a different order', function() {
-    var matcher = new jasmineUnderTest.ArrayWithExactContents(['a', 2, /a/]);
+    const matcher = new jasmineUnderTest.ArrayWithExactContents(['a', 2, /a/]);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(matcher.asymmetricMatch([2, 'a', /a/], matchersUtil)).toBe(true);
   });
 
   it('does not work when not passed an array', function() {
-    var matcher = new jasmineUnderTest.ArrayWithExactContents('foo');
+    const matcher = new jasmineUnderTest.ArrayWithExactContents('foo');
 
     expect(function() {
       matcher.asymmetricMatch([]);
@@ -15,8 +15,8 @@ describe('ArrayWithExactContents', function() {
   });
 
   it('does not match when an item is missing', function() {
-    var matcher = new jasmineUnderTest.ArrayWithExactContents(['a', 2, /a/]);
+    const matcher = new jasmineUnderTest.ArrayWithExactContents(['a', 2, /a/]);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(matcher.asymmetricMatch(['a', 2], matchersUtil)).toBe(false);
     expect(matcher.asymmetricMatch(['a', 2, undefined], matchersUtil)).toBe(
@@ -25,14 +25,14 @@ describe('ArrayWithExactContents', function() {
   });
 
   it('does not match when there is an extra item', function() {
-    var matcher = new jasmineUnderTest.ArrayWithExactContents(['a']);
+    const matcher = new jasmineUnderTest.ArrayWithExactContents(['a']);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(matcher.asymmetricMatch(['a', 2], matchersUtil)).toBe(false);
   });
 
   it('jasmineToStrings itself', function() {
-    var sample = [],
+    const sample = [],
       matcher = new jasmineUnderTest.ArrayWithExactContents(sample),
       pp = jasmine.createSpy('pp').and.returnValue('sample');
 
@@ -43,19 +43,19 @@ describe('ArrayWithExactContents', function() {
   });
 
   it('uses custom equality testers', function() {
-    var tester = function(a, b) {
+    const tester = function(a, b) {
       // All "foo*" strings match each other.
       if (
         typeof a == 'string' &&
         typeof b == 'string' &&
-        a.substr(0, 3) == 'foo' &&
+        a.slice(0, 3) == 'foo' &&
-        b.substr(0, 3) == 'foo'
+        b.slice(0, 3) == 'foo'
       ) {
         return true;
       }
     };
-    var matcher = new jasmineUnderTest.ArrayWithExactContents(['fooVal']);
+    const matcher = new jasmineUnderTest.ArrayWithExactContents(['fooVal']);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
       customTesters: [tester]
     });
 

spec/core/asymmetric_equality/EmptySpec.js

@@ -1,20 +1,20 @@
 describe('Empty', function() {
   it('matches an empty object', function() {
-    var empty = new jasmineUnderTest.Empty();
+    const empty = new jasmineUnderTest.Empty();
 
     expect(empty.asymmetricMatch({})).toBe(true);
     expect(empty.asymmetricMatch({ undefined: false })).toBe(false);
   });
 
   it('matches an empty array', function() {
-    var empty = new jasmineUnderTest.Empty();
+    const empty = new jasmineUnderTest.Empty();
 
     expect(empty.asymmetricMatch([])).toBe(true);
     expect(empty.asymmetricMatch([1, 12, 3])).toBe(false);
   });
 
   it('matches an empty string', function() {
-    var empty = new jasmineUnderTest.Empty();
+    const empty = new jasmineUnderTest.Empty();
 
     expect(empty.asymmetricMatch('')).toBe(true);
     expect(empty.asymmetricMatch('')).toBe(true);
@@ -22,8 +22,8 @@ describe('Empty', function() {
   });
 
   it('matches an empty map', function() {
-    var empty = new jasmineUnderTest.Empty();
+    const empty = new jasmineUnderTest.Empty();
-    var fullMap = new Map();
+    const fullMap = new Map();
     fullMap.set('thing', 2);
 
     expect(empty.asymmetricMatch(new Map())).toBe(true);
@@ -31,8 +31,8 @@ describe('Empty', function() {
   });
 
   it('matches an empty set', function() {
-    var empty = new jasmineUnderTest.Empty();
+    const empty = new jasmineUnderTest.Empty();
-    var fullSet = new Set();
+    const fullSet = new Set();
     fullSet.add(3);
 
     expect(empty.asymmetricMatch(new Set())).toBe(true);
@@ -40,7 +40,7 @@ describe('Empty', function() {
   });
 
   it('matches an empty typed array', function() {
-    var empty = new jasmineUnderTest.Empty();
+    const empty = new jasmineUnderTest.Empty();
 
     expect(empty.asymmetricMatch(new Int16Array())).toBe(true);
     expect(empty.asymmetricMatch(new Int16Array([1, 2]))).toBe(false);

spec/core/asymmetric_equality/FalsySpec.js

@@ -1,6 +1,6 @@
 describe('Falsy', function() {
   it('is true for an empty string', function() {
-    var falsy = new jasmineUnderTest.Falsy();
+    const falsy = new jasmineUnderTest.Falsy();
 
     expect(falsy.asymmetricMatch('')).toBe(true);
     expect(falsy.asymmetricMatch('')).toBe(true);
@@ -8,7 +8,7 @@ describe('Falsy', function() {
   });
 
   it('is false for a number that is 0', function() {
-    var falsy = new jasmineUnderTest.Falsy(Number);
+    const falsy = new jasmineUnderTest.Falsy(Number);
 
     expect(falsy.asymmetricMatch(1)).toBe(false);
     expect(falsy.asymmetricMatch(0)).toBe(true);
@@ -17,20 +17,20 @@ describe('Falsy', function() {
   });
 
   it('is true for a null or undefined', function() {
-    var falsy = new jasmineUnderTest.Falsy(Function);
+    const falsy = new jasmineUnderTest.Falsy(Function);
 
     expect(falsy.asymmetricMatch(null)).toBe(true);
     expect(falsy.asymmetricMatch(undefined)).toBe(true);
   });
 
   it('is true for NaN', function() {
-    var falsy = new jasmineUnderTest.Falsy(Object);
+    const falsy = new jasmineUnderTest.Falsy(Object);
 
     expect(falsy.asymmetricMatch(NaN)).toBe(true);
   });
 
   it('is true for a false Boolean', function() {
-    var falsy = new jasmineUnderTest.Falsy(Boolean);
+    const falsy = new jasmineUnderTest.Falsy(Boolean);
 
     expect(falsy.asymmetricMatch(false)).toBe(true);
     expect(falsy.asymmetricMatch(true)).toBe(false);

spec/core/asymmetric_equality/IsSpec.js

@@ -0,0 +1,30 @@
+describe('Is', function() {
+  it('passes for primitives that are ===', function() {
+    const exactly = new jasmineUnderTest.Is(17);
+    expect(exactly.asymmetricMatch(17)).toBeTrue();
+  });
+
+  it('fails for primitives that are not ===', function() {
+    const exactly = new jasmineUnderTest.Is(42);
+    expect(exactly.asymmetricMatch('42')).toBeFalse();
+  });
+
+  it('passes for the same object instance', function() {
+    const obj = {};
+    const exactly = new jasmineUnderTest.Is(obj);
+    expect(exactly.asymmetricMatch(obj)).toBeTrue();
+  });
+
+  it('fails for different object instances, even if they are deep value equal', function() {
+    const exactly = new jasmineUnderTest.Is({});
+    expect(exactly.asymmetricMatch({})).toBeFalse();
+  });
+
+  it('describes itself for use in diffs and pretty printing', function() {
+    const exactly = new jasmineUnderTest.Is({ foo: ['bar'] });
+    const pp = jasmineUnderTest.basicPrettyPrinter_;
+    expect(exactly.jasmineToString(pp)).toEqual(
+      "<jasmine.is(Object({ foo: [ 'bar' ] }))>"
+    );
+  });
+});

spec/core/asymmetric_equality/MapContainingSpec.js

@@ -1,104 +1,110 @@
 describe('MapContaining', function() {
   it('matches any actual map to an empty map', function() {
-    var actualMap = new Map([['foo', 'bar']]);
+    const actualMap = new Map([['foo', 'bar']]);
-    var containing = new jasmineUnderTest.MapContaining(new Map());
+    const containing = new jasmineUnderTest.MapContaining(new Map());
 
     expect(containing.asymmetricMatch(actualMap)).toBe(true);
   });
 
   it('matches when all the key/value pairs in sample have matches in actual', function() {
-    var actualMap = new Map([
+    const actualMap = new Map([
       ['foo', [1, 2, 3]],
       [{ foo: 'bar' }, 'baz'],
       ['other', 'any']
     ]);
 
-    var containingMap = new Map([[{ foo: 'bar' }, 'baz'], ['foo', [1, 2, 3]]]);
+    const containingMap = new Map([
-    var containing = new jasmineUnderTest.MapContaining(containingMap);
+      [{ foo: 'bar' }, 'baz'],
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      ['foo', [1, 2, 3]]
+    ]);
+    const containing = new jasmineUnderTest.MapContaining(containingMap);
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(true);
   });
 
   it('does not match when a key is not in actual', function() {
-    var actualMap = new Map([
+    const actualMap = new Map([
       ['foo', [1, 2, 3]],
       [{ foo: 'not a bar' }, 'baz']
     ]);
 
-    var containingMap = new Map([[{ foo: 'bar' }, 'baz'], ['foo', [1, 2, 3]]]);
+    const containingMap = new Map([
-    var containing = new jasmineUnderTest.MapContaining(containingMap);
+      [{ foo: 'bar' }, 'baz'],
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      ['foo', [1, 2, 3]]
+    ]);
+    const containing = new jasmineUnderTest.MapContaining(containingMap);
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(false);
   });
 
   it('does not match when a value is not in actual', function() {
-    var actualMap = new Map([['foo', [1, 2, 3]], [{ foo: 'bar' }, 'baz']]);
+    const actualMap = new Map([['foo', [1, 2, 3]], [{ foo: 'bar' }, 'baz']]);
 
-    var containingMap = new Map([[{ foo: 'bar' }, 'baz'], ['foo', [1, 2]]]);
+    const containingMap = new Map([[{ foo: 'bar' }, 'baz'], ['foo', [1, 2]]]);
-    var containing = new jasmineUnderTest.MapContaining(containingMap);
+    const containing = new jasmineUnderTest.MapContaining(containingMap);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(false);
   });
 
   it('matches when all the key/value pairs in sample have asymmetric matches in actual', function() {
-    var actualMap = new Map([
+    const actualMap = new Map([
       ['foo1', 'not a bar'],
       ['foo2', 'bar'],
       ['baz', [1, 2, 3, 4]]
     ]);
 
-    var containingMap = new Map([
+    const containingMap = new Map([
       [jasmineUnderTest.stringMatching(/^foo\d/), 'bar'],
       ['baz', jasmineUnderTest.arrayContaining([2, 3])]
     ]);
-    var containing = new jasmineUnderTest.MapContaining(containingMap);
+    const containing = new jasmineUnderTest.MapContaining(containingMap);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(true);
   });
 
   it('does not match when a key in sample has no asymmetric matches in actual', function() {
-    var actualMap = new Map([['a-foo1', 'bar'], ['baz', [1, 2, 3, 4]]]);
+    const actualMap = new Map([['a-foo1', 'bar'], ['baz', [1, 2, 3, 4]]]);
 
-    var containingMap = new Map([
+    const containingMap = new Map([
       [jasmineUnderTest.stringMatching(/^foo\d/), 'bar'],
       ['baz', jasmineUnderTest.arrayContaining([2, 3])]
     ]);
-    var containing = new jasmineUnderTest.MapContaining(containingMap);
+    const containing = new jasmineUnderTest.MapContaining(containingMap);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(false);
   });
 
   it('does not match when a value in sample has no asymmetric matches in actual', function() {
-    var actualMap = new Map([['foo1', 'bar'], ['baz', [1, 2, 3, 4]]]);
+    const actualMap = new Map([['foo1', 'bar'], ['baz', [1, 2, 3, 4]]]);
 
-    var containingMap = new Map([
+    const containingMap = new Map([
       [jasmineUnderTest.stringMatching(/^foo\d/), 'bar'],
       ['baz', jasmineUnderTest.arrayContaining([4, 5])]
     ]);
-    var containing = new jasmineUnderTest.MapContaining(containingMap);
+    const containing = new jasmineUnderTest.MapContaining(containingMap);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(false);
   });
 
   it('matches recursively', function() {
-    var actualMap = new Map([
+    const actualMap = new Map([
       ['foo', new Map([['foo1', 1], ['foo2', 2]])],
       [new Map([[1, 'bar1'], [2, 'bar2']]), 'bar'],
       ['other', 'any']
     ]);
 
-    var containingMap = new Map([
+    const containingMap = new Map([
       ['foo', new jasmineUnderTest.MapContaining(new Map([['foo1', 1]]))],
       [new jasmineUnderTest.MapContaining(new Map([[2, 'bar2']])), 'bar']
     ]);
-    var containing = new jasmineUnderTest.MapContaining(containingMap);
+    const containing = new jasmineUnderTest.MapContaining(containingMap);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualMap, matchersUtil)).toBe(true);
   });
@@ -110,9 +116,11 @@ describe('MapContaining', function() {
         ? a < 0 && b < 0
         : a === b;
     }
-    var actualMap = new Map([['foo', -1]]);
+    const actualMap = new Map([['foo', -1]]);
-    var containing = new jasmineUnderTest.MapContaining(new Map([['foo', -2]]));
+    const containing = new jasmineUnderTest.MapContaining(
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+      new Map([['foo', -2]])
+    );
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
       customTesters: [tester]
     });
 
@@ -120,7 +128,7 @@ describe('MapContaining', function() {
   });
 
   it('does not match when actual is not a map', function() {
-    var containingMap = new Map([['foo', 'bar']]);
+    const containingMap = new Map([['foo', 'bar']]);
     expect(
       new jasmineUnderTest.MapContaining(containingMap).asymmetricMatch('foo')
     ).toBe(false);
@@ -143,7 +151,7 @@ describe('MapContaining', function() {
   });
 
   it('defines a `jasmineToString` method', function() {
-    var sample = new Map(),
+    const sample = new Map(),
       containing = new jasmineUnderTest.MapContaining(sample),
       pp = jasmine.createSpy('pp').and.returnValue('sample');
 

spec/core/asymmetric_equality/NotEmptySpec.js

@@ -1,20 +1,20 @@
 describe('NotEmpty', function() {
   it('matches a non empty object', function() {
-    var notEmpty = new jasmineUnderTest.NotEmpty();
+    const notEmpty = new jasmineUnderTest.NotEmpty();
 
     expect(notEmpty.asymmetricMatch({ undefined: false })).toBe(true);
     expect(notEmpty.asymmetricMatch({})).toBe(false);
   });
 
   it('matches a non empty array', function() {
-    var notEmpty = new jasmineUnderTest.NotEmpty();
+    const notEmpty = new jasmineUnderTest.NotEmpty();
 
     expect(notEmpty.asymmetricMatch([1, 12, 3])).toBe(true);
     expect(notEmpty.asymmetricMatch([])).toBe(false);
   });
 
   it('matches a non empty string', function() {
-    var notEmpty = new jasmineUnderTest.NotEmpty();
+    const notEmpty = new jasmineUnderTest.NotEmpty();
 
     expect(notEmpty.asymmetricMatch('12312')).toBe(true);
     expect(notEmpty.asymmetricMatch('')).toBe(false);
@@ -22,27 +22,27 @@ describe('NotEmpty', function() {
   });
 
   it('matches a non empty map', function() {
-    var notEmpty = new jasmineUnderTest.NotEmpty();
+    const notEmpty = new jasmineUnderTest.NotEmpty();
-    var fullMap = new Map();
+    const fullMap = new Map();
     fullMap.set('one', 1);
-    var emptyMap = new Map();
+    const emptyMap = new Map();
 
     expect(notEmpty.asymmetricMatch(fullMap)).toBe(true);
     expect(notEmpty.asymmetricMatch(emptyMap)).toBe(false);
   });
 
   it('matches a non empty set', function() {
-    var notEmpty = new jasmineUnderTest.NotEmpty();
+    const notEmpty = new jasmineUnderTest.NotEmpty();
-    var filledSet = new Set();
+    const filledSet = new Set();
     filledSet.add(1);
-    var emptySet = new Set();
+    const emptySet = new Set();
 
     expect(notEmpty.asymmetricMatch(filledSet)).toBe(true);
     expect(notEmpty.asymmetricMatch(emptySet)).toBe(false);
   });
 
   it('matches a non empty typed array', function() {
-    var notEmpty = new jasmineUnderTest.NotEmpty();
+    const notEmpty = new jasmineUnderTest.NotEmpty();
 
     expect(notEmpty.asymmetricMatch(new Int16Array([1, 2, 3]))).toBe(true);
     expect(notEmpty.asymmetricMatch(new Int16Array())).toBe(false);

spec/core/asymmetric_equality/ObjectContainingSpec.js

@@ -1,13 +1,13 @@
 describe('ObjectContaining', function() {
   it('matches any object actual to an empty object', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({});
+    const containing = new jasmineUnderTest.ObjectContaining({});
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch({ foo: 1 }, matchersUtil)).toBe(true);
   });
 
   it('does not match when the actual is not an object', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({});
+    const containing = new jasmineUnderTest.ObjectContaining({});
 
     [1, true, undefined, 'a string'].forEach(function(actual) {
       expect(containing.asymmetricMatch(actual)).toBe(false);
@@ -15,7 +15,7 @@ describe('ObjectContaining', function() {
   });
 
   it('does not match an empty object actual', function() {
-    var containing = new jasmineUnderTest.ObjectContaining('foo');
+    const containing = new jasmineUnderTest.ObjectContaining('foo');
 
     expect(function() {
       containing.asymmetricMatch({});
@@ -23,8 +23,8 @@ describe('ObjectContaining', function() {
   });
 
   it('matches when the key/value pair is present in the actual', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
+    const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(
       containing.asymmetricMatch({ foo: 'fooVal', bar: 'barVal' }, matchersUtil)
@@ -32,8 +32,8 @@ describe('ObjectContaining', function() {
   });
 
   it('does not match when the key/value pair is not present in the actual', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
+    const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(
       containing.asymmetricMatch(
@@ -44,8 +44,8 @@ describe('ObjectContaining', function() {
   });
 
   it('does not match when the key is present but the value is different in the actual', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({ foo: 'other' });
+    const containing = new jasmineUnderTest.ObjectContaining({ foo: 'other' });
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(
       containing.asymmetricMatch({ foo: 'fooVal', bar: 'barVal' }, matchersUtil)
@@ -53,7 +53,7 @@ describe('ObjectContaining', function() {
   });
 
   it("jasmineToString's itself", function() {
-    var sample = {},
+    const sample = {},
       matcher = new jasmineUnderTest.ObjectContaining(sample),
       pp = jasmine.createSpy('pp').and.returnValue('sample');
 
@@ -64,10 +64,10 @@ describe('ObjectContaining', function() {
   });
 
   it('matches recursively', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({
+    const containing = new jasmineUnderTest.ObjectContaining({
       one: new jasmineUnderTest.ObjectContaining({ two: {} })
     });
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch({ one: { two: {} } }, matchersUtil)).toBe(
       true
@@ -75,8 +75,10 @@ describe('ObjectContaining', function() {
   });
 
   it('matches when key is present with undefined value', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({ one: undefined });
+    const containing = new jasmineUnderTest.ObjectContaining({
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      one: undefined
+    });
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch({ one: undefined }, matchersUtil)).toBe(
       true
@@ -84,17 +86,19 @@ describe('ObjectContaining', function() {
   });
 
   it('does not match when key with undefined value is not present', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({ one: undefined });
+    const containing = new jasmineUnderTest.ObjectContaining({
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      one: undefined
+    });
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch({}, matchersUtil)).toBe(false);
   });
 
   it('matches defined properties', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
+    const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
-    var definedPropertyObject = {};
+    const definedPropertyObject = {};
     Object.defineProperty(definedPropertyObject, 'foo', {
       get: function() {
         return 'fooVal';
@@ -106,29 +110,29 @@ describe('ObjectContaining', function() {
   });
 
   it('matches prototype properties', function() {
-    var containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
+    const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
-    var prototypeObject = { foo: 'fooVal' };
+    const prototypeObject = { foo: 'fooVal' };
-    var obj = Object.create(prototypeObject);
+    const obj = Object.create(prototypeObject);
 
     expect(containing.asymmetricMatch(obj, matchersUtil)).toBe(true);
   });
 
   it('uses custom equality testers', function() {
-    var tester = function(a, b) {
+    const tester = function(a, b) {
       // All "foo*" strings match each other.
       if (
         typeof a == 'string' &&
         typeof b == 'string' &&
-        a.substr(0, 3) == 'foo' &&
+        a.slice(0, 3) == 'foo' &&
-        b.substr(0, 3) == 'foo'
+        b.slice(0, 3) == 'foo'
       ) {
         return true;
       }
     };
-    var containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
+    const containing = new jasmineUnderTest.ObjectContaining({ foo: 'fooVal' });
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
       customTesters: [tester]
     });
 
@@ -140,7 +144,7 @@ describe('ObjectContaining', function() {
   describe('valuesForDiff_', function() {
     describe('when other is not an object', function() {
       it('sets self to jasmineToString()', function() {
-        var containing = new jasmineUnderTest.ObjectContaining({}),
+        const containing = new jasmineUnderTest.ObjectContaining({}),
           pp = jasmineUnderTest.makePrettyPrinter(),
           result = containing.valuesForDiff_('a', pp);
 
@@ -153,7 +157,7 @@ describe('ObjectContaining', function() {
 
     describe('when other is an object', function() {
       it('includes keys that are present in both other and sample', function() {
-        var sample = { a: 1, b: 2 },
+        const sample = { a: 1, b: 2 },
           other = { a: 3, b: 4 },
           containing = new jasmineUnderTest.ObjectContaining(sample),
           result = containing.valuesForDiff_(other);
@@ -168,7 +172,7 @@ describe('ObjectContaining', function() {
       });
 
       it('includes keys that are present only in sample', function() {
-        var sample = { a: 1, b: 2 },
+        const sample = { a: 1, b: 2 },
           other = { a: 3 },
           containing = new jasmineUnderTest.ObjectContaining(sample),
           result = containing.valuesForDiff_(other);
@@ -186,7 +190,7 @@ describe('ObjectContaining', function() {
       });
 
       it('omits keys that are present only in other', function() {
-        var sample = { a: 1, b: 2 },
+        const sample = { a: 1, b: 2 },
           other = { a: 3, b: 4, c: 5 },
           containing = new jasmineUnderTest.ObjectContaining(sample),
           result = containing.valuesForDiff_(other);

spec/core/asymmetric_equality/SetContainingSpec.js

@@ -1,66 +1,66 @@
 describe('SetContaining', function() {
   it('matches any actual set to an empty set', function() {
-    var actualSet = new Set(['foo', 'bar']);
+    const actualSet = new Set(['foo', 'bar']);
-    var containing = new jasmineUnderTest.SetContaining(new Set());
+    const containing = new jasmineUnderTest.SetContaining(new Set());
 
     expect(containing.asymmetricMatch(actualSet)).toBe(true);
   });
 
   it('matches when all the values in sample have matches in actual', function() {
-    var actualSet = new Set([{ foo: 'bar' }, 'baz', [1, 2, 3]]);
+    const actualSet = new Set([{ foo: 'bar' }, 'baz', [1, 2, 3]]);
 
-    var containingSet = new Set([[1, 2, 3], { foo: 'bar' }]);
+    const containingSet = new Set([[1, 2, 3], { foo: 'bar' }]);
-    var containing = new jasmineUnderTest.SetContaining(containingSet);
+    const containing = new jasmineUnderTest.SetContaining(containingSet);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(true);
   });
 
   it('does not match when a value is not in actual', function() {
-    var actualSet = new Set([{ foo: 'bar' }, 'baz', [1, 2, 3]]);
+    const actualSet = new Set([{ foo: 'bar' }, 'baz', [1, 2, 3]]);
 
-    var containingSet = new Set([[1, 2], { foo: 'bar' }]);
+    const containingSet = new Set([[1, 2], { foo: 'bar' }]);
-    var containing = new jasmineUnderTest.SetContaining(containingSet);
+    const containing = new jasmineUnderTest.SetContaining(containingSet);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(false);
   });
 
   it('matches when all the values in sample have asymmetric matches in actual', function() {
-    var actualSet = new Set([[1, 2, 3, 4], 'other', 'foo1']);
+    const actualSet = new Set([[1, 2, 3, 4], 'other', 'foo1']);
 
-    var containingSet = new Set([
+    const containingSet = new Set([
       jasmineUnderTest.stringMatching(/^foo\d/),
       jasmineUnderTest.arrayContaining([2, 3])
     ]);
-    var containing = new jasmineUnderTest.SetContaining(containingSet);
+    const containing = new jasmineUnderTest.SetContaining(containingSet);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(true);
   });
 
   it('does not match when a value in sample has no asymmetric matches in actual', function() {
-    var actualSet = new Set(['a-foo1', [1, 2, 3, 4], 'other']);
+    const actualSet = new Set(['a-foo1', [1, 2, 3, 4], 'other']);
 
-    var containingSet = new Set([
+    const containingSet = new Set([
       jasmine.stringMatching(/^foo\d/),
       jasmine.arrayContaining([2, 3])
     ]);
-    var containing = new jasmineUnderTest.SetContaining(containingSet);
+    const containing = new jasmineUnderTest.SetContaining(containingSet);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(false);
   });
 
   it('matches recursively', function() {
-    var actualSet = new Set(['foo', new Set([1, 'bar', 2]), 'other']);
+    const actualSet = new Set(['foo', new Set([1, 'bar', 2]), 'other']);
 
-    var containingSet = new Set([
+    const containingSet = new Set([
       new jasmineUnderTest.SetContaining(new Set(['bar'])),
       'foo'
     ]);
-    var containing = new jasmineUnderTest.SetContaining(containingSet);
+    const containing = new jasmineUnderTest.SetContaining(containingSet);
-    var matchersUtil = new jasmineUnderTest.MatchersUtil();
+    const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
     expect(containing.asymmetricMatch(actualSet, matchersUtil)).toBe(true);
   });
@@ -72,9 +72,9 @@ describe('SetContaining', function() {
         ? a < 0 && b < 0
         : a === b;
     }
-    var actualSet = new Set(['foo', -1]);
+    const actualSet = new Set(['foo', -1]);
-    var containing = new jasmineUnderTest.SetContaining(new Set([-2, 'foo']));
+    const containing = new jasmineUnderTest.SetContaining(new Set([-2, 'foo']));
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
       customTesters: [tester]
     });
 
@@ -82,7 +82,7 @@ describe('SetContaining', function() {
   });
 
   it('does not match when actual is not a set', function() {
-    var containingSet = new Set(['foo']);
+    const containingSet = new Set(['foo']);
     expect(
       new jasmineUnderTest.SetContaining(containingSet).asymmetricMatch('foo')
     ).toBe(false);
@@ -103,7 +103,7 @@ describe('SetContaining', function() {
   });
 
   it('defines a `jasmineToString` method', function() {
-    var sample = new Set(),
+    const sample = new Set(),
       containing = new jasmineUnderTest.SetContaining(sample),
       pp = jasmine.createSpy('pp').and.returnValue('sample');
 

spec/core/asymmetric_equality/StringContainingSpec.js

@@ -1,6 +1,6 @@
 describe('StringContaining', function() {
   it('searches for a provided substring when the expected is a String', function() {
-    var matcher = new jasmineUnderTest.StringContaining('foo');
+    const matcher = new jasmineUnderTest.StringContaining('foo');
 
     expect(matcher.asymmetricMatch('barfoobaz')).toBe(true);
     expect(matcher.asymmetricMatch('barbaz')).toBe(false);
@@ -13,12 +13,12 @@ describe('StringContaining', function() {
   });
 
   it('fails when the actual is not a String', function() {
-    var matcher = new jasmineUnderTest.StringContaining('x');
+    const matcher = new jasmineUnderTest.StringContaining('x');
     expect(matcher.asymmetricMatch(['x'])).toBe(false);
   });
 
   it("jasmineToString's itself", function() {
-    var matching = new jasmineUnderTest.StringContaining('foo');
+    const matching = new jasmineUnderTest.StringContaining('foo');
 
     expect(matching.jasmineToString()).toEqual(
       '<jasmine.stringContaining("foo")>'

spec/core/asymmetric_equality/StringMatchingSpec.js

@@ -1,13 +1,13 @@
 describe('StringMatching', function() {
   it('matches a string against a provided regexp', function() {
-    var matcher = new jasmineUnderTest.StringMatching(/foo/);
+    const matcher = new jasmineUnderTest.StringMatching(/foo/);
 
     expect(matcher.asymmetricMatch('barfoobaz')).toBe(true);
     expect(matcher.asymmetricMatch('barbaz')).toBe(false);
   });
 
   it('matches a string against provided string', function() {
-    var matcher = new jasmineUnderTest.StringMatching('foo');
+    const matcher = new jasmineUnderTest.StringMatching('foo');
 
     expect(matcher.asymmetricMatch('barfoobaz')).toBe(true);
     expect(matcher.asymmetricMatch('barbaz')).toBe(false);
@@ -20,7 +20,7 @@ describe('StringMatching', function() {
   });
 
   it("jasmineToString's itself", function() {
-    var matching = new jasmineUnderTest.StringMatching(/^foo/);
+    const matching = new jasmineUnderTest.StringMatching(/^foo/);
 
     expect(matching.jasmineToString()).toEqual(
       '<jasmine.stringMatching(/^foo/)>'

spec/core/asymmetric_equality/TruthySpec.js

@@ -1,13 +1,13 @@
 describe('Truthy', function() {
   it('is true for a non empty string', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch('foo')).toBe(true);
     expect(truthy.asymmetricMatch('')).toBe(false);
   });
 
   it('is true for a number that is not 0', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch(1)).toBe(true);
     expect(truthy.asymmetricMatch(0)).toBe(false);
@@ -16,44 +16,44 @@ describe('Truthy', function() {
   });
 
   it('is true for a function', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch(function() {})).toBe(true);
   });
 
   it('is true for an Object', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch({})).toBe(true);
   });
 
   it('is true for a truthful Boolean', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch(true)).toBe(true);
     expect(truthy.asymmetricMatch(false)).toBe(false);
   });
 
   it('is true for an empty object', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch({})).toBe(true);
   });
 
   it('is true for an empty array', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch([])).toBe(true);
   });
 
   it('is true for a date', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch(new Date())).toBe(true);
   });
 
   it('is true for a infiniti', function() {
-    var truthy = new jasmineUnderTest.Truthy();
+    const truthy = new jasmineUnderTest.Truthy();
 
     expect(truthy.asymmetricMatch(Infinity)).toBe(true);
     expect(truthy.asymmetricMatch(-Infinity)).toBe(true);

spec/core/baseSpec.js

@@ -6,9 +6,9 @@ describe('base helpers', function() {
         return;
       }
 
-      var obj = (function() {
+      const obj = (function() {
-        var sock = new WebSocket('ws://localhost');
+        const sock = new WebSocket('ws://localhost');
-        var event;
+        let event;
         sock.onerror = function(e) {
           event = e;
         };
@@ -16,11 +16,11 @@ describe('base helpers', function() {
           return event;
         };
       })();
-      var left = 20;
+      let left = 20;
 
-      var int = setInterval(function() {
+      const int = setInterval(function() {
         if (obj() || left === 0) {
-          var result = jasmineUnderTest.isError_(obj());
+          const result = jasmineUnderTest.isError_(obj());
           expect(result).toBe(false);
           clearInterval(int);
           done();
@@ -41,18 +41,16 @@ describe('base helpers', function() {
     });
 
     it('returns true for an Error that originated from another frame', function() {
-      var iframe, error;
-
       if (typeof window === 'undefined') {
         pending('This test only runs in browsers.');
       }
 
-      iframe = document.createElement('iframe');
+      const iframe = document.createElement('iframe');
       iframe.style.display = 'none';
       document.body.appendChild(iframe);
 
       try {
-        error = iframe.contentWindow.eval('new Error()');
+        const error = iframe.contentWindow.eval('new Error()');
         expect(jasmineUnderTest.isError_(error)).toBe(true);
       } finally {
         document.body.removeChild(iframe);
@@ -74,17 +72,17 @@ describe('base helpers', function() {
     });
 
     it('returns false when the argument does not have a asymmetricMatch property', function() {
-      var obj = {};
+      const obj = {};
       expect(jasmineUnderTest.isAsymmetricEqualityTester_(obj)).toBe(false);
     });
 
     it("returns false when the argument's asymmetricMatch is not a function", function() {
-      var obj = { asymmetricMatch: 'yes' };
+      const obj = { asymmetricMatch: 'yes' };
       expect(jasmineUnderTest.isAsymmetricEqualityTester_(obj)).toBe(false);
     });
 
     it("returns true when the argument's asymmetricMatch is a function", function() {
-      var obj = { asymmetricMatch: function() {} };
+      const obj = { asymmetricMatch: function() {} };
       expect(jasmineUnderTest.isAsymmetricEqualityTester_(obj)).toBe(true);
     });
   });
@@ -133,21 +131,21 @@ describe('base helpers', function() {
 
   describe('isPending_', function() {
     it('returns a promise that resolves to true when the promise is pending', function() {
-      var promise = new Promise(function() {});
+      const promise = new Promise(function() {});
       return expectAsync(jasmineUnderTest.isPending_(promise)).toBeResolvedTo(
         true
       );
     });
 
     it('returns a promise that resolves to false when the promise is resolved', function() {
-      var promise = Promise.resolve();
+      const promise = Promise.resolve();
       return expectAsync(jasmineUnderTest.isPending_(promise)).toBeResolvedTo(
         false
       );
     });
 
     it('returns a promise that resolves to false when the promise is rejected', function() {
-      var promise = Promise.reject();
+      const promise = Promise.reject();
       return expectAsync(jasmineUnderTest.isPending_(promise)).toBeResolvedTo(
         false
       );
@@ -155,7 +153,7 @@ describe('base helpers', function() {
   });
 
   describe('DEFAULT_TIMEOUT_INTERVAL setter', function() {
-    var max = 2147483647;
+    const max = 2147483647;
 
     beforeEach(function() {
       this.initialValue = jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL;
@@ -177,14 +175,13 @@ describe('base helpers', function() {
     });
 
     it('is consistent with setTimeout in this environment', function(done) {
-      var f1 = jasmine.createSpy('setTimeout callback for ' + max),
+      const f1 = jasmine.createSpy('setTimeout callback for ' + max),
-        f2 = jasmine.createSpy('setTimeout callback for ' + (max + 1)),
+        f2 = jasmine.createSpy('setTimeout callback for ' + (max + 1));
-        id;
 
       // Suppress printing of TimeoutOverflowWarning in node
       spyOn(console, 'error');
 
-      id = setTimeout(f1, max);
+      let id = setTimeout(f1, max);
       setTimeout(function() {
         clearTimeout(id);
         expect(f1).not.toHaveBeenCalled();

spec/core/buildExpectationResultSpec.js

@@ -0,0 +1,112 @@
+describe('buildExpectationResult', function() {
+  it('defaults to passed', function() {
+    const result = jasmineUnderTest.buildExpectationResult({
+      passed: 'some-value'
+    });
+    expect(result.passed).toBe('some-value');
+  });
+
+  it('message defaults to Passed for passing specs', function() {
+    const result = jasmineUnderTest.buildExpectationResult({
+      passed: true,
+      message: 'some-value'
+    });
+    expect(result.message).toBe('Passed.');
+  });
+
+  it('message returns the message for failing expectations', function() {
+    const result = jasmineUnderTest.buildExpectationResult({
+      passed: false,
+      message: 'some-value'
+    });
+    expect(result.message).toBe('some-value');
+  });
+
+  describe('When the error property is provided', function() {
+    it('sets the message to the formatted error', function() {
+      const result = jasmineUnderTest.buildExpectationResult({
+        passed: false,
+        error: { message: 'foo', fileName: 'somefile.js' }
+      });
+
+      expect(result.message).toEqual('foo in somefile.js');
+    });
+
+    it('delegates stack formatting to the provided formatter', function() {
+      const result = jasmineUnderTest.buildExpectationResult({
+        passed: false,
+        error: { stack: 'foo', extra: 'wombat' }
+      });
+
+      expect(result.stack).toEqual(
+        "error properties: Object({ extra: 'wombat' })\nfoo"
+      );
+    });
+  });
+
+  describe('When the errorForStack property is provided', function() {
+    it('builds the stack trace using errorForStack instead of Error', function() {
+      const result = jasmineUnderTest.buildExpectationResult({
+        passed: false,
+        errorForStack: { stack: 'foo' },
+        error: { stack: 'bar' }
+      });
+
+      expect(result.stack).toEqual('bar');
+    });
+  });
+
+  it('matcherName returns passed matcherName', function() {
+    const result = jasmineUnderTest.buildExpectationResult({
+      matcherName: 'some-value'
+    });
+    expect(result.matcherName).toBe('some-value');
+  });
+
+  it('expected returns passed expected', function() {
+    const result = jasmineUnderTest.buildExpectationResult({
+      expected: 'some-value'
+    });
+    expect(result.expected).toBe('some-value');
+  });
+
+  it('actual returns passed actual', function() {
+    const result = jasmineUnderTest.buildExpectationResult({
+      actual: 'some-value'
+    });
+    expect(result.actual).toBe('some-value');
+  });
+
+  it('handles nodejs assertions', function() {
+    if (typeof require === 'undefined') {
+      return;
+    }
+    const assert = require('assert');
+    const value = 8421;
+    const expectedValue = 'JasmineExpectationTestValue';
+    let error;
+    try {
+      assert.equal(value, expectedValue);
+    } catch (e) {
+      error = e;
+    }
+
+    expect(error.code).toEqual('ERR_ASSERTION');
+    expect(error.actual).toEqual(value);
+    expect(error.expected).toEqual(expectedValue);
+    expect(error.operator).toEqual('==');
+
+    const result = jasmineUnderTest.buildExpectationResult({
+      passed: false,
+      matcherName: '',
+      expected: '',
+      actual: '',
+      error: error
+    });
+
+    expect(result.code).toEqual('ERR_ASSERTION');
+    expect(result.actual).toEqual(value);
+    expect(result.expected).toEqual(expectedValue);
+    expect(result.matcherName).toEqual('assert ==');
+  });
+});

spec/core/formatErrorMsgSpec.js

@@ -1,12 +1,12 @@
 describe('formatErrorMsg', function() {
   it('should format an error with a domain', function() {
-    var formator = jasmineUnderTest.formatErrorMsg('api');
+    const formator = jasmineUnderTest.formatErrorMsg('api');
     expect(formator('message')).toBe('api : message');
     expect(formator('message2')).toBe('api : message2');
   });
 
   it('should format an error with a domain and usage', function() {
-    var formator = jasmineUnderTest.formatErrorMsg('api', 'with a param');
+    const formator = jasmineUnderTest.formatErrorMsg('api', 'with a param');
     expect(formator('message')).toBe('api : message\nUsage: with a param');
     expect(formator('message2')).toBe('api : message2\nUsage: with a param');
   });

spec/core/integration/AsymmetricEqualityTestersSpec.js

@@ -1,55 +1,57 @@
 describe('Asymmetric equality testers (Integration)', function() {
-  function verifyPasses(expectations, setup) {
+  function verifyPasses(expectations) {
-    it('passes', function(done) {
+    it('passes', async function() {
-      var env = new jasmineUnderTest.Env();
+      const env = new jasmineUnderTest.Env();
       env.it('a spec', function() {
         expectations(env);
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('passed');
+      env.addReporter(reporter);
-        expect(result.passedExpectations.length)
+      await env.execute();
-          .withContext('Number of passed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations.length)
-          .withContext('Number of failed expectations')
-          .toEqual(0);
-        expect(
-          result.failedExpectations[0] && result.failedExpectations[0].message
-        )
-          .withContext('Failure message')
-          .toBeUndefined();
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+
+      expect(result.status).toEqual('passed');
+      expect(result.passedExpectations.length)
+        .withContext('Number of passed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(0);
+      expect(
+        result.failedExpectations[0] && result.failedExpectations[0].message
+      )
+        .withContext('Failure message')
+        .toBeUndefined();
     });
   }
 
   function verifyFails(expectations) {
-    it('fails', function(done) {
+    it('fails', async function() {
-      var env = new jasmineUnderTest.Env();
+      const env = new jasmineUnderTest.Env();
       env.it('a spec', function() {
         expectations(env);
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('failed');
+      env.addReporter(reporter);
-        expect(result.failedExpectations.length)
+      await env.execute();
-          .withContext('Number of failed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations[0].message)
-          .withContext(
-            'Failed with a thrown error rather than a matcher failure'
-          )
-          .not.toMatch(/^Error: /);
-        expect(result.failedExpectations[0].matcherName)
-          .withContext('Matcher name')
-          .not.toEqual('');
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+
+      expect(result.status).toEqual('failed');
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations[0].message)
+        .withContext('Failed with a thrown error rather than a matcher failure')
+        .not.toMatch(/^Error: /);
+      expect(result.failedExpectations[0].matcherName)
+        .withContext('Matcher name')
+        .not.toEqual('');
     });
   }
 
@@ -123,9 +125,9 @@ describe('Asymmetric equality testers (Integration)', function() {
 
   describe('mapContaining', function() {
     verifyPasses(function(env) {
-      var actual = new Map();
+      const actual = new Map();
       actual.set('a', '2');
-      var expected = new Map();
+      const expected = new Map();
       expected.set('a', 2);
 
       env.addCustomEqualityTester(function(a, b) {
@@ -170,9 +172,9 @@ describe('Asymmetric equality testers (Integration)', function() {
 
   describe('setContaining', function() {
     verifyPasses(function(env) {
-      var actual = new Set();
+      const actual = new Set();
       actual.add('1');
-      var expected = new Set();
+      const expected = new Set();
       actual.add(1);
 
       env.addCustomEqualityTester(function(a, b) {

spec/core/integration/CustomAsyncMatchersSpec.js

@@ -1,5 +1,5 @@
 describe('Custom Async Matchers (Integration)', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -25,7 +25,7 @@ describe('Custom Async Matchers (Integration)', function() {
       return env.expectAsync(true).toBeReal();
     });
 
-    var specExpectations = function(result) {
+    const specExpectations = function(result) {
       expect(result.status).toEqual('passed');
     };
 
@@ -51,7 +51,7 @@ describe('Custom Async Matchers (Integration)', function() {
       return env.expectAsync(true).not.toBeReal();
     });
 
-    var specExpectations = function(result) {
+    const specExpectations = function(result) {
       expect(result.status).toEqual('passed');
     };
 
@@ -74,7 +74,7 @@ describe('Custom Async Matchers (Integration)', function() {
       return env.expectAsync('a').toBeReal();
     });
 
-    var specExpectations = function(result) {
+    const specExpectations = function(result) {
       expect(result.failedExpectations[0].message).toEqual(
         "Expected 'a' to be real."
       );
@@ -85,7 +85,7 @@ describe('Custom Async Matchers (Integration)', function() {
   });
 
   it('passes the jasmine utility to the matcher factory', function(done) {
-    var matcherFactory = function(util) {
+    const matcherFactory = function() {
         return {
           compare: function() {
             return Promise.resolve({ pass: true });
@@ -105,7 +105,7 @@ describe('Custom Async Matchers (Integration)', function() {
       return env.expectAsync(true).toBeReal();
     });
 
-    var specExpectations = function() {
+    const specExpectations = function() {
       expect(matcherFactorySpy).toHaveBeenCalledWith(
         jasmine.any(jasmineUnderTest.MatchersUtil)
       );
@@ -116,7 +116,7 @@ describe('Custom Async Matchers (Integration)', function() {
   });
 
   it('provides custom equality testers to the matcher factory via matchersUtil', function(done) {
-    var matcherFactory = function(matchersUtil) {
+    const matcherFactory = function(matchersUtil) {
         return {
           compare: function(actual, expected) {
             return Promise.resolve({
@@ -140,7 +140,7 @@ describe('Custom Async Matchers (Integration)', function() {
       return env.expectAsync([1, 2]).toBeArrayWithFirstElement('1');
     });
 
-    var specExpectations = function(result) {
+    const specExpectations = function(result) {
       expect(customEqualityFn).toHaveBeenCalledWith(1, '1');
       expect(result.failedExpectations).toEqual([]);
     };

spec/core/integration/CustomMatchersSpec.js

@@ -1,6 +1,5 @@
 describe('Custom Matchers (Integration)', function() {
-  var env;
+  let env;
-  var fakeTimer;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -11,7 +10,7 @@ describe('Custom Matchers (Integration)', function() {
     env.cleanup_();
   });
 
-  it('allows adding more matchers local to a spec', function(done) {
+  it('allows adding more matchers local to a spec', async function() {
     env.it('spec defining a custom matcher', function() {
       env.addMatchers({
         matcherForSpec: function() {
@@ -37,21 +36,19 @@ describe('Custom Matchers (Integration)', function() {
       expect(env.expect('zzz').matcherForSpec).toBeUndefined();
     });
 
-    var specDoneSpy = jasmine.createSpy('specDoneSpy');
+    const specDoneSpy = jasmine.createSpy('specDoneSpy');
-    var expectations = function() {
-      var firstSpecResult = specDoneSpy.calls.first().args[0];
-      expect(firstSpecResult.status).toEqual('failed');
-      expect(firstSpecResult.failedExpectations[0].message).toEqual(
-        'matcherForSpec: actual: zzz; expected: yyy'
-      );
-      done();
-    };
     env.addReporter({ specDone: specDoneSpy });
 
-    env.execute(null, expectations);
+    await env.execute();
+
+    const firstSpecResult = specDoneSpy.calls.first().args[0];
+    expect(firstSpecResult.status).toEqual('failed');
+    expect(firstSpecResult.failedExpectations[0].message).toEqual(
+      'matcherForSpec: actual: zzz; expected: yyy'
+    );
   });
 
-  it('passes the spec if the custom matcher passes', function(done) {
+  it('passes the spec if the custom matcher passes', async function() {
     env.it('spec using custom matcher', function() {
       env.addMatchers({
         toBeReal: function() {
@@ -66,23 +63,24 @@ describe('Custom Matchers (Integration)', function() {
       env.expect(true).toBeReal();
     });
 
-    var specExpectations = function(result) {
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-      expect(result.status).toEqual('passed');
+    env.addReporter(reporter);
-    };
+    await env.execute();
 
-    env.addReporter({ specDone: specExpectations });
+    expect(reporter.specDone).toHaveBeenCalledTimes(1);
-    env.execute(null, done);
+    const result = reporter.specDone.calls.argsFor(0)[0];
+    expect(result.status).toEqual('passed');
   });
 
-  it('passes the spec if the custom equality matcher passes for types nested inside asymmetric equality testers', function(done) {
+  it('passes the spec if the custom equality matcher passes for types nested inside asymmetric equality testers', async function() {
     env.it('spec using custom equality matcher', function() {
-      var customEqualityFn = function(a, b) {
+      const customEqualityFn = function(a, b) {
         // All "foo*" strings match each other.
         if (
           typeof a == 'string' &&
           typeof b == 'string' &&
-          a.substr(0, 3) == 'foo' &&
+          a.slice(0, 3) == 'foo' &&
-          b.substr(0, 3) == 'foo'
+          b.slice(0, 3) == 'foo'
         ) {
           return true;
         }
@@ -100,17 +98,18 @@ describe('Custom Matchers (Integration)', function() {
         .toEqual(jasmineUnderTest.arrayWithExactContents(['fooBar']));
     });
 
-    var specExpectations = function(result) {
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-      expect(result.status).toEqual('passed');
+    env.addReporter(reporter);
-    };
+    await env.execute();
 
-    env.addReporter({ specDone: specExpectations });
+    expect(reporter.specDone).toHaveBeenCalledTimes(1);
-    env.execute(null, done);
+    const result = reporter.specDone.calls.argsFor(0)[0];
+    expect(result.status).toEqual('passed');
   });
 
-  it('displays an appropriate failure message if a custom equality matcher fails', function(done) {
+  it('displays an appropriate failure message if a custom equality matcher fails', async function() {
     env.it('spec using custom equality matcher', function() {
-      var customEqualityFn = function(a, b) {
+      const customEqualityFn = function(a, b) {
         // "foo" is not equal to anything
         if (a === 'foo' || b === 'foo') {
           return false;
@@ -121,18 +120,19 @@ describe('Custom Matchers (Integration)', function() {
       env.expect({ foo: 'foo' }).toEqual({ foo: 'foo' });
     });
 
-    var specExpectations = function(result) {
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-      expect(result.status).toEqual('failed');
+    env.addReporter(reporter);
-      expect(result.failedExpectations[0].message).toEqual(
+    await env.execute();
-        "Expected $.foo = 'foo' to equal 'foo'."
-      );
-    };
 
-    env.addReporter({ specDone: specExpectations });
+    expect(reporter.specDone).toHaveBeenCalledTimes(1);
-    env.execute(null, done);
+    const result = reporter.specDone.calls.argsFor(0)[0];
+    expect(result.status).toEqual('failed');
+    expect(result.failedExpectations[0].message).toEqual(
+      "Expected $.foo = 'foo' to equal 'foo'."
+    );
   });
 
-  it('uses the negative compare function for a negative comparison, if provided', function(done) {
+  it('uses the negative compare function for a negative comparison, if provided', async function() {
     env.it('spec with custom negative comparison matcher', function() {
       env.addMatchers({
         toBeReal: function() {
@@ -150,15 +150,16 @@ describe('Custom Matchers (Integration)', function() {
       env.expect(true).not.toBeReal();
     });
 
-    var specExpectations = function(result) {
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-      expect(result.status).toEqual('passed');
+    env.addReporter(reporter);
-    };
+    await env.execute();
 
-    env.addReporter({ specDone: specExpectations });
+    expect(reporter.specDone).toHaveBeenCalledTimes(1);
-    env.execute(null, done);
+    const result = reporter.specDone.calls.argsFor(0)[0];
+    expect(result.status).toEqual('passed');
   });
 
-  it('generates messages with the same rules as built in matchers absent a custom message', function(done) {
+  it('generates messages with the same rules as built in matchers absent a custom message', async function() {
     env.it('spec with an expectation', function() {
       env.addMatchers({
         toBeReal: function() {
@@ -173,18 +174,19 @@ describe('Custom Matchers (Integration)', function() {
       env.expect('a').toBeReal();
     });
 
-    var specExpectations = function(result) {
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-      expect(result.failedExpectations[0].message).toEqual(
+    env.addReporter(reporter);
-        "Expected 'a' to be real."
+    await env.execute();
-      );
-    };
 
-    env.addReporter({ specDone: specExpectations });
+    expect(reporter.specDone).toHaveBeenCalledTimes(1);
-    env.execute(null, done);
+    const result = reporter.specDone.calls.argsFor(0)[0];
+    expect(result.failedExpectations[0].message).toEqual(
+      "Expected 'a' to be real."
+    );
   });
 
-  it('passes the expected and actual arguments to the comparison function', function(done) {
+  it('passes the expected and actual arguments to the comparison function', async function() {
-    var argumentSpy = jasmine
+    const argumentSpy = jasmine
       .createSpy('argument spy')
       .and.returnValue({ pass: true });
 
@@ -200,18 +202,14 @@ describe('Custom Matchers (Integration)', function() {
       env.expect(true).toBeReal('arg1', 'arg2');
     });
 
-    var specExpectations = function() {
+    await env.execute();
-      expect(argumentSpy).toHaveBeenCalledWith(true);
+    expect(argumentSpy).toHaveBeenCalledWith(true);
-      expect(argumentSpy).toHaveBeenCalledWith(true, 'arg');
+    expect(argumentSpy).toHaveBeenCalledWith(true, 'arg');
-      expect(argumentSpy).toHaveBeenCalledWith(true, 'arg1', 'arg2');
+    expect(argumentSpy).toHaveBeenCalledWith(true, 'arg1', 'arg2');
-    };
-
-    env.addReporter({ specDone: specExpectations });
-    env.execute(null, done);
   });
 
-  it('passes the jasmine utility to the matcher factory', function(done) {
+  it('passes the jasmine utility to the matcher factory', async function() {
-    var matcherFactory = function(util) {
+    const matcherFactory = function() {
         return {
           compare: function() {
             return { pass: true };
@@ -230,18 +228,14 @@ describe('Custom Matchers (Integration)', function() {
       env.expect(true).toBeReal();
     });
 
-    var specExpectations = function() {
+    await env.execute();
-      expect(matcherFactorySpy).toHaveBeenCalledWith(
+    expect(matcherFactorySpy).toHaveBeenCalledWith(
-        jasmine.any(jasmineUnderTest.MatchersUtil)
+      jasmine.any(jasmineUnderTest.MatchersUtil)
-      );
+    );
-    };
-
-    env.addReporter({ specDone: specExpectations });
-    env.execute(null, done);
   });
 
-  it('provides custom equality testers to the matcher factory via matchersUtil', function(done) {
+  it('provides custom equality testers to the matcher factory via matchersUtil', async function() {
-    var matcherFactory = function(matchersUtil) {
+    const matcherFactory = function(matchersUtil) {
         return {
           compare: function(actual, expected) {
             return { pass: matchersUtil.equals(actual[0], expected) };
@@ -263,12 +257,13 @@ describe('Custom Matchers (Integration)', function() {
       env.expect([1, 2]).toBeArrayWithFirstElement('1');
     });
 
-    var specExpectations = function(result) {
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-      expect(customEqualityFn).toHaveBeenCalledWith(1, '1');
+    env.addReporter(reporter);
-      expect(result.failedExpectations).toEqual([]);
+    await env.execute();
-    };
 
-    env.addReporter({ specDone: specExpectations });
+    expect(reporter.specDone).toHaveBeenCalledTimes(1);
-    env.execute(null, done);
+    const result = reporter.specDone.calls.argsFor(0)[0];
+    expect(customEqualityFn).toHaveBeenCalledWith(1, '1');
+    expect(result.failedExpectations).toEqual([]);
   });
 });

spec/core/integration/CustomObjectFormatterSpec.js

@@ -1,12 +1,12 @@
 describe('Custom object formatters', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
     env.configure({ random: false });
   });
 
-  it('scopes custom object formatters to a spec', function(done) {
+  it('scopes custom object formatters to a spec', async function() {
     env.it('a spec with custom pretty-printer', function() {
       env.addCustomObjectFormatter(function(obj) {
         return 'custom(' + obj + ')';
@@ -18,25 +18,23 @@ describe('Custom object formatters', function() {
       env.expect(42).toBeUndefined();
     });
 
-    var specResults = [];
+    const specResults = [];
-    var specDone = function(result) {
+    const specDone = function(result) {
       specResults.push(result);
     };
-    var expectations = function() {
-      expect(specResults[0].failedExpectations[0].message).toEqual(
-        'Expected custom(42) to be undefined.'
-      );
-      expect(specResults[1].failedExpectations[0].message).toEqual(
-        'Expected 42 to be undefined.'
-      );
-      done();
-    };
     env.addReporter({ specDone: specDone });
 
-    env.execute(null, expectations);
+    await env.execute();
+
+    expect(specResults[0].failedExpectations[0].message).toEqual(
+      'Expected custom(42) to be undefined.'
+    );
+    expect(specResults[1].failedExpectations[0].message).toEqual(
+      'Expected 42 to be undefined.'
+    );
   });
 
-  it('scopes custom object formatters to a suite', function(done) {
+  it('scopes custom object formatters to a suite', async function() {
     env.it('a spec without custom pretty-printer', function() {
       env.expect(42).toBeUndefined();
     });
@@ -53,22 +51,20 @@ describe('Custom object formatters', function() {
       });
     });
 
-    var specResults = [];
+    const specResults = [];
-    var specDone = function(result) {
+    const specDone = function(result) {
       specResults.push(result);
     };
-    var expectations = function() {
-      expect(specResults[0].failedExpectations[0].message).toEqual(
-        'Expected 42 to be undefined.'
-      );
-      expect(specResults[1].failedExpectations[0].message).toEqual(
-        'Expected custom(42) to be undefined.'
-      );
-      done();
-    };
     env.addReporter({ specDone: specDone });
 
-    env.execute(null, expectations);
+    await env.execute();
+
+    expect(specResults[0].failedExpectations[0].message).toEqual(
+      'Expected 42 to be undefined.'
+    );
+    expect(specResults[1].failedExpectations[0].message).toEqual(
+      'Expected custom(42) to be undefined.'
+    );
   });
 
   it('throws an exception if you try to add a custom object formatter outside a runable', function() {

spec/core/integration/CustomSpyStrategiesSpec.js

@@ -1,5 +1,5 @@
 describe('Custom Spy Strategies (Integration)', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -11,8 +11,8 @@ describe('Custom Spy Strategies (Integration)', function() {
   });
 
   it('allows adding more strategies local to a suite', async function() {
-    var plan = jasmine.createSpy('custom strategy plan').and.returnValue(42);
+    const plan = jasmine.createSpy('custom strategy plan').and.returnValue(42);
-    var strategy = jasmine.createSpy('custom strategy').and.returnValue(plan);
+    const strategy = jasmine.createSpy('custom strategy').and.returnValue(plan);
 
     env.describe('suite defining a custom spy strategy', function() {
       env.beforeAll(function() {
@@ -20,7 +20,7 @@ describe('Custom Spy Strategies (Integration)', function() {
       });
 
       env.it('spec in the suite', function() {
-        var spy = env.createSpy('something').and.frobnicate(17);
+        const spy = env.createSpy('something').and.frobnicate(17);
         expect(spy(1, 2, 3)).toEqual(42);
         expect(strategy).toHaveBeenCalledWith(17);
         expect(plan).toHaveBeenCalledWith(1, 2, 3);
@@ -36,12 +36,12 @@ describe('Custom Spy Strategies (Integration)', function() {
   });
 
   it('allows adding more strategies local to a spec', async function() {
-    var plan = jasmine.createSpy('custom strategy plan').and.returnValue(42);
+    const plan = jasmine.createSpy('custom strategy plan').and.returnValue(42);
-    var strategy = jasmine.createSpy('custom strategy').and.returnValue(plan);
+    const strategy = jasmine.createSpy('custom strategy').and.returnValue(plan);
 
     env.it('spec defining a custom spy strategy', function() {
       env.addSpyStrategy('frobnicate', strategy);
-      var spy = env.createSpy('something').and.frobnicate(17);
+      const spy = env.createSpy('something').and.frobnicate(17);
       expect(spy(1, 2, 3)).toEqual(42);
       expect(strategy).toHaveBeenCalledWith(17);
       expect(plan).toHaveBeenCalledWith(1, 2, 3);
@@ -56,12 +56,12 @@ describe('Custom Spy Strategies (Integration)', function() {
   });
 
   it('allows using custom strategies on a per-argument basis', async function() {
-    var plan = jasmine.createSpy('custom strategy plan').and.returnValue(42);
+    const plan = jasmine.createSpy('custom strategy plan').and.returnValue(42);
-    var strategy = jasmine.createSpy('custom strategy').and.returnValue(plan);
+    const strategy = jasmine.createSpy('custom strategy').and.returnValue(plan);
 
     env.it('spec defining a custom spy strategy', function() {
       env.addSpyStrategy('frobnicate', strategy);
-      var spy = env
+      const spy = env
         .createSpy('something')
         .and.returnValue('no args return')
         .withArgs(1, 2, 3)
@@ -82,7 +82,7 @@ describe('Custom Spy Strategies (Integration)', function() {
   });
 
   it('allows multiple custom strategies to be used', async function() {
-    var plan1 = jasmine.createSpy('plan 1').and.returnValue(42),
+    const plan1 = jasmine.createSpy('plan 1').and.returnValue(42),
       strategy1 = jasmine.createSpy('strat 1').and.returnValue(plan1),
       plan2 = jasmine.createSpy('plan 2').and.returnValue(24),
       strategy2 = jasmine.createSpy('strat 2').and.returnValue(plan2),
@@ -96,7 +96,7 @@ describe('Custom Spy Strategies (Integration)', function() {
     env.it('frobnicates', function() {
       plan1.calls.reset();
       plan2.calls.reset();
-      var spy = env.createSpy('spy').and.frobnicate();
+      const spy = env.createSpy('spy').and.frobnicate();
       expect(spy()).toEqual(42);
       expect(plan1).toHaveBeenCalled();
       expect(plan2).not.toHaveBeenCalled();
@@ -105,7 +105,7 @@ describe('Custom Spy Strategies (Integration)', function() {
     env.it('jiggles', function() {
       plan1.calls.reset();
       plan2.calls.reset();
-      var spy = env.createSpy('spy').and.jiggle();
+      const spy = env.createSpy('spy').and.jiggle();
       expect(spy()).toEqual(24);
       expect(plan1).not.toHaveBeenCalled();
       expect(plan2).toHaveBeenCalled();

spec/core/integration/DefaultSpyStrategySpec.js

@@ -1,5 +1,5 @@
 describe('Default Spy Strategy (Integration)', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -19,13 +19,13 @@ describe('Default Spy Strategy (Integration)', function() {
       });
 
       env.it('spec in suite', function() {
-        var spy = env.createSpy('something');
+        const spy = env.createSpy('something');
         expect(spy()).toBe(42);
       });
     });
 
     env.it('spec not in suite', function() {
-      var spy = env.createSpy('something');
+      const spy = env.createSpy('something');
       expect(spy()).toBeUndefined();
     });
 
@@ -35,17 +35,17 @@ describe('Default Spy Strategy (Integration)', function() {
 
   it('uses the default spy strategy defined when the spy is created', async function() {
     env.it('spec', function() {
-      var a = env.createSpy('a');
+      const a = env.createSpy('a');
       env.setDefaultSpyStrategy(function(and) {
         and.returnValue(42);
       });
-      var b = env.createSpy('b');
+      const b = env.createSpy('b');
       env.setDefaultSpyStrategy(function(and) {
         and.stub();
       });
-      var c = env.createSpy('c');
+      const c = env.createSpy('c');
       env.setDefaultSpyStrategy();
-      var d = env.createSpy('d');
+      const d = env.createSpy('d');
 
       expect(a()).toBeUndefined();
       expect(b()).toBe(42);

spec/core/integration/DeprecationSpec.js

@@ -1,6 +1,6 @@
 /* eslint no-console: 0 */
 describe('Deprecation (integration)', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -10,8 +10,8 @@ describe('Deprecation (integration)', function() {
     env.cleanup_();
   });
 
-  it('reports a deprecation on the top suite', function(done) {
+  it('reports a deprecation on the top suite', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['jasmineDone']);
+    const reporter = jasmine.createSpyObj('reporter', ['jasmineDone']);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
@@ -20,25 +20,24 @@ describe('Deprecation (integration)', function() {
     });
     env.it('a spec', function() {});
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.jasmineDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.jasmineDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^the message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalledWith(
+    );
-        jasmine.stringMatching(/^DEPRECATION: the message/)
+    expect(console.error).toHaveBeenCalledWith(
-      );
+      jasmine.stringMatching(/^DEPRECATION: the message/)
-      done();
+    );
-    });
   });
 
-  it('reports a deprecation on a descendent suite', function(done) {
+  it('reports a deprecation on a descendent suite', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['suiteDone']);
+    const reporter = jasmine.createSpyObj('reporter', ['suiteDone']);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
@@ -49,27 +48,24 @@ describe('Deprecation (integration)', function() {
       env.it('a spec', function() {});
     });
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.suiteDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.suiteDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^the message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalledWith(
+    );
-        jasmine.stringMatching(
+    expect(console.error).toHaveBeenCalledWith(
-          /^DEPRECATION: the message \(in suite: a suite\)/
+      jasmine.stringMatching(/^DEPRECATION: the message \(in suite: a suite\)/)
-        )
+    );
-      );
-      done();
-    });
   });
 
-  it('reports a deprecation on a spec', function(done) {
+  it('reports a deprecation on a spec', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['specDone']);
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
@@ -79,27 +75,26 @@ describe('Deprecation (integration)', function() {
       });
     });
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.specDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.specDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^the message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalledWith(
+    );
-        jasmine.stringMatching(
+    expect(console.error).toHaveBeenCalledWith(
-          /^DEPRECATION: the message \(in spec: a suite a spec\)/
+      jasmine.stringMatching(
-        )
+        /^DEPRECATION: the message \(in spec: a suite a spec\)/
-      );
+      )
-      done();
+    );
-    });
   });
 
-  it('omits the suite or spec context when ignoreRunnable is true', function(done) {
+  it('omits the suite or spec context when ignoreRunnable is true', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['jasmineDone']);
+    const reporter = jasmine.createSpyObj('reporter', ['jasmineDone']);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
@@ -107,28 +102,27 @@ describe('Deprecation (integration)', function() {
       env.deprecated('the message', { ignoreRunnable: true });
     });
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.jasmineDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.jasmineDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^the message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalledWith(
+    );
-        jasmine.stringMatching(/the message/)
+    expect(console.error).toHaveBeenCalledWith(
-      );
+      jasmine.stringMatching(/the message/)
-      expect(console.error).not.toHaveBeenCalledWith(
+    );
-        jasmine.stringMatching(/a spec/)
+    expect(console.error).not.toHaveBeenCalledWith(
-      );
+      jasmine.stringMatching(/a spec/)
-      done();
+    );
-    });
   });
 
-  it('includes the stack trace', function(done) {
+  it('includes the stack trace', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['specDone']);
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
@@ -138,26 +132,25 @@ describe('Deprecation (integration)', function() {
       });
     });
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.specDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.specDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              stack: jasmine.stringMatching(/DeprecationSpec.js/)
+          jasmine.objectContaining({
-            })
+            stack: jasmine.stringMatching(/DeprecationSpec.js/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalled();
+    );
-      expect(console.error.calls.argsFor(0)[0].replace(/\n/g, 'NL')).toMatch(
+    expect(console.error).toHaveBeenCalled();
-        /^DEPRECATION: the message \(in spec: a suite a spec\)NL.*DeprecationSpec.js/
+    expect(console.error.calls.argsFor(0)[0].replace(/\n/g, 'NL')).toMatch(
-      );
+      /^DEPRECATION: the message \(in spec: a suite a spec\)NL.*DeprecationSpec.js/
-      done();
+    );
-    });
   });
 
-  it('excludes the stack trace when omitStackTrace is true', function(done) {
+  it('excludes the stack trace when omitStackTrace is true', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['specDone']);
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
@@ -167,26 +160,28 @@ describe('Deprecation (integration)', function() {
       });
     });
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.specDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.specDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              stack: jasmine.falsy()
+          jasmine.objectContaining({
-            })
+            stack: jasmine.falsy()
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalled();
+    );
-      expect(console.error).not.toHaveBeenCalledWith(
+    expect(console.error).toHaveBeenCalled();
-        jasmine.stringMatching(/DeprecationSpec.js/)
+    expect(console.error).not.toHaveBeenCalledWith(
-      );
+      jasmine.stringMatching(/DeprecationSpec.js/)
-      done();
+    );
-    });
   });
 
-  it('emits a given deprecation only once', function(done) {
+  it('emits a given deprecation only once', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['specDone', 'suiteDone']);
+    const reporter = jasmine.createSpyObj('reporter', [
+      'specDone',
+      'suiteDone'
+    ]);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
@@ -202,44 +197,44 @@ describe('Deprecation (integration)', function() {
       });
     });
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.suiteDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.suiteDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            // only one
+        deprecationWarnings: [
-            jasmine.objectContaining({
+          // only one
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^the message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(reporter.specDone).toHaveBeenCalledWith(
+    );
-        jasmine.objectContaining({
+    expect(reporter.specDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            // only the other one
+        deprecationWarnings: [
-            jasmine.objectContaining({
+          // only the other one
-              message: jasmine.stringMatching(/^a different message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^a different message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalledTimes(2);
+    );
-      expect(console.error).toHaveBeenCalledWith(
+    expect(console.error).toHaveBeenCalledTimes(2);
-        jasmine.stringMatching(
+    expect(console.error).toHaveBeenCalledWith(
-          /^DEPRECATION: the message \(in suite: a suite\)/
+      jasmine.stringMatching(/^DEPRECATION: the message \(in suite: a suite\)/)
-        )
+    );
-      );
+    expect(console.error).toHaveBeenCalledWith(
-      expect(console.error).toHaveBeenCalledWith(
+      jasmine.stringMatching(
-        jasmine.stringMatching(
+        /^DEPRECATION: a different message \(in spec: a suite a spec\)/
-          /^DEPRECATION: a different message \(in spec: a suite a spec\)/
+      )
-        )
+    );
-      );
-      done();
-    });
   });
 
-  it('emits a given deprecation each time when config.verboseDeprecations is true', function(done) {
+  it('emits a given deprecation each time when config.verboseDeprecations is true', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['specDone', 'suiteDone']);
+    const reporter = jasmine.createSpyObj('reporter', [
+      'specDone',
+      'suiteDone'
+    ]);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
@@ -256,67 +251,65 @@ describe('Deprecation (integration)', function() {
       });
     });
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.suiteDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.suiteDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            }),
+            message: jasmine.stringMatching(/^the message/)
-            jasmine.objectContaining({
+          }),
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^the message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(reporter.specDone).toHaveBeenCalledWith(
+    );
-        jasmine.objectContaining({
+    expect(reporter.specDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^the message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalledTimes(3);
+    );
-      expect(console.error.calls.argsFor(0)[0]).toMatch(
+    expect(console.error).toHaveBeenCalledTimes(3);
-        /^DEPRECATION: the message \(in suite: a suite\)/
+    expect(console.error.calls.argsFor(0)[0]).toMatch(
-      );
+      /^DEPRECATION: the message \(in suite: a suite\)/
-      expect(console.error.calls.argsFor(1)[0]).toMatch(
+    );
-        /^DEPRECATION: the message \(in suite: a suite\)/
+    expect(console.error.calls.argsFor(1)[0]).toMatch(
-      );
+      /^DEPRECATION: the message \(in suite: a suite\)/
-      expect(console.error.calls.argsFor(2)[0]).toMatch(
+    );
-        /^DEPRECATION: the message \(in spec: a suite a spec\)/
+    expect(console.error.calls.argsFor(2)[0]).toMatch(
-      );
+      /^DEPRECATION: the message \(in spec: a suite a spec\)/
-      expect(console.error.calls.argsFor(2)[0]).toMatch(
+    );
-        /^DEPRECATION: the message \(in spec: a suite a spec\)/
+    expect(console.error.calls.argsFor(2)[0]).toMatch(
-      );
+      /^DEPRECATION: the message \(in spec: a suite a spec\)/
-      done();
+    );
-    });
   });
 
-  it('handles deprecations that occur before execute() is called', function(done) {
+  it('handles deprecations that occur before execute() is called', async function() {
-    var reporter = jasmine.createSpyObj('reporter', ['jasmineDone']);
+    const reporter = jasmine.createSpyObj('reporter', ['jasmineDone']);
     env.addReporter(reporter);
     spyOn(console, 'error');
 
     env.deprecated('the message');
     env.it('a spec', function() {});
 
-    env.execute(null, function() {
+    await env.execute();
-      expect(reporter.jasmineDone).toHaveBeenCalledWith(
+
-        jasmine.objectContaining({
+    expect(reporter.jasmineDone).toHaveBeenCalledWith(
-          deprecationWarnings: [
+      jasmine.objectContaining({
-            jasmine.objectContaining({
+        deprecationWarnings: [
-              message: jasmine.stringMatching(/^the message/)
+          jasmine.objectContaining({
-            })
+            message: jasmine.stringMatching(/^the message/)
-          ]
+          })
-        })
+        ]
-      );
+      })
-      expect(console.error).toHaveBeenCalledWith(
+    );
-        jasmine.stringMatching(/^DEPRECATION: the message/)
+    expect(console.error).toHaveBeenCalledWith(
-      );
+      jasmine.stringMatching(/^DEPRECATION: the message/)
-      done();
+    );
-    });
   });
 });

spec/core/integration/MatchersSpec.js

@@ -1,5 +1,5 @@
 describe('Matchers (Integration)', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     env = new jasmineUnderTest.Env();
@@ -10,156 +10,158 @@ describe('Matchers (Integration)', function() {
   });
 
   function verifyPasses(expectations) {
-    it('passes', function(done) {
+    it('passes', async function() {
       env.it('a spec', function() {
         expectations(env);
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('passed');
+      env.addReporter(reporter);
-        expect(result.passedExpectations.length)
+      await env.execute();
-          .withContext('Number of passed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations.length)
-          .withContext('Number of failed expectations')
-          .toEqual(0);
-        expect(
-          result.failedExpectations[0] && result.failedExpectations[0].message
-        )
-          .withContext('Failure message')
-          .toBeUndefined();
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('passed');
+      expect(result.passedExpectations.length)
+        .withContext('Number of passed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(0);
+      expect(
+        result.failedExpectations[0] && result.failedExpectations[0].message
+      )
+        .withContext('Failure message')
+        .toBeUndefined();
     });
   }
 
   function verifyFails(expectations) {
-    it('fails', function(done) {
+    it('fails', async function() {
       env.it('a spec', function() {
         expectations(env);
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('failed');
+      env.addReporter(reporter);
-        expect(result.failedExpectations.length)
+      await env.execute();
-          .withContext('Number of failed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations[0].message)
-          .withContext(
-            'Failed with a thrown error rather than a matcher failure'
-          )
-          .not.toMatch(/^Error: /);
-        expect(result.failedExpectations[0].message)
-          .withContext(
-            'Failed with a thrown type error rather than a matcher failure'
-          )
-          .not.toMatch(/^TypeError: /);
-        expect(result.failedExpectations[0].matcherName)
-          .withContext('Matcher name')
-          .not.toEqual('');
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('failed');
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations[0].message)
+        .withContext('Failed with a thrown error rather than a matcher failure')
+        .not.toMatch(/^Error: /);
+      expect(result.failedExpectations[0].message)
+        .withContext(
+          'Failed with a thrown type error rather than a matcher failure'
+        )
+        .not.toMatch(/^TypeError: /);
+      expect(result.failedExpectations[0].matcherName)
+        .withContext('Matcher name')
+        .not.toEqual('');
     });
   }
 
   function verifyFailsWithCustomObjectFormatters(config) {
-    it('uses custom object formatters', function(done) {
+    it('uses custom object formatters', async function() {
       env.it('a spec', function() {
         env.addCustomObjectFormatter(config.formatter);
         config.expectations(env);
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('failed');
+      env.addReporter(reporter);
-        expect(result.failedExpectations.length)
+      await env.execute();
-          .withContext('Number of failed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations[0].message).toEqual(
-          config.expectedMessage
-        );
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('failed');
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations[0].message).toEqual(
+        config.expectedMessage
+      );
     });
   }
 
   function verifyPassesAsync(expectations) {
-    it('passes', function(done) {
+    it('passes', async function() {
       env.it('a spec', function() {
         return expectations(env);
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('passed');
+      env.addReporter(reporter);
-        expect(result.passedExpectations.length)
+      await env.execute();
-          .withContext('Number of passed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations.length)
-          .withContext('Number of failed expectations')
-          .toEqual(0);
-        expect(
-          result.failedExpectations[0] && result.failedExpectations[0].message
-        )
-          .withContext('Failure message')
-          .toBeUndefined();
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('passed');
+      expect(result.passedExpectations.length)
+        .withContext('Number of passed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(0);
+      expect(
+        result.failedExpectations[0] && result.failedExpectations[0].message
+      )
+        .withContext('Failure message')
+        .toBeUndefined();
     });
   }
 
   function verifyFailsAsync(expectations) {
-    it('fails', function(done) {
+    it('fails', async function() {
       env.it('a spec', function() {
         return expectations(env);
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('failed');
+      env.addReporter(reporter);
-        expect(result.failedExpectations.length)
+      await env.execute();
-          .withContext('Number of failed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations[0].message)
-          .withContext(
-            'Failed with a thrown error rather than a matcher failure'
-          )
-          .not.toMatch(/^Error: /);
-        expect(result.failedExpectations[0].matcherName)
-          .withContext('Matcher name')
-          .not.toEqual('');
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('failed');
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations[0].message)
+        .withContext('Failed with a thrown error rather than a matcher failure')
+        .not.toMatch(/^Error: /);
+      expect(result.failedExpectations[0].matcherName)
+        .withContext('Matcher name')
+        .not.toEqual('');
     });
   }
 
   function verifyFailsWithCustomObjectFormattersAsync(config) {
-    it('uses custom object formatters', function(done) {
+    it('uses custom object formatters', async function() {
-      var env = new jasmineUnderTest.Env();
+      const env = new jasmineUnderTest.Env();
       env.it('a spec', function() {
         env.addCustomObjectFormatter(config.formatter);
         return config.expectations(env);
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('failed');
+      env.addReporter(reporter);
-        expect(result.failedExpectations.length)
+      await env.execute();
-          .withContext('Number of failed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations[0].message).toEqual(
-          config.expectedMessage
-        );
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('failed');
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations[0].message).toEqual(
+        config.expectedMessage
+      );
     });
   }
 
@@ -519,20 +521,20 @@ describe('Matchers (Integration)', function() {
 
   describe('toHaveBeenCalled', function() {
     verifyPasses(function(env) {
-      var spy = env.createSpy('spy');
+      const spy = env.createSpy('spy');
       spy();
       env.expect(spy).toHaveBeenCalled();
     });
 
     verifyFails(function(env) {
-      var spy = env.createSpy('spy');
+      const spy = env.createSpy('spy');
       env.expect(spy).toHaveBeenCalled();
     });
   });
 
   describe('toHaveBeenCalledBefore', function() {
     verifyPasses(function(env) {
-      var a = env.createSpy('a'),
+      const a = env.createSpy('a'),
         b = env.createSpy('b');
       a();
       b();
@@ -540,7 +542,7 @@ describe('Matchers (Integration)', function() {
     });
 
     verifyFails(function(env) {
-      var a = env.createSpy('a'),
+      const a = env.createSpy('a'),
         b = env.createSpy('b');
       b();
       a();
@@ -550,20 +552,20 @@ describe('Matchers (Integration)', function() {
 
   describe('toHaveBeenCalledTimes', function() {
     verifyPasses(function(env) {
-      var spy = env.createSpy('spy');
+      const spy = env.createSpy('spy');
       spy();
       env.expect(spy).toHaveBeenCalledTimes(1);
     });
 
     verifyFails(function(env) {
-      var spy = env.createSpy('spy');
+      const spy = env.createSpy('spy');
       env.expect(spy).toHaveBeenCalledTimes(1);
     });
   });
 
   describe('toHaveBeenCalledWith', function() {
     verifyPasses(function(env) {
-      var spy = env.createSpy();
+      const spy = env.createSpy();
       spy('5');
       env.addCustomEqualityTester(function(a, b) {
         return a.toString() === b.toString();
@@ -572,7 +574,7 @@ describe('Matchers (Integration)', function() {
     });
 
     verifyFails(function(env) {
-      var spy = env.createSpy();
+      const spy = env.createSpy();
       env.expect(spy).toHaveBeenCalledWith('foo');
     });
 
@@ -581,7 +583,7 @@ describe('Matchers (Integration)', function() {
         return '|' + val + '|';
       },
       expectations: function(env) {
-        var spy = env.createSpy('foo');
+        const spy = env.createSpy('foo');
         env.expect(spy).toHaveBeenCalledWith('x');
       },
       expectedMessage:
@@ -593,7 +595,7 @@ describe('Matchers (Integration)', function() {
 
   describe('toHaveBeenCalledOnceWith', function() {
     verifyPasses(function(env) {
-      var spy = env.createSpy();
+      const spy = env.createSpy();
       spy('5', 3);
       env.addCustomEqualityTester(function(a, b) {
         return a.toString() === b.toString();
@@ -602,7 +604,7 @@ describe('Matchers (Integration)', function() {
     });
 
     verifyFails(function(env) {
-      var spy = env.createSpy();
+      const spy = env.createSpy();
       env.expect(spy).toHaveBeenCalledOnceWith(5, 3);
     });
   });
@@ -613,18 +615,40 @@ describe('Matchers (Integration)', function() {
     });
 
     verifyPasses(function(env) {
-      var domHelpers = jasmine.getEnv().domHelpers();
+      const domHelpers = jasmine.getEnv().domHelpers();
-      var el = domHelpers.createElementWithClassName('foo');
+      const el = domHelpers.createElementWithClassName('foo');
       env.expect(el).toHaveClass('foo');
     });
 
     verifyFails(function(env) {
-      var domHelpers = jasmine.getEnv().domHelpers();
+      const domHelpers = jasmine.getEnv().domHelpers();
-      var el = domHelpers.createElementWithClassName('foo');
+      const el = domHelpers.createElementWithClassName('foo');
       env.expect(el).toHaveClass('bar');
     });
   });
 
+  describe('toHaveSpyInteractions', function() {
+    let spyObj;
+    beforeEach(function() {
+      spyObj = env.createSpyObj('NewClass', ['spyA', 'spyB']);
+      spyObj.otherMethod = function() {};
+    });
+
+    verifyPasses(function(env) {
+      spyObj.spyA();
+      env.expect(spyObj).toHaveSpyInteractions();
+    });
+
+    verifyFails(function(env) {
+      env.expect(spyObj).toHaveSpyInteractions();
+    });
+
+    verifyFails(function(env) {
+      spyObj.otherMethod();
+      env.expect(spyObj).toHaveSpyInteractions();
+    });
+  });
+
   describe('toMatch', function() {
     verifyPasses(function(env) {
       env.expect('foo').toMatch(/oo$/);
@@ -656,7 +680,6 @@ describe('Matchers (Integration)', function() {
         return '|' + val + '|';
       },
       expectations: function(env) {
-        var spy = env.createSpy('foo');
         env
           .expect(function() {
             throw 'x';
@@ -685,7 +708,6 @@ describe('Matchers (Integration)', function() {
         return '|' + val + '|';
       },
       expectations: function(env) {
-        var spy = env.createSpy('foo');
         env
           .expect(function() {
             throw 'x';
@@ -718,7 +740,6 @@ describe('Matchers (Integration)', function() {
         return '|' + val + '|';
       },
       expectations: function(env) {
-        var spy = env.createSpy('foo');
         env
           .expect(function() {
             throw new Error('nope');
@@ -734,76 +755,79 @@ describe('Matchers (Integration)', function() {
   });
 
   describe('When an async matcher is used with .already()', function() {
-    it('propagates the matcher result when the promise is resolved', function(done) {
+    it('propagates the matcher result when the promise is resolved', async function() {
       env.it('a spec', function() {
         return env.expectAsync(Promise.resolve()).already.toBeRejected();
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('failed');
+      env.addReporter(reporter);
-        expect(result.failedExpectations.length)
+      await env.execute();
-          .withContext('Number of failed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations[0].message).toEqual(
-          'Expected [object Promise] to be rejected.'
-        );
-        expect(result.failedExpectations[0].matcherName)
-          .withContext('Matcher name')
-          .not.toEqual('');
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('failed');
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations[0].message).toEqual(
+        'Expected [object Promise] to be rejected.'
+      );
+      expect(result.failedExpectations[0].matcherName)
+        .withContext('Matcher name')
+        .not.toEqual('');
     });
 
-    it('propagates the matcher result when the promise is rejected', function(done) {
+    it('propagates the matcher result when the promise is rejected', async function() {
       env.it('a spec', function() {
         return env
           .expectAsync(Promise.reject(new Error('nope')))
           .already.toBeResolved();
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('failed');
+      env.addReporter(reporter);
-        expect(result.failedExpectations.length)
+      await env.execute();
-          .withContext('Number of failed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations[0].message).toEqual(
-          'Expected a promise to be resolved but it was ' +
-            'rejected with Error: nope.'
-        );
-        expect(result.failedExpectations[0].matcherName)
-          .withContext('Matcher name')
-          .not.toEqual('');
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('failed');
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations[0].message).toEqual(
+        'Expected a promise to be resolved but it was ' +
+          'rejected with Error: nope.'
+      );
+      expect(result.failedExpectations[0].matcherName)
+        .withContext('Matcher name')
+        .not.toEqual('');
     });
 
-    it('fails when the promise is pending', function(done) {
+    it('fails when the promise is pending', async function() {
-      var promise = new Promise(function() {});
+      const promise = new Promise(function() {});
 
       env.it('a spec', function() {
         return env.expectAsync(promise).already.toBeResolved();
       });
 
-      var specExpectations = function(result) {
+      const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-        expect(result.status).toEqual('failed');
+      env.addReporter(reporter);
-        expect(result.failedExpectations.length)
+      await env.execute();
-          .withContext('Number of failed expectations')
-          .toEqual(1);
-        expect(result.failedExpectations[0].message).toEqual(
-          'Expected a promise to be settled ' +
-            '(via expectAsync(...).already) but it was pending.'
-        );
-        expect(result.failedExpectations[0].matcherName)
-          .withContext('Matcher name')
-          .not.toEqual('');
-      };
 
-      env.addReporter({ specDone: specExpectations });
+      expect(reporter.specDone).toHaveBeenCalledTimes(1);
-      env.execute(null, done);
+      const result = reporter.specDone.calls.argsFor(0)[0];
+      expect(result.status).toEqual('failed');
+      expect(result.failedExpectations.length)
+        .withContext('Number of failed expectations')
+        .toEqual(1);
+      expect(result.failedExpectations[0].message).toEqual(
+        'Expected a promise to be settled ' +
+          '(via expectAsync(...).already) but it was pending.'
+      );
+      expect(result.failedExpectations[0].matcherName)
+        .withContext('Matcher name')
+        .not.toEqual('');
     });
   });
 });

spec/core/integration/SpecRunningSpec.js

@@ -1,5 +1,5 @@
 describe('spec running', function() {
-  var env;
+  let env;
 
   beforeEach(function() {
     jasmine.getEnv().registerIntegrationMatchers();
@@ -12,7 +12,7 @@ describe('spec running', function() {
   });
 
   it('should assign spec ids sequentially', function() {
-    var it0, it1, it2, it3, it4;
+    let it0, it1, it2, it3, it4;
     env.describe('test suite', function() {
       it0 = env.it('spec 0', function() {});
       it1 = env.it('spec 1', function() {});
@@ -31,11 +31,11 @@ describe('spec running', function() {
   });
 
   it('nested suites', function(done) {
-    var foo = 0;
+    let foo = 0;
-    var bar = 0;
+    let bar = 0;
-    var baz = 0;
+    let baz = 0;
-    var quux = 0;
+    let quux = 0;
-    var nested = env.describe('suite', function() {
+    env.describe('suite', function() {
       env.describe('nested', function() {
         env.it('should run nested suites', function() {
           foo++;
@@ -71,7 +71,7 @@ describe('spec running', function() {
   });
 
   it('should permit nested describes', function(done) {
-    var actions = [];
+    const actions = [];
 
     env.beforeEach(function() {
       actions.push('topSuite beforeEach');
@@ -128,7 +128,7 @@ describe('spec running', function() {
     });
 
     env.execute(null, function() {
-      var expected = [
+      const expected = [
         'topSuite beforeEach',
         'outer beforeEach',
         'outer it 1',
@@ -163,7 +163,7 @@ describe('spec running', function() {
   });
 
   it('should run multiple befores and afters ordered so functions declared later are treated as more specific', function(done) {
-    var actions = [];
+    const actions = [];
 
     env.beforeAll(function() {
       actions.push('runner beforeAll1');
@@ -220,7 +220,7 @@ describe('spec running', function() {
     });
 
     env.execute(null, function() {
-      var expected = [
+      const expected = [
         'runner beforeAll1',
         'runner beforeAll2',
         'runner beforeEach1',
@@ -241,7 +241,7 @@ describe('spec running', function() {
   });
 
   it('should run beforeAlls before beforeEachs and afterAlls after afterEachs', function(done) {
-    var actions = [];
+    const actions = [];
 
     env.beforeAll(function() {
       actions.push('runner beforeAll');
@@ -282,7 +282,7 @@ describe('spec running', function() {
     });
 
     env.execute(null, function() {
-      var expected = [
+      const expected = [
         'runner beforeAll',
         'inner beforeAll',
         'runner beforeEach',
@@ -299,9 +299,9 @@ describe('spec running', function() {
   });
 
   it('should run beforeAlls and afterAlls in the order declared when runnablesToRun is provided', function(done) {
-    var actions = [],
+    const actions = [];
-      spec,
+    let spec;
-      spec2;
+    let spec2;
 
     env.beforeAll(function() {
       actions.push('runner beforeAll');
@@ -346,7 +346,7 @@ describe('spec running', function() {
     });
 
     env.execute([spec2.id, spec.id], function() {
-      var expected = [
+      const expected = [
         'runner beforeAll',
         'inner beforeAll',
         'runner beforeEach',
@@ -369,7 +369,7 @@ describe('spec running', function() {
   });
 
   it('only runs *Alls once in a focused suite', function(done) {
-    var actions = [];
+    const actions = [];
 
     env.fdescribe('Suite', function() {
       env.beforeAll(function() {
@@ -391,7 +391,7 @@ describe('spec running', function() {
 
   describe('focused runnables', function() {
     it('runs the relevant alls and eachs for each runnable', function(done) {
-      var actions = [];
+      const actions = [];
       env.beforeAll(function() {
         actions.push('beforeAll');
       });
@@ -418,7 +418,7 @@ describe('spec running', function() {
       });
 
       env.execute(null, function() {
-        var expected = [
+        const expected = [
           'beforeAll',
           'beforeEach',
           'spec in fdescribe',
@@ -435,7 +435,7 @@ describe('spec running', function() {
     });
 
     it('focused specs in focused suites cause non-focused siblings to not run', function(done) {
-      var actions = [];
+      const actions = [];
 
       env.fdescribe('focused suite', function() {
         env.it('unfocused spec', function() {
@@ -447,14 +447,14 @@ describe('spec running', function() {
       });
 
       env.execute(null, function() {
-        var expected = ['focused spec'];
+        const expected = ['focused spec'];
         expect(actions).toEqual(expected);
         done();
       });
     });
 
     it('focused suites in focused suites cause non-focused siblings to not run', function(done) {
-      var actions = [];
+      const actions = [];
 
       env.fdescribe('focused suite', function() {
         env.it('unfocused spec', function() {
@@ -468,14 +468,14 @@ describe('spec running', function() {
       });
 
       env.execute(null, function() {
-        var expected = ['inner spec'];
+        const expected = ['inner spec'];
         expect(actions).toEqual(expected);
         done();
       });
     });
 
     it('focused runnables unfocus ancestor focused suites', function(done) {
-      var actions = [];
+      const actions = [];
 
       env.fdescribe('focused suite', function() {
         env.it('unfocused spec', function() {
@@ -489,7 +489,7 @@ describe('spec running', function() {
       });
 
       env.execute(null, function() {
-        var expected = ['focused spec'];
+        const expected = ['focused spec'];
         expect(actions).toEqual(expected);
         done();
       });
@@ -497,12 +497,12 @@ describe('spec running', function() {
   });
 
   it("shouldn't run disabled suites", function(done) {
-    var specInADisabledSuite = jasmine.createSpy('specInADisabledSuite'),
+    const specInADisabledSuite = jasmine.createSpy('specInADisabledSuite');
-      suite = env.describe('A Suite', function() {
+    env.describe('A Suite', function() {
-        env.xdescribe('with a disabled suite', function() {
+      env.xdescribe('with a disabled suite', function() {
-          env.it('spec inside a disabled suite', specInADisabledSuite);
+        env.it('spec inside a disabled suite', specInADisabledSuite);
-        });
       });
+    });
 
     env.execute(null, function() {
       expect(specInADisabledSuite).not.toHaveBeenCalled();
@@ -511,16 +511,16 @@ describe('spec running', function() {
   });
 
   it("shouldn't run before/after functions in disabled suites", function(done) {
-    var shouldNotRun = jasmine.createSpy('shouldNotRun'),
+    const shouldNotRun = jasmine.createSpy('shouldNotRun');
-      suite = env.xdescribe('A disabled Suite', function() {
+    env.xdescribe('A disabled Suite', function() {
-        // None of the before/after functions should run.
+      // None of the before/after functions should run.
-        env.beforeAll(shouldNotRun);
+      env.beforeAll(shouldNotRun);
-        env.beforeEach(shouldNotRun);
+      env.beforeEach(shouldNotRun);
-        env.afterEach(shouldNotRun);
+      env.afterEach(shouldNotRun);
-        env.afterAll(shouldNotRun);
+      env.afterAll(shouldNotRun);
 
-        env.it('spec inside a disabled suite', shouldNotRun);
+      env.it('spec inside a disabled suite', shouldNotRun);
-      });
+    });
 
     env.execute(null, function() {
       expect(shouldNotRun).not.toHaveBeenCalled();
@@ -529,7 +529,7 @@ describe('spec running', function() {
   });
 
   it('should allow top level suites to be disabled', function(done) {
-    var specInADisabledSuite = jasmine.createSpy('specInADisabledSuite'),
+    const specInADisabledSuite = jasmine.createSpy('specInADisabledSuite'),
       otherSpec = jasmine.createSpy('otherSpec');
 
     env.xdescribe('A disabled suite', function() {
@@ -547,11 +547,10 @@ describe('spec running', function() {
   });
 
   it('should set all pending specs to pending when a suite is run', function(done) {
-    var pendingSpec,
+    env.describe('default current suite', function() {
-      suite = env.describe('default current suite', function() {
+      env.it('I am a pending spec');
-        pendingSpec = env.it('I am a pending spec');
+    });
-      }),
+    const reporter = jasmine.createSpyObj('reporter', ['specDone']);
-      reporter = jasmine.createSpyObj('reporter', ['specDone']);
 
     env.addReporter(reporter);
 
@@ -566,7 +565,7 @@ describe('spec running', function() {
   });
 
   it('should recover gracefully when there are errors in describe functions', function(done) {
-    var specs = [],
+    const specs = [],
       reporter = jasmine.createSpyObj(['specDone', 'suiteDone']);
 
     reporter.specDone.and.callFake(function(result) {
@@ -618,10 +617,10 @@ describe('spec running', function() {
   });
 
   it('re-enters suites that have no *Alls', function(done) {
-    var actions = [],
+    const actions = [];
-      spec1,
+    let spec1;
-      spec2,
+    let spec2;
-      spec3;
+    let spec3;
 
     env.describe('top', function() {
       spec1 = env.it('spec1', function() {
@@ -644,10 +643,10 @@ describe('spec running', function() {
   });
 
   it('refuses to re-enter suites with a beforeAll', function() {
-    var actions = [],
+    const actions = [];
-      spec1,
+    let spec1;
-      spec2,
+    let spec2;
-      spec3;
+    let spec3;
 
     env.describe('top', function() {
       env.beforeAll(function() {});
@@ -672,10 +671,10 @@ describe('spec running', function() {
   });
 
   it('refuses to re-enter suites with a afterAll', function() {
-    var actions = [],
+    const actions = [];
-      spec1,
+    let spec1;
-      spec2,
+    let spec2;
-      spec3;
+    let spec3;
 
     env.describe('top', function() {
       env.afterAll(function() {});
@@ -700,7 +699,7 @@ describe('spec running', function() {
   });
 
   it('should run the tests in a consistent order when a seed is supplied', function(done) {
-    var actions = [];
+    const actions = [];
     env.configure({ random: true, seed: '123456' });
 
     env.beforeEach(function() {
@@ -758,7 +757,7 @@ describe('spec running', function() {
     });
 
     env.execute(null, function() {
-      var expected = [
+      const expected = [
         'topSuite beforeEach',
         'outer beforeEach',
         'outer it 2',
@@ -886,6 +885,7 @@ describe('spec running', function() {
       const actions = [];
 
       env.describe('Something', function() {
+        // eslint-disable-next-line no-unused-vars
         env.beforeEach(function(innerDone) {
           actions.push('beforeEach');
         }, 1);
@@ -985,7 +985,7 @@ describe('spec running', function() {
     hasStandardErrorHandlingBehavior();
 
     it('skips to cleanup functions after an expectation failure', async function() {
-      var actions = [];
+      const actions = [];
 
       env.describe('Something', function() {
         env.beforeEach(function() {
@@ -1026,7 +1026,7 @@ describe('spec running', function() {
     hasStandardErrorHandlingBehavior();
 
     it('does not skip anything after an expectation failure', async function() {
-      var actions = [];
+      const actions = [];
 
       env.describe('Something', function() {
         env.beforeEach(function() {
@@ -1299,8 +1299,7 @@ describe('spec running', function() {
 
   describe('when stopOnSpecFailure is on', function() {
     it('does not run further specs when one fails', function(done) {
-      var actions = [],
+      const actions = [];
-        config;
 
       env.describe('wrapper', function() {
         env.it('fails', function() {
@@ -1366,7 +1365,7 @@ describe('spec running', function() {
     });
 
     it('should be able to run multiple times', function(done) {
-      var actions = [];
+      const actions = [];
 
       env.describe('Suite', function() {
         env.it('spec1', function() {
@@ -1389,9 +1388,9 @@ describe('spec running', function() {
     });
 
     it('should reset results between runs', function(done) {
-      var specResults = {};
+      const specResults = {};
-      var suiteResults = {};
+      const suiteResults = {};
-      var firstExecution = true;
+      let firstExecution = true;
 
       env.addReporter({
         specDone: function(spec) {
@@ -1483,13 +1482,13 @@ describe('spec running', function() {
     });
 
     it('should execute before and after hooks per run', function(done) {
-      var timeline = [];
+      let timeline = [];
-      var timelineFn = function(hookName) {
+      const timelineFn = function(hookName) {
         return function() {
           timeline.push(hookName);
         };
       };
-      var expectedTimeLine = [
+      const expectedTimeLine = [
         'beforeAll',
         'beforeEach',
         'spec1',
@@ -1519,8 +1518,8 @@ describe('spec running', function() {
     });
 
     it('should be able to filter out different tests in subsequent runs', function(done) {
-      var specResults = {};
+      const specResults = {};
-      var focussedSpec = 'spec1';
+      let focussedSpec = 'spec1';
 
       env.configure({
         specFilter: function(spec) {

spec/core/matchers/DiffBuilderSpec.js

@@ -1,6 +1,6 @@
 describe('DiffBuilder', function() {
   it('records the actual and expected objects', function() {
-    var diffBuilder = jasmineUnderTest.DiffBuilder();
+    const diffBuilder = new jasmineUnderTest.DiffBuilder();
     diffBuilder.setRoots({ x: 'actual' }, { x: 'expected' });
     diffBuilder.recordMismatch();
 
@@ -10,7 +10,7 @@ describe('DiffBuilder', function() {
   });
 
   it('prints the path at which the difference was found', function() {
-    var diffBuilder = jasmineUnderTest.DiffBuilder();
+    const diffBuilder = new jasmineUnderTest.DiffBuilder();
     diffBuilder.setRoots({ foo: { x: 'actual' } }, { foo: { x: 'expected' } });
 
     diffBuilder.withPath('foo', function() {
@@ -23,7 +23,7 @@ describe('DiffBuilder', function() {
   });
 
   it('prints multiple messages, separated by newlines', function() {
-    var diffBuilder = jasmineUnderTest.DiffBuilder();
+    const diffBuilder = new jasmineUnderTest.DiffBuilder();
     diffBuilder.setRoots({ foo: 1, bar: 3 }, { foo: 2, bar: 4 });
 
     diffBuilder.withPath('foo', function() {
@@ -33,14 +33,14 @@ describe('DiffBuilder', function() {
       diffBuilder.recordMismatch();
     });
 
-    var message =
+    const message =
       'Expected $.foo = 1 to equal 2.\n' + 'Expected $.bar = 3 to equal 4.';
 
     expect(diffBuilder.getMessage()).toEqual(message);
   });
 
   it('allows customization of the message', function() {
-    var diffBuilder = jasmineUnderTest.DiffBuilder();
+    const diffBuilder = new jasmineUnderTest.DiffBuilder();
     diffBuilder.setRoots({ x: 'bar' }, { x: 'foo' });
 
     function darthVaderFormatter(actual, expected, path) {
@@ -65,10 +65,10 @@ describe('DiffBuilder', function() {
   });
 
   it('uses the injected pretty-printer', function() {
-    var prettyPrinter = function(val) {
+    const prettyPrinter = function(val) {
         return '|' + val + '|';
       },
-      diffBuilder = jasmineUnderTest.DiffBuilder({
+      diffBuilder = new jasmineUnderTest.DiffBuilder({
         prettyPrinter: prettyPrinter
       });
     prettyPrinter.customFormat_ = function() {};
@@ -84,9 +84,9 @@ describe('DiffBuilder', function() {
   });
 
   it('passes the injected pretty-printer to the diff formatter', function() {
-    var diffFormatter = jasmine.createSpy('diffFormatter'),
+    const diffFormatter = jasmine.createSpy('diffFormatter'),
       prettyPrinter = function() {},
-      diffBuilder = jasmineUnderTest.DiffBuilder({
+      diffBuilder = new jasmineUnderTest.DiffBuilder({
         prettyPrinter: prettyPrinter
       });
     prettyPrinter.customFormat_ = function() {};
@@ -107,13 +107,13 @@ describe('DiffBuilder', function() {
   });
 
   it('uses custom object formatters on leaf nodes', function() {
-    var formatter = function(x) {
+    const formatter = function(x) {
       if (typeof x === 'number') {
         return '[number:' + x + ']';
       }
     };
     const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]);
-    var diffBuilder = new jasmineUnderTest.DiffBuilder({
+    const diffBuilder = new jasmineUnderTest.DiffBuilder({
       prettyPrinter: prettyPrinter
     });
 
@@ -126,16 +126,16 @@ describe('DiffBuilder', function() {
   });
 
   it('uses custom object formatters on non leaf nodes', function() {
-    var formatter = function(x) {
+    const formatter = function(x) {
       if (x.hasOwnProperty('a')) {
         return '[thing with a=' + x.a + ', b=' + JSON.stringify(x.b) + ']';
       }
     };
     const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]);
-    var diffBuilder = new jasmineUnderTest.DiffBuilder({
+    const diffBuilder = new jasmineUnderTest.DiffBuilder({
       prettyPrinter: prettyPrinter
     });
-    var expectedMsg =
+    const expectedMsg =
       'Expected $[0].foo = [thing with a=1, b={"x":42}] to equal [thing with a=1, b={"x":43}].\n' +
       "Expected $[0].bar = 'yes' to equal 'no'.";
 
@@ -162,7 +162,7 @@ describe('DiffBuilder', function() {
   });
 
   it('builds diffs involving asymmetric equality testers that implement valuesForDiff_ at the root', function() {
-    var prettyPrinter = jasmineUnderTest.makePrettyPrinter([]),
+    const prettyPrinter = jasmineUnderTest.makePrettyPrinter([]),
       diffBuilder = new jasmineUnderTest.DiffBuilder({
         prettyPrinter: prettyPrinter
       }),
@@ -186,7 +186,7 @@ describe('DiffBuilder', function() {
   });
 
   it('builds diffs involving asymmetric equality testers that implement valuesForDiff_ below the root', function() {
-    var prettyPrinter = jasmineUnderTest.makePrettyPrinter([]),
+    const prettyPrinter = jasmineUnderTest.makePrettyPrinter([]),
       diffBuilder = new jasmineUnderTest.DiffBuilder({
         prettyPrinter: prettyPrinter
       }),

spec/core/matchers/MismatchTreeSpec.js

@@ -2,7 +2,7 @@ describe('MismatchTree', function() {
   describe('#add', function() {
     describe('When the path is empty', function() {
       it('flags the root node as mismatched', function() {
-        var tree = new jasmineUnderTest.MismatchTree();
+        const tree = new jasmineUnderTest.MismatchTree();
         tree.add(new jasmineUnderTest.ObjectPath([]));
         expect(tree.isMismatch).toBe(true);
       });
@@ -10,7 +10,7 @@ describe('MismatchTree', function() {
 
     describe('When the path is not empty', function() {
       it('flags the node as mismatched', function() {
-        var tree = new jasmineUnderTest.MismatchTree();
+        const tree = new jasmineUnderTest.MismatchTree();
 
         tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']));
 
@@ -18,7 +18,7 @@ describe('MismatchTree', function() {
       });
 
       it('does not flag ancestors as mismatched', function() {
-        var tree = new jasmineUnderTest.MismatchTree();
+        const tree = new jasmineUnderTest.MismatchTree();
 
         tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']));
 
@@ -28,7 +28,7 @@ describe('MismatchTree', function() {
     });
 
     it('stores the formatter on only the target node', function() {
-      var tree = new jasmineUnderTest.MismatchTree();
+      const tree = new jasmineUnderTest.MismatchTree();
 
       tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']), formatter);
 
@@ -38,7 +38,7 @@ describe('MismatchTree', function() {
     });
 
     it('stores the path to the node', function() {
-      var tree = new jasmineUnderTest.MismatchTree();
+      const tree = new jasmineUnderTest.MismatchTree();
 
       tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']), formatter);
 
@@ -48,10 +48,10 @@ describe('MismatchTree', function() {
 
   describe('#traverse', function() {
     it('calls the callback for all nodes that are or contain mismatches', function() {
-      var tree = new jasmineUnderTest.MismatchTree();
+      const tree = new jasmineUnderTest.MismatchTree();
       tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']), formatter);
       tree.add(new jasmineUnderTest.ObjectPath(['c']));
-      var visit = jasmine.createSpy('visit').and.returnValue(true);
+      const visit = jasmine.createSpy('visit').and.returnValue(true);
 
       tree.traverse(visit);
 
@@ -78,8 +78,8 @@ describe('MismatchTree', function() {
     });
 
     it('does not call the callback if there are no mismatches', function() {
-      var tree = new jasmineUnderTest.MismatchTree();
+      const tree = new jasmineUnderTest.MismatchTree();
-      var visit = jasmine.createSpy('visit');
+      const visit = jasmine.createSpy('visit');
 
       tree.traverse(visit);
 
@@ -87,9 +87,9 @@ describe('MismatchTree', function() {
     });
 
     it('visits parents before children', function() {
-      var tree = new jasmineUnderTest.MismatchTree();
+      const tree = new jasmineUnderTest.MismatchTree();
       tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']));
-      var visited = [];
+      const visited = [];
 
       tree.traverse(function(path) {
         visited.push(path);
@@ -104,10 +104,10 @@ describe('MismatchTree', function() {
     });
 
     it('visits children in the order they were recorded', function() {
-      var tree = new jasmineUnderTest.MismatchTree();
+      const tree = new jasmineUnderTest.MismatchTree();
       tree.add(new jasmineUnderTest.ObjectPath(['length']));
       tree.add(new jasmineUnderTest.ObjectPath([1]));
-      var visited = [];
+      const visited = [];
 
       tree.traverse(function(path) {
         visited.push(path);
@@ -122,9 +122,9 @@ describe('MismatchTree', function() {
     });
 
     it('does not visit children if the callback returns falsy', function() {
-      var tree = new jasmineUnderTest.MismatchTree();
+      const tree = new jasmineUnderTest.MismatchTree();
       tree.add(new jasmineUnderTest.ObjectPath(['a', 'b']));
-      var visited = [];
+      const visited = [];
 
       tree.traverse(function(path) {
         visited.push(path);

spec/core/matchers/NullDiffBuilderSpec.js

@@ -1,6 +1,6 @@
 describe('NullDiffBuilder', function() {
   it('responds to withPath() by calling the passed function', function() {
-    var spy = jasmine.createSpy('callback');
+    const spy = jasmine.createSpy('callback');
     jasmineUnderTest.NullDiffBuilder().withPath('does not matter', spy);
     expect(spy).toHaveBeenCalled();
   });

spec/core/matchers/ObjectPathSpec.js

@@ -1,5 +1,5 @@
 describe('ObjectPath', function() {
-  var ObjectPath = jasmineUnderTest.ObjectPath;
+  const ObjectPath = jasmineUnderTest.ObjectPath;
 
   it('represents the path to a node in an object tree', function() {
     expect(new ObjectPath(['foo', 'bar']).toString()).toEqual('$.foo.bar');
@@ -25,6 +25,10 @@ describe('ObjectPath', function() {
     expect(new ObjectPath(['1hello']).toString()).toEqual("$['1hello']");
   });
 
+  it('renders symbols with squre bracket notation', function() {
+    expect(new ObjectPath([Symbol('a')]).toString()).toEqual('$[Symbol(a)]');
+  });
+
   it('renders as the empty string when empty', function() {
     expect(new ObjectPath().toString()).toEqual('');
   });
@@ -34,8 +38,8 @@ describe('ObjectPath', function() {
   });
 
   it('can be created based on another path', function() {
-    var root = new ObjectPath();
+    const root = new ObjectPath();
-    var path = root.add('foo');
+    const path = root.add('foo');
 
     expect(path.toString()).toEqual('$.foo');
     expect(root.toString()).toEqual('');

spec/core/matchers/async/toBePendingSpec.js

@@ -1,6 +1,6 @@
 describe('toBePending', function() {
   it('passes if the actual promise is pending', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBePending(matchersUtil),
       actual = new Promise(function() {});
 
@@ -10,7 +10,7 @@ describe('toBePending', function() {
   });
 
   it('fails if the actual promise is resolved', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBePending(matchersUtil),
       actual = Promise.resolve();
 
@@ -20,7 +20,7 @@ describe('toBePending', function() {
   });
 
   it('fails if the actual promise is rejected', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBePending(matchersUtil),
       actual = Promise.reject(new Error('promise was rejected'));
 
@@ -30,7 +30,7 @@ describe('toBePending', function() {
   });
 
   it('fails if actual is not a promise', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBePending(matchersUtil),
       actual = 'not a promise';
 

spec/core/matchers/async/toBeRejectedSpec.js

@@ -1,6 +1,6 @@
 describe('toBeRejected', function() {
   it('passes if the actual is rejected', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejected(matchersUtil),
       actual = Promise.reject('AsyncExpectationSpec rejection');
 
@@ -10,7 +10,7 @@ describe('toBeRejected', function() {
   });
 
   it('fails if the actual is resolved', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejected(matchersUtil),
       actual = Promise.resolve();
 
@@ -20,7 +20,7 @@ describe('toBeRejected', function() {
   });
 
   it('fails if actual is not a promise', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejected(matchersUtil),
       actual = 'not a promise';
 

spec/core/matchers/async/toBeRejectedWithErrorSpec.js

@@ -1,6 +1,6 @@
 describe('#toBeRejectedWithError', function() {
   it('passes when Error type matches', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -20,7 +20,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('passes when Error type and message matches', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -40,7 +40,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('passes when Error matches and is exactly Error', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -60,7 +60,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('passes when Error message matches a string', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -80,7 +80,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('passes when Error message matches a RegExp', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -100,7 +100,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('passes when Error message is empty', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -120,7 +120,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('passes when no arguments', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -140,7 +140,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('fails when resolved', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -159,7 +159,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('fails when rejected with non Error type', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -179,7 +179,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('fails when Error type mismatches', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -199,7 +199,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('fails when Error message mismatches', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(
@@ -219,7 +219,7 @@ describe('#toBeRejectedWithError', function() {
   });
 
   it('fails if actual is not a promise', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWithError(

spec/core/matchers/async/toBeRejectedWithSpec.js

@@ -1,6 +1,6 @@
 describe('#toBeRejectedWith', function() {
   it('should return true if the promise is rejected with the expected value', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil),
       actual = Promise.reject({ error: 'PEBCAK' });
 
@@ -10,7 +10,7 @@ describe('#toBeRejectedWith', function() {
   });
 
   it('should fail if the promise resolves', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil),
       actual = Promise.resolve();
 
@@ -20,7 +20,7 @@ describe('#toBeRejectedWith', function() {
   });
 
   it('should fail if the promise is rejected with a different value', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil),
@@ -38,7 +38,7 @@ describe('#toBeRejectedWith', function() {
   });
 
   it('should build its error correctly when negated', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil),
@@ -55,7 +55,7 @@ describe('#toBeRejectedWith', function() {
   });
 
   it('should support custom equality testers', function() {
-    var customEqualityTesters = [
+    const customEqualityTesters = [
         function() {
           return true;
         }
@@ -72,7 +72,7 @@ describe('#toBeRejectedWith', function() {
   });
 
   it('fails if actual is not a promise', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeRejectedWith(matchersUtil),

spec/core/matchers/async/toBeResolvedSpec.js

@@ -1,6 +1,6 @@
 describe('toBeResolved', function() {
   it('passes if the actual is resolved', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBeResolved(matchersUtil),
       actual = Promise.resolve();
 
@@ -10,7 +10,7 @@ describe('toBeResolved', function() {
   });
 
   it('fails if the actual is rejected', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter([])
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeResolved(matchersUtil),
@@ -27,7 +27,7 @@ describe('toBeResolved', function() {
   });
 
   it('fails if actual is not a promise', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBeResolved(matchersUtil),
       actual = 'not a promise';
 

spec/core/matchers/async/toBeResolvedToSpec.js

@@ -1,6 +1,6 @@
 describe('#toBeResolvedTo', function() {
   it('passes if the promise is resolved to the expected value', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil),
       actual = Promise.resolve({ foo: 42 });
 
@@ -10,7 +10,7 @@ describe('#toBeResolvedTo', function() {
   });
 
   it('fails if the promise is rejected', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil),
@@ -29,7 +29,7 @@ describe('#toBeResolvedTo', function() {
   });
 
   it('fails if the promise is resolved to a different value', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil),
@@ -47,7 +47,7 @@ describe('#toBeResolvedTo', function() {
   });
 
   it('builds its message correctly when negated', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil),
@@ -64,7 +64,7 @@ describe('#toBeResolvedTo', function() {
   });
 
   it('supports custom equality testers', function() {
-    var customEqualityTesters = [
+    const customEqualityTesters = [
         function() {
           return true;
         }
@@ -82,7 +82,7 @@ describe('#toBeResolvedTo', function() {
   });
 
   it('fails if actual is not a promise', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.asyncMatchers.toBeResolvedTo(matchersUtil),

spec/core/matchers/matchersUtilSpec.js

@@ -1,6 +1,6 @@
 describe('matchersUtil', function() {
   it('exposes the injected pretty-printer as .pp', function() {
-    var pp = function() {},
+    const pp = function() {},
       matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp });
 
     expect(matchersUtil.pp).toBe(pp);
@@ -8,72 +8,72 @@ describe('matchersUtil', function() {
 
   describe('equals', function() {
     it('passes for literals that are triple-equal', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(null, null)).toBe(true);
       expect(matchersUtil.equals(void 0, void 0)).toBe(true);
     });
 
     it('fails for things that are not equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals({ a: 'foo' }, 1)).toBe(false);
     });
 
     it('passes for Strings that are equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals('foo', 'foo')).toBe(true);
     });
 
     it('fails for Strings that are not equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals('foo', 'bar')).toBe(false);
     });
 
     it('passes for Numbers that are equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(123, 123)).toBe(true);
     });
 
     it('fails for Numbers that are not equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(123, 456)).toBe(false);
     });
 
     it('fails for a Number and a String that have equivalent values', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(123, '123')).toBe(false);
     });
 
     it('passes for Dates that are equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(
         matchersUtil.equals(new Date('Jan 1, 1970'), new Date('Jan 1, 1970'))
       ).toBe(true);
     });
 
     it('fails for Dates that are not equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(
         matchersUtil.equals(new Date('Jan 1, 1970'), new Date('Feb 3, 1991'))
       ).toBe(false);
     });
 
     it('passes for Booleans that are equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(true, true)).toBe(true);
     });
 
     it('fails for Booleans that are not equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(true, false)).toBe(false);
     });
 
     it('passes for RegExps that are equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(/foo/, /foo/)).toBe(true);
     });
 
     it('fails for RegExps that are not equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(/foo/, /bar/)).toBe(false);
       expect(
         matchersUtil.equals(new RegExp('foo', 'i'), new RegExp('foo'))
@@ -81,12 +81,12 @@ describe('matchersUtil', function() {
     });
 
     it('passes for Arrays that are equivalent', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals([1, 2], [1, 2])).toBe(true);
     });
 
     it('passes for Arrays that are equivalent, with elements added by changing length', function() {
-      var foo = [],
+      const foo = [],
         matchersUtil = new jasmineUnderTest.MatchersUtil();
       foo.length = 1;
 
@@ -99,12 +99,12 @@ describe('matchersUtil', function() {
     });
 
     it('fails for Arrays that have different elements', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals([1, 2, 3], [1, 5, 3])).toBe(false);
     });
 
     it('fails for Arrays whose contents are equivalent, but have differing properties', function() {
-      var one = [1, 2, 3],
+      const one = [1, 2, 3],
         two = [1, 2, 3],
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -115,7 +115,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes for Arrays with equivalent contents and properties', function() {
-      var one = [1, 2, 3],
+      const one = [1, 2, 3],
         two = [1, 2, 3],
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -125,22 +125,44 @@ describe('matchersUtil', function() {
       expect(matchersUtil.equals(one, two)).toBe(true);
     });
 
+    it('handles symbol keys in Arrays', function() {
+      const matchersUtil = new jasmineUnderTest.MatchersUtil(),
+        sym = Symbol('foo'),
+        arr1 = [];
+      let arr2 = [];
+
+      arr1[sym] = 'bar';
+      arr2[sym] = 'bar';
+      expect(matchersUtil.equals(arr1, arr2)).toBe(true);
+
+      arr2[sym] = 'baz';
+      expect(matchersUtil.equals(arr1, arr2)).toBe(false);
+
+      arr2 = [];
+      arr2[Symbol('foo')] = 'bar';
+      expect(matchersUtil.equals(arr1, arr2)).toBe(false);
+
+      arr2 = [];
+      arr2['foo'] = 'bar';
+      expect(matchersUtil.equals(arr1, arr2)).toBe(false);
+    });
+
     it('passes for Errors that are the same type and have the same message', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(new Error('foo'), new Error('foo'))).toBe(
         true
       );
     });
 
     it('fails for Errors that are the same type and have different messages', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(new Error('foo'), new Error('bar'))).toBe(
         false
       );
     });
 
     it('fails for objects with different constructors', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       function One() {}
       function Two() {}
 
@@ -148,17 +170,17 @@ describe('matchersUtil', function() {
     });
 
     it('passes for Objects that are equivalent (simple case)', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals({ a: 'foo' }, { a: 'foo' })).toBe(true);
     });
 
     it('fails for Objects that are not equivalent (simple case)', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals({ a: 'foo' }, { a: 'bar' })).toBe(false);
     });
 
     it('passes for Objects that are equivalent (deep case)', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(
         matchersUtil.equals(
           { a: 'foo', b: { c: 'bar' } },
@@ -168,7 +190,7 @@ describe('matchersUtil', function() {
     });
 
     it('fails for Objects that are not equivalent (deep case)', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(
         matchersUtil.equals(
           { a: 'foo', b: { c: 'baz' } },
@@ -178,7 +200,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes for Objects that are equivalent (with cycles)', function() {
-      var actual = { a: 'foo' },
+      const actual = { a: 'foo' },
         expected = { a: 'foo' },
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -189,7 +211,7 @@ describe('matchersUtil', function() {
     });
 
     it('fails for Objects that are not equivalent (with cycles)', function() {
-      var actual = { a: 'foo' },
+      const actual = { a: 'foo' },
         expected = { a: 'bar' },
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -200,7 +222,7 @@ describe('matchersUtil', function() {
     });
 
     it('fails for Objects that have the same number of keys, but different keys/values', function() {
-      var expected = { a: undefined },
+      const expected = { a: undefined },
         actual = { b: 1 },
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -208,7 +230,7 @@ describe('matchersUtil', function() {
     });
 
     it('fails when comparing an empty object to an empty array (issue #114)', function() {
-      var emptyObject = {},
+      const emptyObject = {},
         emptyArray = [],
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -217,7 +239,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes for equivalent frozen objects (GitHub issue #266)', function() {
-      var a = { foo: 1 },
+      const a = { foo: 1 },
         b = { foo: 1 },
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -232,7 +254,7 @@ describe('matchersUtil', function() {
         return;
       }
 
-      var p1 = new Promise(function() {}),
+      const p1 = new Promise(function() {}),
         p2 = new Promise(function() {}),
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -249,13 +271,13 @@ describe('matchersUtil', function() {
         if (isNotRunningInBrowser()) {
           return;
         }
-        var a = document.createElement('div');
+        const a = document.createElement('div');
-        var matchersUtil = new jasmineUnderTest.MatchersUtil();
+        const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
         a.setAttribute('test-attr', 'attr-value');
         a.appendChild(document.createTextNode('test'));
 
-        var b = document.createElement('div');
+        const b = document.createElement('div');
         b.setAttribute('test-attr', 'attr-value');
         b.appendChild(document.createTextNode('test'));
 
@@ -266,8 +288,8 @@ describe('matchersUtil', function() {
         if (isNotRunningInBrowser()) {
           return;
         }
-        var matchersUtil = new jasmineUnderTest.MatchersUtil();
+        const matchersUtil = new jasmineUnderTest.MatchersUtil();
-        var iframe = document.createElement('iframe');
+        const iframe = document.createElement('iframe');
         document.body.appendChild(iframe);
         iframe.contentWindow.eval('window.testObject = {}');
         expect(matchersUtil.equals({}, iframe.contentWindow.testObject)).toBe(
@@ -280,12 +302,12 @@ describe('matchersUtil', function() {
         if (isNotRunningInBrowser()) {
           return;
         }
-        var matchersUtil = new jasmineUnderTest.MatchersUtil();
+        const matchersUtil = new jasmineUnderTest.MatchersUtil();
-        var a = document.createElement('div');
+        const a = document.createElement('div');
         a.setAttribute('test-attr', 'attr-value');
         a.appendChild(document.createTextNode('test'));
 
-        var b = document.createElement('div');
+        const b = document.createElement('div');
         b.setAttribute('test-attr', 'attr-value2');
         b.appendChild(document.createTextNode('test'));
 
@@ -311,9 +333,9 @@ describe('matchersUtil', function() {
         if (isNotRunningInNode()) {
           return;
         }
-        var matchersUtil = new jasmineUnderTest.MatchersUtil();
+        const matchersUtil = new jasmineUnderTest.MatchersUtil();
-        var vm = require('vm');
+        const vm = require('vm');
-        var sandbox = {
+        const sandbox = {
           obj: null
         };
         vm.runInNewContext('obj = {a: 1, b: 2}', sandbox);
@@ -325,9 +347,9 @@ describe('matchersUtil', function() {
         if (isNotRunningInNode()) {
           return;
         }
-        var matchersUtil = new jasmineUnderTest.MatchersUtil();
+        const matchersUtil = new jasmineUnderTest.MatchersUtil();
-        var vm = require('vm');
+        const vm = require('vm');
-        var sandbox = {
+        const sandbox = {
           arr: null
         };
         vm.runInNewContext('arr = [1, 2]', sandbox);
@@ -337,7 +359,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes when Any is used', function() {
-      var number = 3,
+      const number = 3,
         anyNumber = new jasmineUnderTest.Any(Number),
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -346,7 +368,7 @@ describe('matchersUtil', function() {
     });
 
     it('fails when Any is compared to something unexpected', function() {
-      var number = 3,
+      const number = 3,
         anyString = new jasmineUnderTest.Any(String),
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -355,7 +377,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes when ObjectContaining is used', function() {
-      var obj = {
+      const obj = {
           foo: 3,
           bar: 7
         },
@@ -367,11 +389,11 @@ describe('matchersUtil', function() {
     });
 
     it('passes when MapContaining is used', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var obj = new Map();
+      const obj = new Map();
       obj.set(1, 2);
       obj.set('foo', 'bar');
-      var containing = new jasmineUnderTest.MapContaining(new Map());
+      const containing = new jasmineUnderTest.MapContaining(new Map());
       containing.sample.set('foo', 'bar');
 
       expect(matchersUtil.equals(obj, containing)).toBe(true);
@@ -379,11 +401,11 @@ describe('matchersUtil', function() {
     });
 
     it('passes when SetContaining is used', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var obj = new Set();
+      const obj = new Set();
       obj.add(1);
       obj.add('foo');
-      var containing = new jasmineUnderTest.SetContaining(new Set());
+      const containing = new jasmineUnderTest.SetContaining(new Set());
       containing.sample.add(1);
 
       expect(matchersUtil.equals(obj, containing)).toBe(true);
@@ -391,8 +413,8 @@ describe('matchersUtil', function() {
     });
 
     it('passes when an asymmetric equality tester returns true', function() {
-      var tester = {
+      const tester = {
-          asymmetricMatch: function(other) {
+          asymmetricMatch: function() {
             return true;
           }
         },
@@ -403,8 +425,8 @@ describe('matchersUtil', function() {
     });
 
     it('fails when an asymmetric equality tester returns false', function() {
-      var tester = {
+      const tester = {
-          asymmetricMatch: function(other) {
+          asymmetricMatch: function() {
             return false;
           }
         },
@@ -415,7 +437,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes when ArrayContaining is used', function() {
-      var arr = ['foo', 'bar'],
+      const arr = ['foo', 'bar'],
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
       expect(
@@ -424,7 +446,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes when a custom equality matcher returns true', function() {
-      var tester = function(a, b) {
+      const tester = function() {
           return true;
         },
         matchersUtil = new jasmineUnderTest.MatchersUtil({
@@ -436,17 +458,17 @@ describe('matchersUtil', function() {
     });
 
     it('passes for two empty Objects', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals({}, {})).toBe(true);
     });
 
     describe("when a custom equality matcher returns 'undefined'", function() {
-      var tester = function(a, b) {
+      const tester = function() {
         return jasmine.undefined;
       };
 
       it('passes for two empty Objects', function() {
-        var matchersUtil = new jasmineUnderTest.MatchersUtil({
+        const matchersUtil = new jasmineUnderTest.MatchersUtil({
           customTesters: [tester],
           pp: function() {}
         });
@@ -455,7 +477,7 @@ describe('matchersUtil', function() {
     });
 
     it('fails for equivalents when a custom equality matcher returns false', function() {
-      var tester = function(a, b) {
+      const tester = function() {
           return false;
         },
         matchersUtil = new jasmineUnderTest.MatchersUtil({
@@ -467,12 +489,12 @@ describe('matchersUtil', function() {
     });
 
     it('passes for an asymmetric equality tester that returns true when a custom equality tester return false', function() {
-      var asymmetricTester = {
+      const asymmetricTester = {
-          asymmetricMatch: function(other) {
+          asymmetricMatch: function() {
             return true;
           }
         },
-        symmetricTester = function(a, b) {
+        symmetricTester = function() {
           return false;
         },
         matchersUtil = new jasmineUnderTest.MatchersUtil({
@@ -485,7 +507,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes when an Any is compared to an Any that checks for the same type', function() {
-      var any1 = new jasmineUnderTest.Any(Function),
+      const any1 = new jasmineUnderTest.Any(Function),
         any2 = new jasmineUnderTest.Any(Function),
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -493,7 +515,7 @@ describe('matchersUtil', function() {
     });
 
     it('passes for null prototype objects with same properties', function() {
-      var objA = Object.create(null),
+      const objA = Object.create(null),
         objB = Object.create(null),
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -504,7 +526,7 @@ describe('matchersUtil', function() {
     });
 
     it('fails for null prototype objects with different properties', function() {
-      var objA = Object.create(null),
+      const objA = Object.create(null),
         objB = Object.create(null),
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
@@ -515,16 +537,16 @@ describe('matchersUtil', function() {
     });
 
     it('passes when comparing two empty sets', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(new Set(), new Set())).toBe(true);
     });
 
     it('passes when comparing identical sets', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var setA = new Set();
+      const setA = new Set();
       setA.add(6);
       setA.add(5);
-      var setB = new Set();
+      const setB = new Set();
       setB.add(6);
       setB.add(5);
 
@@ -532,11 +554,11 @@ describe('matchersUtil', function() {
     });
 
     it('passes when comparing identical sets with different insertion order and simple elements', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var setA = new Set();
+      const setA = new Set();
       setA.add(3);
       setA.add(6);
-      var setB = new Set();
+      const setB = new Set();
       setB.add(6);
       setB.add(3);
 
@@ -544,24 +566,24 @@ describe('matchersUtil', function() {
     });
 
     it('passes when comparing identical sets with different insertion order and complex elements 1', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var setA1 = new Set();
+      const setA1 = new Set();
       setA1.add(['a', 3]);
       setA1.add([6, 1]);
-      var setA2 = new Set();
+      const setA2 = new Set();
       setA1.add(['y', 3]);
       setA1.add([6, 1]);
-      var setA = new Set();
+      const setA = new Set();
       setA.add(setA1);
       setA.add(setA2);
 
-      var setB1 = new Set();
+      const setB1 = new Set();
       setB1.add([6, 1]);
       setB1.add(['a', 3]);
-      var setB2 = new Set();
+      const setB2 = new Set();
       setB1.add([6, 1]);
       setB1.add(['y', 3]);
-      var setB = new Set();
+      const setB = new Set();
       setB.add(setB1);
       setB.add(setB2);
 
@@ -569,11 +591,11 @@ describe('matchersUtil', function() {
     });
 
     it('passes when comparing identical sets with different insertion order and complex elements 2', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var setA = new Set();
+      const setA = new Set();
       setA.add([[1, 2], [3, 4]]);
       setA.add([[5, 6], [7, 8]]);
-      var setB = new Set();
+      const setB = new Set();
       setB.add([[5, 6], [7, 8]]);
       setB.add([[1, 2], [3, 4]]);
 
@@ -581,12 +603,12 @@ describe('matchersUtil', function() {
     });
 
     it('fails for sets with different elements', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var setA = new Set();
+      const setA = new Set();
       setA.add(6);
       setA.add(3);
       setA.add(5);
-      var setB = new Set();
+      const setB = new Set();
       setB.add(6);
       setB.add(4);
       setB.add(5);
@@ -595,11 +617,11 @@ describe('matchersUtil', function() {
     });
 
     it('fails for sets of different size', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var setA = new Set();
+      const setA = new Set();
       setA.add(6);
       setA.add(3);
-      var setB = new Set();
+      const setB = new Set();
       setB.add(6);
       setB.add(4);
       setB.add(5);
@@ -608,36 +630,36 @@ describe('matchersUtil', function() {
     });
 
     it('passes when comparing two empty maps', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(new Map(), new Map())).toBe(true);
     });
 
     it('passes when comparing identical maps', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var mapA = new Map();
+      const mapA = new Map();
       mapA.set(6, 5);
-      var mapB = new Map();
+      const mapB = new Map();
       mapB.set(6, 5);
       expect(matchersUtil.equals(mapA, mapB)).toBe(true);
     });
 
     it('passes when comparing identical maps with different insertion order', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var mapA = new Map();
+      const mapA = new Map();
       mapA.set('a', 3);
       mapA.set(6, 1);
-      var mapB = new Map();
+      const mapB = new Map();
       mapB.set(6, 1);
       mapB.set('a', 3);
       expect(matchersUtil.equals(mapA, mapB)).toBe(true);
     });
 
     it('fails for maps with different elements', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var mapA = new Map();
+      const mapA = new Map();
       mapA.set(6, 3);
       mapA.set(5, 1);
-      var mapB = new Map();
+      const mapB = new Map();
       mapB.set(6, 4);
       mapB.set(5, 1);
 
@@ -645,17 +667,17 @@ describe('matchersUtil', function() {
     });
 
     it('fails for maps of different size', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var mapA = new Map();
+      const mapA = new Map();
       mapA.set(6, 3);
-      var mapB = new Map();
+      const mapB = new Map();
       mapB.set(6, 4);
       mapB.set(5, 1);
       expect(matchersUtil.equals(mapA, mapB)).toBe(false);
     });
 
     it('passes when comparing two identical URLs', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
       expect(
         matchersUtil.equals(
@@ -666,7 +688,7 @@ describe('matchersUtil', function() {
     });
 
     it('fails when comparing two different URLs', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+      const matchersUtil = new jasmineUnderTest.MatchersUtil(),
         url1 = new URL('http://localhost/1');
 
       expect(matchersUtil.equals(url1, new URL('http://localhost/2'))).toBe(
@@ -690,26 +712,26 @@ describe('matchersUtil', function() {
     });
 
     it('passes for ArrayBuffers with same length and content', function() {
-      var buffer1 = new ArrayBuffer(4);
+      const buffer1 = new ArrayBuffer(4);
-      var buffer2 = new ArrayBuffer(4);
+      const buffer2 = new ArrayBuffer(4);
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(buffer1, buffer2)).toBe(true);
     });
 
     it('fails for ArrayBuffers with same length but different content', function() {
-      var buffer1 = new ArrayBuffer(4);
+      const buffer1 = new ArrayBuffer(4);
-      var buffer2 = new ArrayBuffer(4);
+      const buffer2 = new ArrayBuffer(4);
-      var array1 = new Uint8Array(buffer1);
+      const array1 = new Uint8Array(buffer1);
       array1[0] = 1;
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.equals(buffer1, buffer2)).toBe(false);
     });
 
     describe('Typed arrays', function() {
       it('fails for typed arrays of same length and contents but different types', function() {
-        var matchersUtil = new jasmineUnderTest.MatchersUtil();
+        const matchersUtil = new jasmineUnderTest.MatchersUtil();
-        var a1 = new Int8Array(1);
+        const a1 = new Int8Array(1);
-        var a2 = new Uint8Array(1);
+        const a2 = new Uint8Array(1);
         a1[0] = a2[0] = 0;
         expect(matchersUtil.equals(a1, a2)).toBe(false);
       });
@@ -725,14 +747,14 @@ describe('matchersUtil', function() {
         'Float32Array',
         'Float64Array'
       ].forEach(function(typeName) {
-        var TypedArrayCtor = jasmine.getGlobal()[typeName];
+        const TypedArrayCtor = jasmine.getGlobal()[typeName];
 
         it(
           'passes for ' + typeName + 's with same length and content',
           function() {
-            var matchersUtil = new jasmineUnderTest.MatchersUtil();
+            const matchersUtil = new jasmineUnderTest.MatchersUtil();
-            var a1 = new TypedArrayCtor(2);
+            const a1 = new TypedArrayCtor(2);
-            var a2 = new TypedArrayCtor(2);
+            const a2 = new TypedArrayCtor(2);
             a1[0] = a2[0] = 0;
             a1[1] = a2[1] = 1;
             expect(matchersUtil.equals(a1, a2)).toBe(true);
@@ -740,9 +762,9 @@ describe('matchersUtil', function() {
         );
 
         it('fails for ' + typeName + 's with different length', function() {
-          var matchersUtil = new jasmineUnderTest.MatchersUtil();
+          const matchersUtil = new jasmineUnderTest.MatchersUtil();
-          var a1 = new TypedArrayCtor(2);
+          const a1 = new TypedArrayCtor(2);
-          var a2 = new TypedArrayCtor(1);
+          const a2 = new TypedArrayCtor(1);
           a1[0] = a1[1] = a2[0] = 0;
           expect(matchersUtil.equals(a1, a2)).toBe(false);
         });
@@ -750,9 +772,9 @@ describe('matchersUtil', function() {
         it(
           'fails for ' + typeName + 's with same length but different content',
           function() {
-            var matchersUtil = new jasmineUnderTest.MatchersUtil();
+            const matchersUtil = new jasmineUnderTest.MatchersUtil();
-            var a1 = new TypedArrayCtor(1);
+            const a1 = new TypedArrayCtor(1);
-            var a2 = new TypedArrayCtor(1);
+            const a2 = new TypedArrayCtor(1);
             a1[0] = 0;
             a2[0] = 1;
             expect(matchersUtil.equals(a1, a2)).toBe(false);
@@ -760,18 +782,18 @@ describe('matchersUtil', function() {
         );
 
         it('checks nonstandard properties of ' + typeName, function() {
-          var matchersUtil = new jasmineUnderTest.MatchersUtil();
+          const matchersUtil = new jasmineUnderTest.MatchersUtil();
-          var a1 = new TypedArrayCtor(1);
+          const a1 = new TypedArrayCtor(1);
-          var a2 = new TypedArrayCtor(1);
+          const a2 = new TypedArrayCtor(1);
           a1[0] = a2[0] = 0;
           a1.extra = 'yes';
           expect(matchersUtil.equals(a1, a2)).toBe(false);
         });
 
         it('works with custom equality testers with ' + typeName, function() {
-          var a1 = new TypedArrayCtor(1);
+          const a1 = new TypedArrayCtor(1);
-          var a2 = new TypedArrayCtor(1);
+          const a2 = new TypedArrayCtor(1);
-          var matchersUtil = new jasmineUnderTest.MatchersUtil({
+          const matchersUtil = new jasmineUnderTest.MatchersUtil({
             customTesters: [
               function() {
                 return true;
@@ -786,7 +808,7 @@ describe('matchersUtil', function() {
 
       ['BigInt64Array', 'BigUint64Array'].forEach(function(typeName) {
         function requireType() {
-          var TypedArrayCtor = jasmine.getGlobal()[typeName];
+          const TypedArrayCtor = jasmine.getGlobal()[typeName];
 
           if (!TypedArrayCtor) {
             pending('Browser does not support ' + typeName);
@@ -798,10 +820,10 @@ describe('matchersUtil', function() {
         it(
           'passes for ' + typeName + 's with same length and content',
           function() {
-            var TypedArrayCtor = requireType();
+            const TypedArrayCtor = requireType();
-            var matchersUtil = new jasmineUnderTest.MatchersUtil();
+            const matchersUtil = new jasmineUnderTest.MatchersUtil();
-            var a1 = new TypedArrayCtor(2);
+            const a1 = new TypedArrayCtor(2);
-            var a2 = new TypedArrayCtor(2);
+            const a2 = new TypedArrayCtor(2);
             // eslint-disable-next-line compat/compat
             a1[0] = a2[0] = BigInt(0);
             // eslint-disable-next-line compat/compat
@@ -811,10 +833,10 @@ describe('matchersUtil', function() {
         );
 
         it('fails for ' + typeName + 's with different length', function() {
-          var TypedArrayCtor = requireType();
+          const TypedArrayCtor = requireType();
-          var matchersUtil = new jasmineUnderTest.MatchersUtil();
+          const matchersUtil = new jasmineUnderTest.MatchersUtil();
-          var a1 = new TypedArrayCtor(2);
+          const a1 = new TypedArrayCtor(2);
-          var a2 = new TypedArrayCtor(1);
+          const a2 = new TypedArrayCtor(1);
           // eslint-disable-next-line compat/compat
           a1[0] = a1[1] = a2[0] = BigInt(0);
           expect(matchersUtil.equals(a1, a2)).toBe(false);
@@ -823,10 +845,10 @@ describe('matchersUtil', function() {
         it(
           'fails for ' + typeName + 's with same length but different content',
           function() {
-            var TypedArrayCtor = requireType();
+            const TypedArrayCtor = requireType();
-            var matchersUtil = new jasmineUnderTest.MatchersUtil();
+            const matchersUtil = new jasmineUnderTest.MatchersUtil();
-            var a1 = new TypedArrayCtor(2);
+            const a1 = new TypedArrayCtor(2);
-            var a2 = new TypedArrayCtor(2);
+            const a2 = new TypedArrayCtor(2);
             // eslint-disable-next-line compat/compat
             a1[0] = a1[1] = a2[0] = BigInt(0);
             // eslint-disable-next-line compat/compat
@@ -838,7 +860,7 @@ describe('matchersUtil', function() {
     });
 
     describe('when running in an environment with array polyfills', function() {
-      var findIndexDescriptor = Object.getOwnPropertyDescriptor(
+      const findIndexDescriptor = Object.getOwnPropertyDescriptor(
         Array.prototype,
         'findIndex'
       );
@@ -865,13 +887,12 @@ describe('matchersUtil', function() {
               throw new TypeError('predicate must be a function');
             }
 
-            var list = Object(this);
+            const list = Object(this);
-            var length = list.length >>> 0;
+            const length = list.length >>> 0;
-            var thisArg = arguments[1];
+            const thisArg = arguments[1];
-            var value;
 
-            for (var i = 0; i < length; i++) {
+            for (let i = 0; i < length; i++) {
-              value = list[i];
+              const value = list[i];
               if (predicate.call(thisArg, value, i, list)) {
                 return i;
               }
@@ -897,7 +918,7 @@ describe('matchersUtil', function() {
 
     describe('Building diffs for asymmetric equality testers', function() {
       it('diffs the values returned by valuesForDiff_', function() {
-        var tester = {
+        const tester = {
             asymmetricMatch: function() {
               return false;
             },
@@ -931,7 +952,7 @@ describe('matchersUtil', function() {
       });
 
       it('records both objects when the tester does not implement valuesForDiff', function() {
-        var tester = {
+        const tester = {
             asymmetricMatch: function() {
               return false;
             }
@@ -960,7 +981,7 @@ describe('matchersUtil', function() {
     });
 
     it('uses a diffBuilder if one is provided as the third argument', function() {
-      var diffBuilder = new jasmineUnderTest.DiffBuilder(),
+      const diffBuilder = new jasmineUnderTest.DiffBuilder(),
         matchersUtil = new jasmineUnderTest.MatchersUtil();
 
       spyOn(diffBuilder, 'recordMismatch');
@@ -981,27 +1002,27 @@ describe('matchersUtil', function() {
 
   describe('contains', function() {
     it('passes when expected is a substring of actual', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.contains('ABC', 'BC')).toBe(true);
     });
 
     it('fails when expected is a not substring of actual', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.contains('ABC', 'X')).toBe(false);
     });
 
     it('passes when expected is an element in an actual array', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.contains(['foo', 'bar'], 'foo')).toBe(true);
     });
 
     it('fails when expected is not an element in an actual array', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.contains(['foo', 'bar'], 'baz')).toBe(false);
     });
 
     it('passes with mixed-element arrays', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.contains(['foo', { some: 'bar' }], 'foo')).toBe(true);
       expect(
         matchersUtil.contains(['foo', { some: 'bar' }], { some: 'bar' })
@@ -1009,7 +1030,7 @@ describe('matchersUtil', function() {
     });
 
     it('uses custom equality testers if actual is an Array', function() {
-      var customTester = function(a, b) {
+      const customTester = function() {
           return true;
         },
         matchersUtil = new jasmineUnderTest.MatchersUtil({
@@ -1021,18 +1042,18 @@ describe('matchersUtil', function() {
     });
 
     it('fails when actual is undefined', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.contains(undefined, 'A')).toBe(false);
     });
 
     it('fails when actual is null', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
       expect(matchersUtil.contains(null, 'A')).toBe(false);
     });
 
     it('works with array-like objects that implement iterable', function() {
-      var capturedArgs = null,
+      let capturedArgs = null;
-        matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
 
       function testFunction() {
         capturedArgs = arguments;
@@ -1056,17 +1077,17 @@ describe('matchersUtil', function() {
     });
 
     it('passes for set members', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var setItem = { foo: 'bar' };
+      const setItem = { foo: 'bar' };
-      var set = new Set();
+      const set = new Set();
       set.add(setItem);
 
       expect(matchersUtil.contains(set, setItem)).toBe(true);
     });
 
     it('passes for objects that equal to a set member', function() {
-      var matchersUtil = new jasmineUnderTest.MatchersUtil();
+      const matchersUtil = new jasmineUnderTest.MatchersUtil();
-      var set = new Set();
+      const set = new Set();
       set.add({ foo: 'bar' });
 
       expect(matchersUtil.contains(set, { foo: 'bar' })).toBe(true);
@@ -1075,7 +1096,7 @@ describe('matchersUtil', function() {
 
   describe('buildFailureMessage', function() {
     it('builds an English sentence for a failure case', function() {
-      var actual = 'foo',
+      const actual = 'foo',
         name = 'toBar',
         pp = jasmineUnderTest.makePrettyPrinter(),
         matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }),
@@ -1085,22 +1106,18 @@ describe('matchersUtil', function() {
     });
 
     it("builds an English sentence for a 'not' failure case", function() {
-      var actual = 'foo',
+      const actual = 'foo',
         name = 'toBar',
         isNot = true,
         pp = jasmineUnderTest.makePrettyPrinter(),
         matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }),
-        message = (message = matchersUtil.buildFailureMessage(
+        message = matchersUtil.buildFailureMessage(name, isNot, actual);
-          name,
-          isNot,
-          actual
-        ));
 
       expect(message).toEqual("Expected 'foo' not to bar.");
     });
 
     it('builds an English sentence for an arbitrary array of expected arguments', function() {
-      var actual = 'foo',
+      const actual = 'foo',
         name = 'toBar',
         pp = jasmineUnderTest.makePrettyPrinter(),
         matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }),
@@ -1116,7 +1133,7 @@ describe('matchersUtil', function() {
     });
 
     it('uses the injected pretty-printer to format the expecteds and actual', function() {
-      var actual = 'foo',
+      const actual = 'foo',
         expected1 = 'qux',
         expected2 = 'grault',
         name = 'toBar',
@@ -1125,13 +1142,13 @@ describe('matchersUtil', function() {
           return '<' + value + '>';
         },
         matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: pp }),
-        message = (message = matchersUtil.buildFailureMessage(
+        message = matchersUtil.buildFailureMessage(
           name,
           isNot,
           actual,
           expected1,
           expected2
-        ));
+        );
 
       expect(message).toEqual('Expected <foo> to bar <qux>, <grault>.');
     });

spec/core/matchers/nothingSpec.js

@@ -1,6 +1,6 @@
 describe('nothing', function() {
   it('should pass', function() {
-    var matcher = jasmineUnderTest.matchers.nothing(),
+    const matcher = jasmineUnderTest.matchers.nothing(),
       result = matcher.compare();
 
     expect(result.pass).toBe(true);

spec/core/matchers/toBeCloseToSpec.js

@@ -1,7 +1,7 @@
 describe('toBeCloseTo', function() {
   it('passes when within two decimal places by default', function() {
-    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
+    const matcher = jasmineUnderTest.matchers.toBeCloseTo();
-      result;
+    let result;
 
     result = matcher.compare(0, 0);
     expect(result.pass).toBe(true);
@@ -14,8 +14,8 @@ describe('toBeCloseTo', function() {
   });
 
   it('fails when not within two decimal places by default', function() {
-    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
+    const matcher = jasmineUnderTest.matchers.toBeCloseTo();
-      result;
+    let result;
 
     result = matcher.compare(0, 0.01);
     expect(result.pass).toBe(false);
@@ -25,8 +25,8 @@ describe('toBeCloseTo', function() {
   });
 
   it('accepts an optional precision argument', function() {
-    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
+    const matcher = jasmineUnderTest.matchers.toBeCloseTo();
-      result;
+    let result;
 
     result = matcher.compare(0, 0.1, 0);
     expect(result.pass).toBe(true);
@@ -48,7 +48,7 @@ describe('toBeCloseTo', function() {
   });
 
   it('fails when one of the arguments is null', function() {
-    var matcher = jasmineUnderTest.matchers.toBeCloseTo();
+    const matcher = jasmineUnderTest.matchers.toBeCloseTo();
 
     expect(function() {
       matcher.compare(null, null);
@@ -70,8 +70,8 @@ describe('toBeCloseTo', function() {
   });
 
   it('rounds expected values', function() {
-    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
+    const matcher = jasmineUnderTest.matchers.toBeCloseTo();
-      result;
+    let result;
 
     result = matcher.compare(1.23, 1.229);
     expect(result.pass).toBe(true);
@@ -98,8 +98,8 @@ describe('toBeCloseTo', function() {
   });
 
   it('handles edge cases with rounding', function() {
-    var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
+    const matcher = jasmineUnderTest.matchers.toBeCloseTo();
-      result;
+    let result;
 
     // these cases resulted in false negatives in version of V8
     // included in Node.js 12 and Chrome 74 (and Edge Chromium)
@@ -110,4 +110,42 @@ describe('toBeCloseTo', function() {
     result = matcher.compare(-2.82665525779431, -2.82666, 5);
     expect(result.pass).toBe(true);
   });
+
+  describe('Infinity handling', function() {
+    it('passes when the actual and expected are both Infinity', function() {
+      const matcher = jasmineUnderTest.matchers.toBeCloseTo();
+      const result = matcher.compare(Infinity, Infinity, 0);
+      expect(result.pass).toBe(true);
+    });
+
+    it('passes when the actual and expected are both -Infinity', function() {
+      const matcher = jasmineUnderTest.matchers.toBeCloseTo();
+      const result = matcher.compare(-Infinity, -Infinity, 0);
+      expect(result.pass).toBe(true);
+    });
+
+    it('fails when the actual is Infinity and the expected is -Infinity', function() {
+      const matcher = jasmineUnderTest.matchers.toBeCloseTo();
+      const result = matcher.compare(Infinity, -Infinity, 0);
+      expect(result.pass).toBe(false);
+    });
+
+    it('fails when the actual is -Infinity and the expected is Infinity', function() {
+      const matcher = jasmineUnderTest.matchers.toBeCloseTo();
+      const result = matcher.compare(-Infinity, Infinity, 0);
+      expect(result.pass).toBe(false);
+    });
+
+    it('fails when the actual is a number and the expected is Infinity', function() {
+      const matcher = jasmineUnderTest.matchers.toBeCloseTo();
+      const result = matcher.compare(42, Infinity, 0);
+      expect(result.pass).toBe(false);
+    });
+
+    it('fails when the actual is a number and the expected is -Infinity', function() {
+      const matcher = jasmineUnderTest.matchers.toBeCloseTo();
+      const result = matcher.compare(42, -Infinity, 0);
+      expect(result.pass).toBe(false);
+    });
+  });
 });

spec/core/matchers/toBeDefinedSpec.js

@@ -1,17 +1,13 @@
 describe('toBeDefined', function() {
   it('matches for defined values', function() {
-    var matcher = jasmineUnderTest.matchers.toBeDefined(),
+    const matcher = jasmineUnderTest.matchers.toBeDefined();
-      result;
+    const result = matcher.compare('foo');
-
-    result = matcher.compare('foo');
     expect(result.pass).toBe(true);
   });
 
   it('fails when matching undefined values', function() {
-    var matcher = jasmineUnderTest.matchers.toBeDefined(),
+    const matcher = jasmineUnderTest.matchers.toBeDefined();
-      result;
+    const result = matcher.compare(void 0);
-
-    result = matcher.compare(void 0);
     expect(result.pass).toBe(false);
   });
 });

spec/core/matchers/toBeFalseSpec.js

@@ -1,25 +1,19 @@
 describe('toBeFalse', function() {
   it('passes for false', function() {
-    var matcher = jasmineUnderTest.matchers.toBeFalse(),
+    const matcher = jasmineUnderTest.matchers.toBeFalse();
-      result;
+    const result = matcher.compare(false);
-
-    result = matcher.compare(false);
     expect(result.pass).toBe(true);
   });
 
   it('fails for non-false', function() {
-    var matcher = jasmineUnderTest.matchers.toBeFalse(),
+    const matcher = jasmineUnderTest.matchers.toBeFalse();
-      result;
+    const result = matcher.compare('foo');
-
-    result = matcher.compare('foo');
     expect(result.pass).toBe(false);
   });
 
   it('fails for falsy', function() {
-    var matcher = jasmineUnderTest.matchers.toBeFalse(),
+    const matcher = jasmineUnderTest.matchers.toBeFalse();
-      result;
+    const result = matcher.compare(undefined);
-
-    result = matcher.compare(undefined);
     expect(result.pass).toBe(false);
   });
 });

spec/core/matchers/toBeFalsySpec.js

@@ -1,7 +1,7 @@
 describe('toBeFalsy', function() {
   it("passes for 'falsy' values", function() {
-    var matcher = jasmineUnderTest.matchers.toBeFalsy(),
+    const matcher = jasmineUnderTest.matchers.toBeFalsy();
-      result;
+    let result;
 
     result = matcher.compare(false);
     expect(result.pass).toBe(true);
@@ -23,8 +23,8 @@ describe('toBeFalsy', function() {
   });
 
   it("fails for 'truthy' values", function() {
-    var matcher = jasmineUnderTest.matchers.toBeFalsy(),
+    const matcher = jasmineUnderTest.matchers.toBeFalsy();
-      result;
+    let result;
 
     result = matcher.compare(true);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeGreaterThanOrEqualSpec.js

@@ -1,7 +1,7 @@
 describe('toBeGreaterThanOrEqual', function() {
   it('passes when actual >= expected', function() {
-    var matcher = jasmineUnderTest.matchers.toBeGreaterThanOrEqual(),
+    const matcher = jasmineUnderTest.matchers.toBeGreaterThanOrEqual();
-      result;
+    let result;
 
     result = matcher.compare(2, 1);
     expect(result.pass).toBe(true);
@@ -17,8 +17,8 @@ describe('toBeGreaterThanOrEqual', function() {
   });
 
   it('fails when actual < expected', function() {
-    var matcher = jasmineUnderTest.matchers.toBeGreaterThanOrEqual(),
+    const matcher = jasmineUnderTest.matchers.toBeGreaterThanOrEqual();
-      result;
+    let result;
 
     result = matcher.compare(1, 2);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeGreaterThanSpec.js

@@ -1,15 +1,13 @@
 describe('toBeGreaterThan', function() {
   it('passes when actual > expected', function() {
-    var matcher = jasmineUnderTest.matchers.toBeGreaterThan(),
+    const matcher = jasmineUnderTest.matchers.toBeGreaterThan();
-      result;
+    const result = matcher.compare(2, 1);
-
-    result = matcher.compare(2, 1);
     expect(result.pass).toBe(true);
   });
 
   it('fails when actual <= expected', function() {
-    var matcher = jasmineUnderTest.matchers.toBeGreaterThan(),
+    const matcher = jasmineUnderTest.matchers.toBeGreaterThan();
-      result;
+    let result;
 
     result = matcher.compare(1, 1);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeInstanceOfSpec.js

@@ -1,8 +1,8 @@
 describe('toBeInstanceOf', function() {
   describe('when expecting Number', function() {
     it('passes for literal number', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(3, Number);
+      const result = matcher.compare(3, Number);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of Number not to be an instance of Number'
@@ -10,10 +10,10 @@ describe('toBeInstanceOf', function() {
     });
 
     it('passes for NaN', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf({
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf({
         pp: jasmineUnderTest.makePrettyPrinter()
       });
-      var result = matcher.compare(NaN, Number);
+      const result = matcher.compare(NaN, Number);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of NaN not to be an instance of Number'
@@ -21,8 +21,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('passes for Infinity', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(Infinity, Number);
+      const result = matcher.compare(Infinity, Number);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of Number not to be an instance of Number'
@@ -30,8 +30,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('fails for a non-number', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare('foo', Number);
+      const result = matcher.compare('foo', Number);
       expect(result).toEqual({
         pass: false,
         message: 'Expected instance of String to be an instance of Number'
@@ -41,8 +41,8 @@ describe('toBeInstanceOf', function() {
 
   describe('when expecting String', function() {
     it('passes for a string', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare('foo', String);
+      const result = matcher.compare('foo', String);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of String not to be an instance of String'
@@ -50,8 +50,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('fails for a non-string', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare({}, String);
+      const result = matcher.compare({}, String);
       expect(result).toEqual({
         pass: false,
         message: 'Expected instance of Object to be an instance of String'
@@ -61,8 +61,8 @@ describe('toBeInstanceOf', function() {
 
   describe('when expecting Boolean', function() {
     it('passes for a boolean', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(true, Boolean);
+      const result = matcher.compare(true, Boolean);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of Boolean not to be an instance of Boolean'
@@ -70,8 +70,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('fails for a non-boolean', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare('false', Boolean);
+      const result = matcher.compare('false', Boolean);
       expect(result).toEqual({
         pass: false,
         message: 'Expected instance of String to be an instance of Boolean'
@@ -81,8 +81,8 @@ describe('toBeInstanceOf', function() {
 
   describe('when expecting RegExp', function() {
     it('passes for a literal regular expression', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(/foo/, RegExp);
+      const result = matcher.compare(/foo/, RegExp);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of RegExp not to be an instance of RegExp'
@@ -92,10 +92,10 @@ describe('toBeInstanceOf', function() {
 
   describe('when expecting Function', function() {
     it('passes for a function', function() {
-      var fn = function() {};
+      const fn = function() {};
 
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(fn, Function);
+      const result = matcher.compare(fn, Function);
       expect(result).toEqual({
         pass: true,
         message:
@@ -104,10 +104,12 @@ describe('toBeInstanceOf', function() {
     });
 
     it('passes for an async function', function() {
-      var fn = eval("(async function fn() { return 'foo'; })");
+      async function fn() {
+        return 'foo';
+      }
 
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(fn, Function);
+      const result = matcher.compare(fn, Function);
       expect(result).toEqual({
         pass: true,
         message:
@@ -120,8 +122,8 @@ describe('toBeInstanceOf', function() {
     function Animal() {}
 
     it('passes for any object', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare({ foo: 'bar' }, Object);
+      const result = matcher.compare({ foo: 'bar' }, Object);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of Object not to be an instance of Object'
@@ -129,8 +131,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('passes for an Error object', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(new Error('example'), Object);
+      const result = matcher.compare(new Error('example'), Object);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of Error not to be an instance of Object'
@@ -138,8 +140,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('passes for a user-defined class', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(new Animal(), Object);
+      const result = matcher.compare(new Animal(), Object);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of Animal not to be an instance of Object'
@@ -147,8 +149,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('fails for a non-object', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare('foo', Object);
+      const result = matcher.compare('foo', Object);
       expect(result).toEqual({
         pass: false,
         message: 'Expected instance of String to be an instance of Object'
@@ -156,12 +158,12 @@ describe('toBeInstanceOf', function() {
     });
 
     it('passes for objects with no constructor', function() {
-      var object = Object.create(null);
+      const object = Object.create(null);
 
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf({
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf({
         pp: jasmineUnderTest.makePrettyPrinter()
       });
-      var result = matcher.compare(object, Object);
+      const result = matcher.compare(object, Object);
       expect(result).toEqual({
         pass: true,
         message:
@@ -188,8 +190,8 @@ describe('toBeInstanceOf', function() {
     Cat.prototype.constructor = Cat;
 
     it('passes for instances of that class', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(new Animal(), Animal);
+      const result = matcher.compare(new Animal(), Animal);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of Animal not to be an instance of Animal'
@@ -197,8 +199,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('passes for instances of a subclass', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(new Cat(), Animal);
+      const result = matcher.compare(new Cat(), Animal);
       expect(result).toEqual({
         pass: true,
         message: 'Expected instance of Cat not to be an instance of Animal'
@@ -206,8 +208,8 @@ describe('toBeInstanceOf', function() {
     });
 
     it('does not pass for sibling classes', function() {
-      var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+      const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
-      var result = matcher.compare(new Dog(), Cat);
+      const result = matcher.compare(new Dog(), Cat);
       expect(result).toEqual({
         pass: false,
         message: 'Expected instance of Dog to be an instance of Cat'
@@ -216,7 +218,7 @@ describe('toBeInstanceOf', function() {
   });
 
   it('raises an error if passed an invalid expected value', function() {
-    var matcher = jasmineUnderTest.matchers.toBeInstanceOf();
+    const matcher = jasmineUnderTest.matchers.toBeInstanceOf();
     expect(function() {
       matcher.compare({}, 'Error');
     }).toThrowError(
@@ -226,7 +228,7 @@ describe('toBeInstanceOf', function() {
   });
 
   it('raises an error if missing an expected value', function() {
-    var matcher = jasmineUnderTest.matchers.toBeInstanceOf({
+    const matcher = jasmineUnderTest.matchers.toBeInstanceOf({
       pp: jasmineUnderTest.makePrettyPrinter()
     });
     expect(function() {

spec/core/matchers/toBeLessThanOrEqualSpec.js

@@ -1,7 +1,7 @@
 describe('toBeLessThanOrEqual', function() {
   it('passes when actual <= expected', function() {
-    var matcher = jasmineUnderTest.matchers.toBeLessThanOrEqual(),
+    const matcher = jasmineUnderTest.matchers.toBeLessThanOrEqual();
-      result;
+    let result;
 
     result = matcher.compare(1, 2);
     expect(result.pass).toBe(true);
@@ -17,8 +17,8 @@ describe('toBeLessThanOrEqual', function() {
   });
 
   it('fails when actual < expected', function() {
-    var matcher = jasmineUnderTest.matchers.toBeLessThanOrEqual(),
+    const matcher = jasmineUnderTest.matchers.toBeLessThanOrEqual();
-      result;
+    let result;
 
     result = matcher.compare(2, 1);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeLessThanSpec.js

@@ -1,15 +1,13 @@
 describe('toBeLessThan', function() {
   it('passes when actual < expected', function() {
-    var matcher = jasmineUnderTest.matchers.toBeLessThan(),
+    const matcher = jasmineUnderTest.matchers.toBeLessThan();
-      result;
+    const result = matcher.compare(1, 2);
-
-    result = matcher.compare(1, 2);
     expect(result.pass).toBe(true);
   });
 
   it('fails when actual <= expected', function() {
-    var matcher = jasmineUnderTest.matchers.toBeLessThan(),
+    const matcher = jasmineUnderTest.matchers.toBeLessThan();
-      result;
+    let result;
 
     result = matcher.compare(1, 1);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeNaNSpec.js

@@ -1,16 +1,14 @@
 describe('toBeNaN', function() {
   it('passes for NaN with a custom .not fail', function() {
-    var matcher = jasmineUnderTest.matchers.toBeNaN(),
+    const matcher = jasmineUnderTest.matchers.toBeNaN();
-      result;
+    const result = matcher.compare(Number.NaN);
-
-    result = matcher.compare(Number.NaN);
     expect(result.pass).toBe(true);
     expect(result.message).toEqual('Expected actual not to be NaN.');
   });
 
   it('fails for anything not a NaN', function() {
-    var matcher = jasmineUnderTest.matchers.toBeNaN(),
+    const matcher = jasmineUnderTest.matchers.toBeNaN();
-      result;
+    let result;
 
     result = matcher.compare(1);
     expect(result.pass).toBe(false);
@@ -29,7 +27,7 @@ describe('toBeNaN', function() {
   });
 
   it('has a custom message on failure', function() {
-    var matcher = jasmineUnderTest.matchers.toBeNaN({
+    const matcher = jasmineUnderTest.matchers.toBeNaN({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       result = matcher.compare(0);

spec/core/matchers/toBeNegativeInfinitySpec.js

@@ -1,7 +1,7 @@
 describe('toBeNegativeInfinity', function() {
   it("fails for anything that isn't -Infinity", function() {
-    var matcher = jasmineUnderTest.matchers.toBeNegativeInfinity(),
+    const matcher = jasmineUnderTest.matchers.toBeNegativeInfinity();
-      result;
+    let result;
 
     result = matcher.compare(1);
     expect(result.pass).toBe(false);
@@ -14,7 +14,7 @@ describe('toBeNegativeInfinity', function() {
   });
 
   it('has a custom message on failure', function() {
-    var matcher = jasmineUnderTest.matchers.toBeNegativeInfinity({
+    const matcher = jasmineUnderTest.matchers.toBeNegativeInfinity({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       result = matcher.compare(0);
@@ -23,7 +23,7 @@ describe('toBeNegativeInfinity', function() {
   });
 
   it('succeeds for -Infinity', function() {
-    var matcher = jasmineUnderTest.matchers.toBeNegativeInfinity(),
+    const matcher = jasmineUnderTest.matchers.toBeNegativeInfinity(),
       result = matcher.compare(Number.NEGATIVE_INFINITY);
 
     expect(result.pass).toBe(true);

spec/core/matchers/toBeNullSpec.js

@@ -1,17 +1,13 @@
 describe('toBeNull', function() {
   it('passes for null', function() {
-    var matcher = jasmineUnderTest.matchers.toBeNull(),
+    const matcher = jasmineUnderTest.matchers.toBeNull();
-      result;
+    const result = matcher.compare(null);
-
-    result = matcher.compare(null);
     expect(result.pass).toBe(true);
   });
 
   it('fails for non-null', function() {
-    var matcher = jasmineUnderTest.matchers.toBeNull(),
+    const matcher = jasmineUnderTest.matchers.toBeNull();
-      result;
+    const result = matcher.compare('foo');
-
-    result = matcher.compare('foo');
     expect(result.pass).toBe(false);
   });
 });

spec/core/matchers/toBePositiveInfinitySpec.js

@@ -1,7 +1,7 @@
 describe('toBePositiveInfinity', function() {
   it("fails for anything that isn't Infinity", function() {
-    var matcher = jasmineUnderTest.matchers.toBePositiveInfinity(),
+    const matcher = jasmineUnderTest.matchers.toBePositiveInfinity();
-      result;
+    let result;
 
     result = matcher.compare(1);
     expect(result.pass).toBe(false);
@@ -14,7 +14,7 @@ describe('toBePositiveInfinity', function() {
   });
 
   it('has a custom message on failure', function() {
-    var matcher = jasmineUnderTest.matchers.toBePositiveInfinity({
+    const matcher = jasmineUnderTest.matchers.toBePositiveInfinity({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       result = matcher.compare(0);
@@ -23,7 +23,7 @@ describe('toBePositiveInfinity', function() {
   });
 
   it('succeeds for Infinity', function() {
-    var matcher = jasmineUnderTest.matchers.toBePositiveInfinity(),
+    const matcher = jasmineUnderTest.matchers.toBePositiveInfinity(),
       result = matcher.compare(Number.POSITIVE_INFINITY);
 
     expect(result.pass).toBe(true);

spec/core/matchers/toBeSpec.js

@@ -1,22 +1,19 @@
 describe('toBe', function() {
   it('passes with no message when actual === expected', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.matchers.toBe(matchersUtil),
-      result;
+      result = matcher.compare(1, 1);
-
-    result = matcher.compare(1, 1);
     expect(result.pass).toBe(true);
   });
 
   it('passes with a custom message when expected is an array', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.matchers.toBe(matchersUtil),
-      result,
       array = [1];
 
-    result = matcher.compare(array, array);
+    const result = matcher.compare(array, array);
     expect(result.pass).toBe(true);
     expect(result.message).toBe(
       'Expected [ 1 ] not to be [ 1 ]. Tip: To check for deep equality, use .toEqual() instead of .toBe().'
@@ -24,14 +21,13 @@ describe('toBe', function() {
   });
 
   it('passes with a custom message when expected is an object', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.matchers.toBe(matchersUtil),
-      result,
       obj = { foo: 'bar' };
 
-    result = matcher.compare(obj, obj);
+    const result = matcher.compare(obj, obj);
     expect(result.pass).toBe(true);
     expect(result.message).toBe(
       "Expected Object({ foo: 'bar' }) not to be Object({ foo: 'bar' }). Tip: To check for deep equality, use .toEqual() instead of .toBe()."
@@ -39,23 +35,20 @@ describe('toBe', function() {
   });
 
   it('fails with no message when actual !== expected', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil(),
+    const matchersUtil = new jasmineUnderTest.MatchersUtil(),
       matcher = jasmineUnderTest.matchers.toBe(matchersUtil),
-      result;
+      result = matcher.compare(1, 2);
-
-    result = matcher.compare(1, 2);
     expect(result.pass).toBe(false);
     expect(result.message).toBeUndefined();
   });
 
   it('fails with a custom message when expected is an array', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.matchers.toBe(matchersUtil),
-      result;
+      result = matcher.compare([1], [1]);
 
-    result = matcher.compare([1], [1]);
     expect(result.pass).toBe(false);
     expect(result.message).toBe(
       'Expected [ 1 ] to be [ 1 ]. Tip: To check for deep equality, use .toEqual() instead of .toBe().'
@@ -63,13 +56,12 @@ describe('toBe', function() {
   });
 
   it('fails with a custom message when expected is an object', function() {
-    var matchersUtil = new jasmineUnderTest.MatchersUtil({
+    const matchersUtil = new jasmineUnderTest.MatchersUtil({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       matcher = jasmineUnderTest.matchers.toBe(matchersUtil),
-      result;
+      result = matcher.compare({ foo: 'bar' }, { foo: 'bar' });
 
-    result = matcher.compare({ foo: 'bar' }, { foo: 'bar' });
     expect(result.pass).toBe(false);
     expect(result.message).toBe(
       "Expected Object({ foo: 'bar' }) to be Object({ foo: 'bar' }). Tip: To check for deep equality, use .toEqual() instead of .toBe()."
@@ -77,15 +69,14 @@ describe('toBe', function() {
   });
 
   it('works with custom object formatters when expected is an object', function() {
-    var formatter = function(x) {
+    const formatter = function(x) {
         return '<' + x.foo + '>';
       },
       prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]),
       matchersUtil = new jasmineUnderTest.MatchersUtil({ pp: prettyPrinter }),
       matcher = jasmineUnderTest.matchers.toBe(matchersUtil),
-      result;
+      result = matcher.compare({ foo: 'bar' }, { foo: 'bar' });
 
-    result = matcher.compare({ foo: 'bar' }, { foo: 'bar' });
     expect(result.pass).toBe(false);
     expect(result.message).toBe(
       'Expected <bar> to be <bar>. Tip: To check for deep equality, use .toEqual() instead of .toBe().'

spec/core/matchers/toBeTrueSpec.js

@@ -1,17 +1,13 @@
 describe('toBeTrue', function() {
   it('passes for true', function() {
-    var matcher = jasmineUnderTest.matchers.toBeTrue(),
+    const matcher = jasmineUnderTest.matchers.toBeTrue();
-      result;
+    const result = matcher.compare(true);
-
-    result = matcher.compare(true);
     expect(result.pass).toBe(true);
   });
 
   it('fails for non-true', function() {
-    var matcher = jasmineUnderTest.matchers.toBeTrue(),
+    const matcher = jasmineUnderTest.matchers.toBeTrue();
-      result;
+    const result = matcher.compare('foo');
-
-    result = matcher.compare('foo');
     expect(result.pass).toBe(false);
   });
 });

spec/core/matchers/toBeTruthySpec.js

@@ -1,7 +1,7 @@
 describe('toBeTruthy', function() {
   it("passes for 'truthy' values", function() {
-    var matcher = jasmineUnderTest.matchers.toBeTruthy(),
+    const matcher = jasmineUnderTest.matchers.toBeTruthy();
-      result;
+    let result;
 
     result = matcher.compare(true);
     expect(result.pass).toBe(true);
@@ -23,8 +23,8 @@ describe('toBeTruthy', function() {
   });
 
   it("fails for 'falsy' values", function() {
-    var matcher = jasmineUnderTest.matchers.toBeTruthy(),
+    const matcher = jasmineUnderTest.matchers.toBeTruthy();
-      result;
+    let result;
 
     result = matcher.compare(false);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeUndefinedSpec.js

@@ -1,17 +1,13 @@
 describe('toBeUndefined', function() {
   it('passes for undefined values', function() {
-    var matcher = jasmineUnderTest.matchers.toBeUndefined(),
+    const matcher = jasmineUnderTest.matchers.toBeUndefined();
-      result;
+    const result = matcher.compare(void 0);
-
-    result = matcher.compare(void 0);
     expect(result.pass).toBe(true);
   });
 
   it('fails when matching defined values', function() {
-    var matcher = jasmineUnderTest.matchers.toBeUndefined(),
+    const matcher = jasmineUnderTest.matchers.toBeUndefined();
-      result;
+    const result = matcher.compare('foo');
-
-    result = matcher.compare('foo');
     expect(result.pass).toBe(false);
   });
 });

spec/core/matchers/toContainSpec.js

@@ -1,27 +1,25 @@
 describe('toContain', function() {
   it('delegates to jasmineUnderTest.matchersUtil.contains', function() {
-    var matchersUtil = {
+    const matchersUtil = {
         contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
       },
-      matcher = jasmineUnderTest.matchers.toContain(matchersUtil),
+      matcher = jasmineUnderTest.matchers.toContain(matchersUtil);
-      result;
 
-    result = matcher.compare('ABC', 'B');
+    const result = matcher.compare('ABC', 'B');
     expect(matchersUtil.contains).toHaveBeenCalledWith('ABC', 'B');
     expect(result.pass).toBe(true);
   });
 
   it('works with custom equality testers', function() {
-    var tester = function(a, b) {
+    const tester = function(a, b) {
         return a.toString() === b.toString();
       },
       matchersUtil = new jasmineUnderTest.MatchersUtil({
         customTesters: [tester]
       }),
-      matcher = jasmineUnderTest.matchers.toContain(matchersUtil),
+      matcher = jasmineUnderTest.matchers.toContain(matchersUtil);
-      result;
 
-    result = matcher.compare(['1', '2'], 2);
+    const result = matcher.compare(['1', '2'], 2);
     expect(result.pass).toBe(true);
   });
 });

spec/core/matchers/toHaveBeenCalledBeforeSpec.js

@@ -1,6 +1,6 @@
 describe('toHaveBeenCalledBefore', function() {
   it('throws an exception when the actual is not a spy', function() {
-    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore({
+    const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       fn = function() {},
@@ -12,7 +12,7 @@ describe('toHaveBeenCalledBefore', function() {
   });
 
   it('throws an exception when the expected is not a spy', function() {
-    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore({
+    const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore({
         pp: jasmineUnderTest.makePrettyPrinter()
       }),
       spy = new jasmineUnderTest.Env().createSpy('a spy'),
@@ -24,7 +24,7 @@ describe('toHaveBeenCalledBefore', function() {
   });
 
   it('fails when the actual was not called', function() {
-    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
+    const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
       firstSpy = new jasmineUnderTest.Spy('first spy'),
       secondSpy = new jasmineUnderTest.Spy('second spy');
 
@@ -38,7 +38,7 @@ describe('toHaveBeenCalledBefore', function() {
   });
 
   it('fails when the expected was not called', function() {
-    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
+    const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
       firstSpy = new jasmineUnderTest.Spy('first spy'),
       secondSpy = new jasmineUnderTest.Spy('second spy');
 
@@ -52,15 +52,14 @@ describe('toHaveBeenCalledBefore', function() {
   });
 
   it('fails when the actual is called after the expected', function() {
-    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
+    const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
       firstSpy = new jasmineUnderTest.Spy('first spy'),
-      secondSpy = new jasmineUnderTest.Spy('second spy'),
+      secondSpy = new jasmineUnderTest.Spy('second spy');
-      result;
 
     secondSpy();
     firstSpy();
 
-    result = matcher.compare(firstSpy, secondSpy);
+    const result = matcher.compare(firstSpy, secondSpy);
     expect(result.pass).toBe(false);
     expect(result.message).toEqual(
       'Expected spy first spy to have been called before spy second spy'
@@ -68,16 +67,15 @@ describe('toHaveBeenCalledBefore', function() {
   });
 
   it('fails when the actual is called before and after the expected', function() {
-    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
+    const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
       firstSpy = new jasmineUnderTest.Spy('first spy'),
-      secondSpy = new jasmineUnderTest.Spy('second spy'),
+      secondSpy = new jasmineUnderTest.Spy('second spy');
-      result;
 
     firstSpy();
     secondSpy();
     firstSpy();
 
-    result = matcher.compare(firstSpy, secondSpy);
+    const result = matcher.compare(firstSpy, secondSpy);
     expect(result.pass).toBe(false);
     expect(result.message).toEqual(
       'Expected latest call to spy first spy to have been called before first call to spy second spy (no interleaved calls)'
@@ -85,16 +83,15 @@ describe('toHaveBeenCalledBefore', function() {
   });
 
   it('fails when the expected is called before and after the actual', function() {
-    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
+    const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
       firstSpy = new jasmineUnderTest.Spy('first spy'),
-      secondSpy = new jasmineUnderTest.Spy('second spy'),
+      secondSpy = new jasmineUnderTest.Spy('second spy');
-      result;
 
     secondSpy();
     firstSpy();
     secondSpy();
 
-    result = matcher.compare(firstSpy, secondSpy);
+    const result = matcher.compare(firstSpy, secondSpy);
     expect(result.pass).toBe(false);
     expect(result.message).toEqual(
       'Expected first call to spy second spy to have been called after latest call to spy first spy (no interleaved calls)'
@@ -102,15 +99,14 @@ describe('toHaveBeenCalledBefore', function() {
   });
 
   it('passes when the actual is called before the expected', function() {
-    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
+    const matcher = jasmineUnderTest.matchers.toHaveBeenCalledBefore(),
       firstSpy = new jasmineUnderTest.Spy('first spy'),
-      secondSpy = new jasmineUnderTest.Spy('second spy'),
+      secondSpy = new jasmineUnderTest.Spy('second spy');
-      result;
 
     firstSpy();
     secondSpy();
 
-    result = matcher.compare(firstSpy, secondSpy);
+    const result = matcher.compare(firstSpy, secondSpy);
     expect(result.pass).toBe(true);
     expect(result.message).toEqual(
       'Expected spy first spy to not have been called before spy second spy, but it was'

spec/core/matchers/toHaveBeenCalledOnceWithSpec.js

@@ -1,13 +1,12 @@
 describe('toHaveBeenCalledOnceWith', function() {
   it('passes when the actual was called only once and with matching parameters', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter(),
+    const pp = jasmineUnderTest.makePrettyPrinter(),
       util = new jasmineUnderTest.MatchersUtil({ pp: pp }),
       matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util),
-      calledSpy = new jasmineUnderTest.Spy('called-spy'),
+      calledSpy = new jasmineUnderTest.Spy('called-spy');
-      result;
 
     calledSpy('a', 'b');
-    result = matcher.compare(calledSpy, 'a', 'b');
+    const result = matcher.compare(calledSpy, 'a', 'b');
 
     expect(result.pass).toBe(true);
     expect(result.message).toEqual(
@@ -16,7 +15,7 @@ describe('toHaveBeenCalledOnceWith', function() {
   });
 
   it('supports custom equality testers', function() {
-    var customEqualityTesters = [
+    const customEqualityTesters = [
         function() {
           return true;
         }
@@ -27,23 +26,21 @@ describe('toHaveBeenCalledOnceWith', function() {
       matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(
         matchersUtil
       ),
-      calledSpy = new jasmineUnderTest.Spy('called-spy'),
+      calledSpy = new jasmineUnderTest.Spy('called-spy');
-      result;
 
     calledSpy('a', 'b');
-    result = matcher.compare(calledSpy, 'a', 'a');
+    const result = matcher.compare(calledSpy, 'a', 'a');
 
     expect(result.pass).toBe(true);
   });
 
   it('fails when the actual was never called', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter(),
+    const pp = jasmineUnderTest.makePrettyPrinter(),
       util = new jasmineUnderTest.MatchersUtil({ pp: pp }),
       matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util),
-      calledSpy = new jasmineUnderTest.Spy('called-spy'),
+      calledSpy = new jasmineUnderTest.Spy('called-spy');
-      result;
 
-    result = matcher.compare(calledSpy, 'a', 'b');
+    const result = matcher.compare(calledSpy, 'a', 'b');
 
     expect(result.pass).toBe(false);
     expect(result.message).toEqual(
@@ -52,14 +49,13 @@ describe('toHaveBeenCalledOnceWith', function() {
   });
 
   it('fails when the actual was called once with different parameters', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter(),
+    const pp = jasmineUnderTest.makePrettyPrinter(),
       util = new jasmineUnderTest.MatchersUtil({ pp: pp }),
       matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util),
-      calledSpy = new jasmineUnderTest.Spy('called-spy'),
+      calledSpy = new jasmineUnderTest.Spy('called-spy');
-      result;
 
     calledSpy('a', 'c');
-    result = matcher.compare(calledSpy, 'a', 'b');
+    const result = matcher.compare(calledSpy, 'a', 'b');
 
     expect(result.pass).toBe(false);
     expect(result.message).toEqual(
@@ -68,15 +64,14 @@ describe('toHaveBeenCalledOnceWith', function() {
   });
 
   it('fails when the actual was called multiple times with expected parameters', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter(),
+    const pp = jasmineUnderTest.makePrettyPrinter(),
       util = new jasmineUnderTest.MatchersUtil({ pp: pp }),
       matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util),
-      calledSpy = new jasmineUnderTest.Spy('called-spy'),
+      calledSpy = new jasmineUnderTest.Spy('called-spy');
-      result;
 
     calledSpy('a', 'b');
     calledSpy('a', 'b');
-    result = matcher.compare(calledSpy, 'a', 'b');
+    const result = matcher.compare(calledSpy, 'a', 'b');
 
     expect(result.pass).toBe(false);
     expect(result.message).toEqual(
@@ -85,15 +80,14 @@ describe('toHaveBeenCalledOnceWith', function() {
   });
 
   it('fails when the actual was called multiple times (one of them - with expected parameters)', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter(),
+    const pp = jasmineUnderTest.makePrettyPrinter(),
       util = new jasmineUnderTest.MatchersUtil({ pp: pp }),
       matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util),
-      calledSpy = new jasmineUnderTest.Spy('called-spy'),
+      calledSpy = new jasmineUnderTest.Spy('called-spy');
-      result;
 
     calledSpy('a', 'b');
     calledSpy('a', 'c');
-    result = matcher.compare(calledSpy, 'a', 'b');
+    const result = matcher.compare(calledSpy, 'a', 'b');
 
     expect(result.pass).toBe(false);
     expect(result.message).toEqual(
@@ -102,7 +96,7 @@ describe('toHaveBeenCalledOnceWith', function() {
   });
 
   it('throws an exception when the actual is not a spy', function() {
-    var pp = jasmineUnderTest.makePrettyPrinter(),
+    const pp = jasmineUnderTest.makePrettyPrinter(),
       util = new jasmineUnderTest.MatchersUtil({ pp: pp }),
       matcher = jasmineUnderTest.matchers.toHaveBeenCalledOnceWith(util),
       fn = function() {};