bump version to 2.6.3

Make sure the queue runner goes async for async specs
- Even if `done` is called synchronously. See #1327 #1334 jasmine/gulp-jasmine-browser#48 This is a backport of 578f63b9bd to 2.6.x.
2017-06-07 13:41:22 -07:00 · 2017-06-06 15:49:37 -07:00
41 changed files with 265 additions and 1475 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,44 +1,17 @@
-## Are you creating an issue in the correct repository?
+### Are you creating an issue in the correct repository?

 - When in doubt, create an issue here.
 - If you have an issue with the Jasmine docs, file an issue in the docs repo
  here: https://github.com/jasmine/jasmine.github.io
 - This repository is for the core Jasmine framework
- If you are using a test runner that wraps Jasmine, consider filing an issue with that library if appropriate:
-  - [Jasmine npm](https://github.com/jasmine/jasmine-npm/issues)
-  - [Jasmine gem](https://github.com/jasmine/jasmine-gem/issues)
-  - [Jasmine py](https://github.com/jasmine/jasmine-py/issues)
-  - [Gulp Jasmine Browser](https://github.com/jasmine/gulp-jasmine-browser/issues)
-  - [Karma](https://github.com/karma-runner/karma/issues)
-  - [Grunt Contrib Jasmine](https://github.com/gruntjs/grunt-contrib-jasmine/issues)
+- If you are using a test runner that wraps Jasmine (Jasmine npm, karma, etc),
+  consider filing an issue with that library if appropriate

-<!--- Provide a general summary of the issue in the Title above -->
+### When submitting an issue, please answer the following:

-## Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
+ - What version are you using?
+ - What environment are you running Jasmine in (node, browser, etc)?
+ - How are you running Jasmine (standalone, npm, karma, etc)?
+ - If possible, include an example spec that demonstrates your issue.

-## Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Suite that reproduces the behavior (for bugs)
-<!--- Provide a sample suite that reproduces the bug. -->
-```javascript
-describe("sample", function() {
-});
-```
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
-* Environment name and version (e.g. Chrome 39, node.js 5.4):
-* Operating System and version (desktop or mobile):
-* Link to your project:
+ Thanks for using Jasmine!
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,30 +0,0 @@
-<!--- Provide a general summary of your changes in the Title above -->
-
-## Description
-<!--- Describe your changes in detail -->
-
-## Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
-
-## Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
-
--- a/README.md
+++ b/README.md
@@ -43,12 +43,12 @@ To install Jasmine standalone on your local box (where **_{#.#.#}_** below is su
 Add the following to your HTML file:

 ```html
-<link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-{#.#.#}/jasmine_favicon.png">
-<link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-{#.#.#}/jasmine.css">
+<link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-core/jasmine_favicon.png">
+<link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-core/jasmine.css">

-<script type="text/javascript" src="jasmine/lib/jasmine-{#.#.#}/jasmine.js"></script>
-<script type="text/javascript" src="jasmine/lib/jasmine-{#.#.#}/jasmine-html.js"></script>
-<script type="text/javascript" src="jasmine/lib/jasmine-{#.#.#}/boot.js"></script>
+<script type="text/javascript" src="jasmine/lib/jasmine-core/jasmine.js"></script>
+<script type="text/javascript" src="jasmine/lib/jasmine-core/jasmine-html.js"></script>
+<script type="text/javascript" src="jasmine/lib/jasmine-core/boot.js"></script>
 ```

 ## Supported environments
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -40,10 +40,7 @@ When ready to release - specs are all green and the stories are done:

 ### Release the Python egg

-Install [twine](https://github.com/pypa/twine)
-
-1. `python setup.py sdist`
-1. `twine upload dist/jasmine-core-<version>.tar.gz` You will need pypi credentials to upload the egg.
+1. `python setup.py register sdist upload` You will need pypi credentials to upload the egg.

 ### Release the Ruby gem

--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "jasmine-core",
-  "homepage": "https://jasmine.github.io",
+  "homepage": "http://jasmine.github.io",
  "authors": [
    "slackersoft <gregg@slackersoft.net>"
  ],
--- a/lib/jasmine-core/jasmine-html.js
+++ b/lib/jasmine-core/jasmine-html.js
@@ -210,7 +210,7 @@ jasmineRequire.HtmlReporter = function(j$) {

      if (specsExecuted < totalSpecsDefined) {
        var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
-        var skippedLink = addToExistingQueryString('spec', '');
+        var skippedLink = order && order.random ? '?random=true' : '?';
        alert.appendChild(
          createDom('span', {className: 'jasmine-bar jasmine-skipped'},
            createDom('a', {href: skippedLink, title: 'Run all specs'}, skippedMessage)
--- a/lib/jasmine-core/jasmine.js
+++ b/lib/jasmine-core/jasmine.js
@@ -71,7 +71,6 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
    j$.SpyRegistry = jRequire.SpyRegistry(j$);
    j$.SpyStrategy = jRequire.SpyStrategy(j$);
    j$.StringMatching = jRequire.StringMatching(j$);
-    j$.UserContext = jRequire.UserContext(j$);
    j$.Suite = jRequire.Suite(j$);
    j$.Timer = jRequire.Timer();
    j$.TreeProcessor = jRequire.TreeProcessor();
@@ -139,7 +138,6 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
  j$.MAX_PRETTY_PRINT_DEPTH = 40;
  /**
   * Maximum number of array elements to display when pretty printing objects.
-   * This will also limit the number of keys and values displayed for an object.
   * Elements past this number will be ellipised.
   * @name jasmine.MAX_PRETTY_PRINT_ARRAY_LENGTH
   */
@@ -187,10 +185,6 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
    return j$.isA_('Function', value);
  };

-  j$.isAsyncFunction_ = function(value) {
-    return j$.isA_('AsyncFunction', value);
-  };
-
  j$.isA_ = function(typeName, value) {
    return j$.getType_(value) === '[object ' + typeName + ']';
  };
@@ -468,25 +462,20 @@ getJasmineRequireObj().Spec = function(j$) {

    this.onStart(this);

-    var fns = this.beforeAndAfterFns();
-    var regularFns = fns.befores.concat(this.queueableFn);
+    if (!this.isExecutable() || this.markedPending || enabled === false) {
+      complete(enabled);
+      return;
+    }

-    var runnerConfig = {
-      isLeaf: true,
-      queueableFns: regularFns,
-      cleanupFns: fns.afters,
+    var fns = this.beforeAndAfterFns();
+    var allFns = fns.befores.concat(this.queueableFn).concat(fns.afters);
+
+    this.queueRunnerFactory({
+      queueableFns: allFns,
      onException: function() { self.onException.apply(self, arguments); },
      onComplete: complete,
      userContext: this.userContext()
-    };
-
-    if (!this.isExecutable() || this.markedPending || enabled === false) {
-      runnerConfig.queueableFns = [];
-      runnerConfig.cleanupFns = [];
-      runnerConfig.onComplete = function() { complete(enabled); };
-    }
-
-    this.queueRunnerFactory(runnerConfig);
+    });

    function complete(enabledAgain) {
      self.result.status = self.status(enabledAgain);
@@ -823,7 +812,6 @@ getJasmineRequireObj().Env = function(j$) {
      options.timeout = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
      options.fail = self.fail;
      options.globalErrors = globalErrors;
-      options.completeOnFirstError = throwOnExpectationFailure && options.isLeaf;

      new j$.QueueRunner(options).execute();
    };
@@ -886,8 +874,7 @@ getJasmineRequireObj().Env = function(j$) {
      }

      reporter.jasmineStarted({
-        totalSpecsDefined: totalSpecsDefined,
-        order: order
+        totalSpecsDefined: totalSpecsDefined
      });

      currentlyExecutingSuites.push(topSuite);
@@ -948,12 +935,6 @@ getJasmineRequireObj().Env = function(j$) {
      }
    };

-    var ensureIsFunctionOrAsync = function(fn, caller) {
-      if (!j$.isFunction_(fn) && !j$.isAsyncFunction_(fn)) {
-        throw new Error(caller + ' expects a function argument; received ' + j$.getType_(fn));
-      }
-    };
-
    var suiteFactory = function(description) {
      var suite = new j$.Suite({
        env: self,
@@ -1092,7 +1073,7 @@ getJasmineRequireObj().Env = function(j$) {
      // it() sometimes doesn't have a fn argument, so only check the type if
      // it's given.
      if (arguments.length > 1 && typeof fn !== 'undefined') {
-        ensureIsFunctionOrAsync(fn, 'it');
+        ensureIsFunction(fn, 'it');
      }
      var spec = specFactory(description, fn, currentDeclarationSuite, timeout);
      if (currentDeclarationSuite.markedPending) {
@@ -1106,7 +1087,7 @@ getJasmineRequireObj().Env = function(j$) {
      // xit(), like it(), doesn't always have a fn argument, so only check the
      // type when needed.
      if (arguments.length > 1 && typeof fn !== 'undefined') {
-        ensureIsFunctionOrAsync(fn, 'xit');
+        ensureIsFunction(fn, 'xit');
      }
      var spec = this.it.apply(this, arguments);
      spec.pend('Temporarily disabled with xit');
@@ -1114,7 +1095,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.fit = function(description, fn, timeout){
-      ensureIsFunctionOrAsync(fn, 'fit');
+      ensureIsFunction(fn, 'fit');
      var spec = specFactory(description, fn, currentDeclarationSuite, timeout);
      currentDeclarationSuite.addChild(spec);
      focusedRunnables.push(spec.id);
@@ -1131,7 +1112,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.beforeEach = function(beforeEachFunction, timeout) {
-      ensureIsFunctionOrAsync(beforeEachFunction, 'beforeEach');
+      ensureIsFunction(beforeEachFunction, 'beforeEach');
      currentDeclarationSuite.beforeEach({
        fn: beforeEachFunction,
        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
@@ -1139,7 +1120,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.beforeAll = function(beforeAllFunction, timeout) {
-      ensureIsFunctionOrAsync(beforeAllFunction, 'beforeAll');
+      ensureIsFunction(beforeAllFunction, 'beforeAll');
      currentDeclarationSuite.beforeAll({
        fn: beforeAllFunction,
        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
@@ -1147,8 +1128,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.afterEach = function(afterEachFunction, timeout) {
-      ensureIsFunctionOrAsync(afterEachFunction, 'afterEach');
-      afterEachFunction.isCleanup = true;
+      ensureIsFunction(afterEachFunction, 'afterEach');
      currentDeclarationSuite.afterEach({
        fn: afterEachFunction,
        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
@@ -1156,7 +1136,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.afterAll = function(afterAllFunction, timeout) {
-      ensureIsFunctionOrAsync(afterAllFunction, 'afterAll');
+      ensureIsFunction(afterAllFunction, 'afterAll');
      currentDeclarationSuite.afterAll({
        fn: afterAllFunction,
        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
@@ -1197,10 +1177,6 @@ getJasmineRequireObj().Env = function(j$) {
        message: message,
        error: error && error.message ? error : null
      });
-
-      if (self.throwingExpectationFailures()) {
-        throw new Error(message);
-      }
    };
  }

@@ -1624,9 +1600,7 @@ getJasmineRequireObj().CallTracker = function(j$) {
 };

 getJasmineRequireObj().clearStack = function(j$) {
-  var maxInlineCallCount = 10;
-
-  function messageChannelImpl(global, setTimeout) {
+  function messageChannelImpl(global) {
    var channel = new global.MessageChannel(),
        head = {},
        tail = head;
@@ -1649,44 +1623,25 @@ getJasmineRequireObj().clearStack = function(j$) {
      }
    };

-    var currentCallCount = 0;
    return function clearStack(fn) {
-      currentCallCount++;
-
-      if (currentCallCount < maxInlineCallCount) {
-        tail = tail.next = { task: fn };
-        channel.port2.postMessage(0);
-      } else {
-        currentCallCount = 0;
-        setTimeout(fn);
-      }
+      tail = tail.next = { task: fn };
+      channel.port2.postMessage(0);
    };
  }

  function getClearStack(global) {
-    var currentCallCount = 0;
-    var realSetTimeout = global.setTimeout;
-    var setTimeoutImpl = function clearStack(fn) {
-        Function.prototype.apply.apply(realSetTimeout, [global, [fn, 0]]);
-    };
-
    if (j$.isFunction_(global.setImmediate)) {
      var realSetImmediate = global.setImmediate;
      return function(fn) {
-        currentCallCount++;
-
-        if (currentCallCount < maxInlineCallCount) {
-          realSetImmediate(fn);
-        } else {
-          currentCallCount = 0;
-
-          setTimeoutImpl(fn);
-        }
+        realSetImmediate(fn);
      };
    } else if (!j$.util.isUndefined(global.MessageChannel)) {
-      return messageChannelImpl(global, setTimeoutImpl);
+      return messageChannelImpl(global);
    } else {
-      return setTimeoutImpl;
+      var realSetTimeout = global.setTimeout;
+      return function clearStack(fn) {
+        Function.prototype.apply.apply(realSetTimeout, [global, [fn, 0]]);
+      };
    }
  }

@@ -2547,12 +2502,12 @@ getJasmineRequireObj().matchersUtil = function(j$) {
      if (!result) {
        return false;
      }
-    } else if (className == '[object Set]' || className == '[object Map]') {
+    } else if (className == '[object Set]') {
      if (a.size != b.size) {
        diffBuilder.record(a, b);
        return false;
      }
-      var iterA = a.entries(), iterB = b.entries();
+      var iterA = a.values(), iterB = b.values();
      var valA, valB;
      do {
        valA = iterA.next();
@@ -2792,18 +2747,8 @@ getJasmineRequireObj().toBeCloseTo = function() {
          precision = precision || 2;
        }

-        if (expected === null || actual === null) {
-          throw new Error('Cannot use toBeCloseTo with null. Arguments evaluated to: ' +
-            'expect(' + actual + ').toBeCloseTo(' + expected + ').'
-          );
-        }
-
-        var pow = Math.pow(10, precision + 1);
-        var delta = Math.abs(expected - actual);
-        var maxDelta = Math.pow(10, -precision) / 2;
-
        return {
-          pass: Math.round(delta * pow) / pow <= maxDelta
+          pass: Math.abs(expected - actual) < (Math.pow(10, -precision) / 2)
        };
      }
    };
@@ -3684,7 +3629,7 @@ getJasmineRequireObj().pp = function(j$) {
  function hasCustomToString(value) {
    // value.toString !== Object.prototype.toString if value has no custom toString but is from another context (e.g.
    // iframe, web worker)
-    return j$.isFunction_(value.toString) && value.toString !== Object.prototype.toString && (value.toString() !== Object.prototype.toString.call(value));
+    return value.toString !== Object.prototype.toString && (value.toString() !== Object.prototype.toString.call(value));
  }

  PrettyPrinter.prototype.format = function(value) {
@@ -3712,10 +3657,8 @@ getJasmineRequireObj().pp = function(j$) {
        this.emitScalar('HTMLNode');
      } else if (value instanceof Date) {
        this.emitScalar('Date(' + value + ')');
-      } else if (j$.getType_(value) == '[object Set]') {
+      } else if (value.toString && value.toString() == '[object Set]') {
        this.emitSet(value);
-      } else if (j$.getType_(value) == '[object Map]') {
-        this.emitMap(value);
      } else if (value.toString && typeof value === 'object' && !j$.isArray_(value) && hasCustomToString(value)) {
        this.emitScalar(value.toString());
      } else if (j$.util.arrayContains(this.seen, value)) {
@@ -3737,28 +3680,15 @@ getJasmineRequireObj().pp = function(j$) {
  };

  PrettyPrinter.prototype.iterateObject = function(obj, fn) {
-    var objKeys = keys(obj, j$.isArray_(obj));
-    var isGetter = function isGetter(prop) {};
-
-    if (obj.__lookupGetter__) {
-      isGetter = function isGetter(prop) {
-        var getter = obj.__lookupGetter__(prop);
-        return !j$.util.isUndefined(getter) && getter !== null;
-      };
-
+    for (var property in obj) {
+      if (!Object.prototype.hasOwnProperty.call(obj, property)) { continue; }
+      fn(property, obj.__lookupGetter__ ? (!j$.util.isUndefined(obj.__lookupGetter__(property)) &&
+          obj.__lookupGetter__(property) !== null) : false);
    }
-    var length = Math.min(objKeys.length, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH);
-    for (var i = 0; i < length; i++) {
-      var property = objKeys[i];
-      fn(property, isGetter(property));
-    }
-
-    return objKeys.length > length;
  };

  PrettyPrinter.prototype.emitArray = j$.unimplementedMethod_;
  PrettyPrinter.prototype.emitSet = j$.unimplementedMethod_;
-  PrettyPrinter.prototype.emitMap = j$.unimplementedMethod_;
  PrettyPrinter.prototype.emitObject = j$.unimplementedMethod_;
  PrettyPrinter.prototype.emitScalar = j$.unimplementedMethod_;
  PrettyPrinter.prototype.emitString = j$.unimplementedMethod_;
@@ -3766,7 +3696,7 @@ getJasmineRequireObj().pp = function(j$) {
  function StringPrettyPrinter() {
    PrettyPrinter.call(this);

-    this.stringParts = [];
+    this.string = '';
  }

  j$.util.inherit(StringPrettyPrinter, PrettyPrinter);
@@ -3798,7 +3728,11 @@ getJasmineRequireObj().pp = function(j$) {

    var self = this;
    var first = array.length === 0;
-    var truncated = this.iterateObject(array, function(property, isGetter) {
+    this.iterateObject(array, function(property, isGetter) {
+      if (property.match(/^\d+$/)) {
+        return;
+      }
+
      if (first) {
        first = false;
      } else {
@@ -3808,8 +3742,6 @@ getJasmineRequireObj().pp = function(j$) {
      self.formatProperty(array, property, isGetter);
    });

-    if (truncated) { this.append(', ...'); }
-
    this.append(' ]');
  };

@@ -3833,26 +3765,6 @@ getJasmineRequireObj().pp = function(j$) {
    this.append(' )');
  };

-  StringPrettyPrinter.prototype.emitMap = function(map) {
-    if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
-      this.append('Map');
-      return;
-    }
-    this.append('Map( ');
-    var size = Math.min(map.size, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH);
-    var iter = map.entries();
-    for (var i = 0; i < size; i++) {
-      if (i > 0) {
-        this.append(', ');
-      }
-      this.format(iter.next().value);
-    }
-    if (map.size > size){
-      this.append(', ...');
-    }
-    this.append(' )');
-  };
-
  StringPrettyPrinter.prototype.emitObject = function(obj) {
    var ctor = obj.constructor,
        constructorName;
@@ -3871,7 +3783,7 @@ getJasmineRequireObj().pp = function(j$) {
    this.append('({ ');
    var first = true;

-    var truncated = this.iterateObject(obj, function(property, isGetter) {
+    this.iterateObject(obj, function(property, isGetter) {
      if (first) {
        first = false;
      } else {
@@ -3881,8 +3793,6 @@ getJasmineRequireObj().pp = function(j$) {
      self.formatProperty(obj, property, isGetter);
    });

-    if (truncated) { this.append(', ...'); }
-
    this.append(' })');
  };

@@ -3897,42 +3807,13 @@ getJasmineRequireObj().pp = function(j$) {
  };

  StringPrettyPrinter.prototype.append = function(value) {
-    this.stringParts.push(value);
+    this.string += value;
  };

-  function keys(obj, isArray) {
-    var allKeys = Object.keys ? Object.keys(obj) :
-      (function(o) {
-          var keys = [];
-          for (var key in o) {
-              if (j$.util.has(o, key)) {
-                  keys.push(key);
-              }
-          }
-          return keys;
-      })(obj);
-
-    if (!isArray) {
-      return allKeys;
-    }
-
-    if (allKeys.length === 0) {
-        return allKeys;
-    }
-
-    var extraKeys = [];
-    for (var i = 0; i < allKeys.length; i++) {
-      if (!/^[0-9]+$/.test(allKeys[i])) {
-        extraKeys.push(allKeys[i]);
-      }
-    }
-
-    return extraKeys;
-  }
  return function(value) {
    var stringPrettyPrinter = new StringPrettyPrinter();
    stringPrettyPrinter.format(value);
-    return stringPrettyPrinter.stringParts.join('');
+    return stringPrettyPrinter.string;
  };
 };

@@ -3950,18 +3831,15 @@ getJasmineRequireObj().QueueRunner = function(j$) {
  }

  function QueueRunner(attrs) {
-    var queueableFns = attrs.queueableFns || [];
-    this.queueableFns = queueableFns.concat(attrs.cleanupFns || []);
-    this.firstCleanupIx = queueableFns.length;
+    this.queueableFns = attrs.queueableFns || [];
    this.onComplete = attrs.onComplete || function() {};
    this.clearStack = attrs.clearStack || function(fn) {fn();};
    this.onException = attrs.onException || function() {};
    this.catchException = attrs.catchException || function() { return true; };
-    this.userContext = attrs.userContext || new j$.UserContext();
+    this.userContext = attrs.userContext || {};
    this.timeout = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
    this.fail = attrs.fail || function() {};
    this.globalErrors = attrs.globalErrors || { pushListener: function() {}, popListener: function() {} };
-    this.completeOnFirstError = !!attrs.completeOnFirstError;
  }

  QueueRunner.prototype.execute = function() {
@@ -3970,33 +3848,22 @@ getJasmineRequireObj().QueueRunner = function(j$) {
      self.onException(error);
    };
    this.globalErrors.pushListener(this.handleFinalError);
-    this.run(0);
+    this.run(this.queueableFns, 0);
  };

-  QueueRunner.prototype.skipToCleanup = function(lastRanIndex) {
-    if (lastRanIndex < this.firstCleanupIx) {
-      this.run(this.firstCleanupIx);
-    } else {
-      this.run(lastRanIndex + 1);
-    }
-  };
-
-  QueueRunner.prototype.run = function(recursiveIndex) {
-    var length = this.queueableFns.length,
+  QueueRunner.prototype.run = function(queueableFns, recursiveIndex) {
+    var length = queueableFns.length,
      self = this,
      iterativeIndex;


    for(iterativeIndex = recursiveIndex; iterativeIndex < length; iterativeIndex++) {
-      var result = attempt(iterativeIndex);
-
-      if (!result.completedSynchronously) {
-        return;
-      }
-
-      if (this.completeOnFirstError && result.errored) {
-        this.skipToCleanup(iterativeIndex);
+      var queueableFn = queueableFns[iterativeIndex];
+      if (queueableFn.fn.length > 0) {
+        attemptAsync(queueableFn);
        return;
+      } else {
+        attemptSync(queueableFn);
      }
    }

@@ -4005,46 +3872,41 @@ getJasmineRequireObj().QueueRunner = function(j$) {
      self.onComplete();
    });

-    function attempt() {
+    function attemptSync(queueableFn) {
+      try {
+        queueableFn.fn.call(self.userContext);
+      } catch (e) {
+        handleException(e, queueableFn);
+      }
+    }
+
+    function attemptAsync(queueableFn) {
      var clearTimeout = function () {
          Function.prototype.apply.apply(self.timeout.clearTimeout, [j$.getGlobal(), [timeoutId]]);
        },
+        completedSynchronously = true,
        setTimeout = function(delayedFn, delay) {
          return Function.prototype.apply.apply(self.timeout.setTimeout, [j$.getGlobal(), [delayedFn, delay]]);
        },
-        completedSynchronously = true,
        handleError = function(error) {
          onException(error);
          next();
        },
-        cleanup = once(function() {
+        next = once(function () {
          clearTimeout(timeoutId);
          self.globalErrors.popListener(handleError);
-        }),
-        next = once(function () {
-          cleanup();
-
-          function runNext() {
-            if (self.completeOnFirstError && errored) {
-              self.skipToCleanup(iterativeIndex);
-            } else {
-              self.run(iterativeIndex + 1);
-            }
-          }
-
          if (completedSynchronously) {
-            setTimeout(runNext);
+            setTimeout(function() {
+              self.run(queueableFns, iterativeIndex + 1);
+            });
          } else {
-            runNext();
+            self.run(queueableFns, iterativeIndex + 1);
          }
        }),
-        errored = false,
-        queueableFn = self.queueableFns[iterativeIndex],
        timeoutId;

      next.fail = function() {
        self.fail.apply(null, arguments);
-        errored = true;
        next();
      };

@@ -4059,39 +3921,24 @@ getJasmineRequireObj().QueueRunner = function(j$) {
      }

      try {
-        if (queueableFn.fn.length === 0) {
-          var maybeThenable = queueableFn.fn.call(self.userContext);
-
-          if (maybeThenable && j$.isFunction_(maybeThenable.then)) {
-            maybeThenable.then(next, next.fail);
-            completedSynchronously = false;
-            return { completedSynchronously: false };
-          }
-        } else {
-          queueableFn.fn.call(self.userContext, next);
-          completedSynchronously = false;
-          return { completedSynchronously: false };
-        }
+        queueableFn.fn.call(self.userContext, next);
+        completedSynchronously = false;
      } catch (e) {
        handleException(e, queueableFn);
-        errored = true;
+        next();
      }
+    }

-      cleanup();
-      return { completedSynchronously: true, errored: errored };
+    function onException(e) {
+      self.onException(e);
+    }

-      function onException(e) {
-        self.onException(e);
-        errored = true;
-      }
-
-      function handleException(e, queueableFn) {
-        onException(e);
-        if (!self.catchException(e)) {
-          //TODO: set a var when we catch an exception and
-          //use a finally block to close the loop in a nice way..
-          throw e;
-        }
+    function handleException(e, queueableFn) {
+      onException(e);
+      if (!self.catchException(e)) {
+        //TODO: set a var when we catch an exception and
+        //use a finally block to close the loop in a nice way..
+        throw e;
      }
    }
  };
@@ -4821,14 +4668,14 @@ getJasmineRequireObj().Suite = function(j$) {

  Suite.prototype.sharedUserContext = function() {
    if (!this.sharedContext) {
-      this.sharedContext = this.parentSuite ? this.parentSuite.clonedSharedUserContext() : new j$.UserContext();
+      this.sharedContext = this.parentSuite ? clone(this.parentSuite.sharedUserContext()) : {};
    }

    return this.sharedContext;
  };

  Suite.prototype.clonedSharedUserContext = function() {
-    return j$.UserContext.fromExisting(this.sharedUserContext());
+    return clone(this.sharedUserContext());
  };

  Suite.prototype.onException = function() {
@@ -4880,6 +4727,17 @@ getJasmineRequireObj().Suite = function(j$) {
    return !args[0];
  }

+  function clone(obj) {
+    var clonedObj = {};
+    for (var prop in obj) {
+      if (obj.hasOwnProperty(prop)) {
+        clonedObj[prop] = obj[prop];
+      }
+    }
+
+    return clonedObj;
+  }
+
  return Suite;
 };

@@ -5117,25 +4975,6 @@ getJasmineRequireObj().TreeProcessor = function() {
  return TreeProcessor;
 };

-getJasmineRequireObj().UserContext = function(j$) {
-  function UserContext() {
-  }
-
-  UserContext.fromExisting = function(oldContext) {
-    var context = new UserContext();
-
-    for (var prop in oldContext) {
-      if (oldContext.hasOwnProperty(prop)) {
-        context[prop] = oldContext[prop];
-      }
-    }
-
-    return context;
-  };
-
-  return  UserContext;
-};
-
 getJasmineRequireObj().version = function() {
-  return '2.7.0';
+  return '2.6.3';
 };
--- a/lib/jasmine-core/version.rb
+++ b/lib/jasmine-core/version.rb
@@ -4,6 +4,6 @@
 #
 module Jasmine
  module Core
-    VERSION = "2.7.0"
+    VERSION = "2.6.3"
  end
 end
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "jasmine-core",
  "license": "MIT",
-  "version": "2.7.0",
+  "version": "2.6.3",
  "repository": {
    "type": "git",
    "url": "https://github.com/jasmine/jasmine.git"
@@ -19,7 +19,7 @@
  "homepage": "http://jasmine.github.io",
  "main": "./lib/jasmine-core.js",
  "devDependencies": {
-    "glob": "~7.1.2",
+    "glob": "~7.0.5",
    "grunt": "^1.0.1",
    "grunt-cli": "^1.2.0",
    "grunt-contrib-compass": "^1.1.1",
--- a/release_notes/2.6.4.md
+++ b/release_notes/2.6.4.md
@@ -1,17 +0,0 @@
-# Jasmine 2.6.4 Release Notes
-
-## Summary
-
-This is a patch release to fix some regressions and performance problems in the 2.6.0 release
-
-## Changes
-
-* Break into a `setTimeout` every once in a while allowing the CPU to run other things that used the real `setTimeout`
-  - Fixes [#1327](https://github.com/jasmine/jasmine/issues/1327)
-  - See [#1334](https://github.com/jasmine/jasmine/issues/1334)
-  - Fixes [jasmine/gulp-jasmine-browser#48](https://github.com/jasmine/gulp-jasmine-browser/issues/48)
-
-
------
-
-_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_
--- a/release_notes/2.7.0.md
+++ b/release_notes/2.7.0.md
@@ -1,61 +0,0 @@
-# Jasmine 2.7.0 Release Notes
-
-## Summary
-
-This release contains a number of fixes and pull requests.
-
-## Pull Requests & Issues
-
-
-* Add class UserContext
-  - Merges [#1400](https://github.com/jasmine/jasmine/issues/1400) from @darthjee
-
-* Send unfocused tests through the same queue as focused tests
-  - Merges [#1399](https://github.com/jasmine/jasmine/issues/1399) from @jberney
-
-* PrettyPrinter allows an object to have a `toString` that isn't a function
-  - Fixes [#1389](https://github.com/jasmine/jasmine/issues/1389)
-
-* Fix rounding in toBeCloseTo
-  - Fixes [#1382](https://github.com/jasmine/jasmine/issues/1382)
-
-* When stop on failure is enabled, skip subsequent it() and beforeEach(). Note: afterEach() functions are still run, because skipping them is highly likely to pollute specs that run after the failure.
-  - Fixes [#577](https://github.com/jasmine/jasmine/issues/577)
-  - Fixes [#807](https://github.com/jasmine/jasmine/issues/807)
-
-* Only clear out the `spec` param for Run all link
-  - Fixes [#1369](https://github.com/jasmine/jasmine/issues/1369)
-
-* Pretty printer will now use MAX_PRETTY_PRINT_ARRAY_LENGTH for objects
-  - Fixes [#1291](https://github.com/jasmine/jasmine/issues/1291)
-  - Fixes [#1360](https://github.com/jasmine/jasmine/issues/1360)
-
-* updated package glob from 7.0.5 to 7.1.2
-  - Merges [#1368](https://github.com/jasmine/jasmine/issues/1368) from @EsrefDurna
-
-* Fix bower.json url to be https instead of http
-  - Merges [#1365](https://github.com/jasmine/jasmine/issues/1365) from @kant
-
-* Fail when one of the arguments passed into toBeCloseTo matcher is null
-  - Merges [#1362](https://github.com/jasmine/jasmine/issues/1362) from @beatrichartz
-
-* Fixed HTML snippet in README
-  - Closes [#1366](https://github.com/jasmine/jasmine/issues/1366).
-
-* Report the random seed at the beginning and end of execution. This allows reporters to provide the seed to the user even in cases where Jasmine crashes before completing.
-  - Merges [#1348](https://github.com/jasmine/jasmine/issues/1348) from @sgravrock
-
-* Add ES6 map support to Jasmine
-  - Merges [#1340](https://github.com/jasmine/jasmine/issues/1340) from @rmehlinger
-  - Fixes [#1257](https://github.com/jasmine/jasmine/issues/1257)
-
-* Added support for async before/it/after functions that return promises and added support for ES2017 async functions
-  - Merges [#1356](https://github.com/jasmine/jasmine/issues/1356) from @sgravrock
-  - Fixes [#1336](https://github.com/jasmine/jasmine/issues/1336)
-  - Fixes [#1270](https://github.com/jasmine/jasmine/issues/1270)
-  - Fixes [#1350](https://github.com/jasmine/jasmine/issues/1350)
-  - Fixes [#1320](https://github.com/jasmine/jasmine/issues/1320)
-
------
-
-_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_
--- a/spec/core/ClearStackSpec.js
+++ b/spec/core/ClearStackSpec.js
@@ -21,34 +21,6 @@ describe("ClearStack", function() {
    expect(setImmediate).toHaveBeenCalled();
  });

-  it("uses setTimeout instead of setImmediate every 10 calls to make sure we release the CPU", function() {
-    var setImmediate = jasmine.createSpy('setImmediate'),
-        setTimeout = jasmine.createSpy('setTimeout'),
-        global = { setImmediate: setImmediate, setTimeout: setTimeout },
-        clearStack = jasmineUnderTest.getClearStack(global);
-
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-
-    expect(setImmediate).toHaveBeenCalled();
-    expect(setTimeout).not.toHaveBeenCalled();
-
-    clearStack(function() { });
-    expect(setImmediate.calls.count()).toEqual(9);
-    expect(setTimeout.calls.count()).toEqual(1);
-
-    clearStack(function() { });
-    expect(setImmediate.calls.count()).toEqual(10);
-    expect(setTimeout.calls.count()).toEqual(1);
-  });
-
  it("uses MessageChannels when available", function() {
    var fakeChannel = {
          port1: {},
@@ -65,41 +37,6 @@ describe("ClearStack", function() {
    expect(called).toBe(true);
  });

-  it("uses setTimeout instead of MessageChannel every 10 calls to make sure we release the CPU", function() {
-    var fakeChannel = {
-          port1: {},
-          port2: {
-            postMessage: jasmine.createSpy('postMessage').and.callFake(function() {
-              fakeChannel.port1.onmessage();
-            })
-          }
-        },
-        setTimeout = jasmine.createSpy('setTimeout'),
-        global = { MessageChannel: function() { return fakeChannel; }, setTimeout: setTimeout },
-        clearStack = jasmineUnderTest.getClearStack(global);
-
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-    clearStack(function() { });
-
-    expect(fakeChannel.port2.postMessage).toHaveBeenCalled();
-    expect(setTimeout).not.toHaveBeenCalled();
-
-    clearStack(function() { });
-    expect(fakeChannel.port2.postMessage.calls.count()).toEqual(9);
-    expect(setTimeout.calls.count()).toEqual(1);
-
-    clearStack(function() { });
-    expect(fakeChannel.port2.postMessage.calls.count()).toEqual(10);
-    expect(setTimeout.calls.count()).toEqual(1);
-  });
-
  it("calls setTimeout when onmessage is called recursively", function() {
    var fakeChannel = {
          port1: {},
--- a/spec/core/EnvSpec.js
+++ b/spec/core/EnvSpec.js
@@ -91,13 +91,6 @@ describe("Env", function() {
        env.it('pending spec');
      }).not.toThrow();
    });
-
-    it('accepts an async function', function() {
-      jasmine.getEnv().requireAsyncAwait();
-      expect(function() {
-        env.it('async', jasmine.getEnv().makeAsyncAwaitFunction());
-      }).not.toThrow();
-    });
  });

  describe('#xit', function() {
@@ -121,13 +114,6 @@ describe("Env", function() {
        env.xit('pending spec');
      }).not.toThrow();
    });
-
-    it('accepts an async function', function() {
-      jasmine.getEnv().requireAsyncAwait();
-      expect(function() {
-        env.xit('async', jasmine.getEnv().makeAsyncAwaitFunction());
-      }).not.toThrow();
-    });
  });

  describe('#fit', function () {
@@ -144,13 +130,6 @@ describe("Env", function() {
        env.beforeEach(undefined);
      }).toThrowError(/beforeEach expects a function argument; received \[object (Undefined|DOMWindow|Object)\]/);
    });
-
-    it('accepts an async function', function() {
-      jasmine.getEnv().requireAsyncAwait();
-      expect(function() {
-        env.beforeEach(jasmine.getEnv().makeAsyncAwaitFunction());
-      }).not.toThrow();
-    });
  });

  describe('#beforeAll', function () {
@@ -159,13 +138,6 @@ describe("Env", function() {
        env.beforeAll(undefined);
      }).toThrowError(/beforeAll expects a function argument; received \[object (Undefined|DOMWindow|Object)\]/);
    });
-
-    it('accepts an async function', function() {
-      jasmine.getEnv().requireAsyncAwait();
-      expect(function() {
-        env.beforeAll(jasmine.getEnv().makeAsyncAwaitFunction());
-      }).not.toThrow();
-    });
  });

  describe('#afterEach', function () {
@@ -174,13 +146,6 @@ describe("Env", function() {
        env.afterEach(undefined);
      }).toThrowError(/afterEach expects a function argument; received \[object (Undefined|DOMWindow|Object)\]/);
    });
-
-    it('accepts an async function', function() {
-      jasmine.getEnv().requireAsyncAwait();
-      expect(function() {
-        env.afterEach(jasmine.getEnv().makeAsyncAwaitFunction());
-      }).not.toThrow();
-    });
  });

  describe('#afterAll', function () {
@@ -189,12 +154,5 @@ describe("Env", function() {
        env.afterAll(undefined);
      }).toThrowError(/afterAll expects a function argument; received \[object (Undefined|DOMWindow|Object)\]/);
    });
-
-    it('accepts an async function', function() {
-      jasmine.getEnv().requireAsyncAwait();
-      expect(function() {
-        env.afterAll(jasmine.getEnv().makeAsyncAwaitFunction());
-      }).not.toThrow();
-    });
  });
 });
--- a/spec/core/PrettyPrintSpec.js
+++ b/spec/core/PrettyPrintSpec.js
@@ -33,26 +33,6 @@ describe("jasmineUnderTest.pp", function () {
    })
  });

-  describe('stringify maps', function() {
-    it("should stringify maps properly", function() {
-      jasmine.getEnv().requireFunctioningMaps();
-      expect(jasmineUnderTest.pp(new Map([[1, 2]]))).toEqual("Map( [ 1, 2 ] )");
-    });
-
-    it("should truncate maps with more elments than jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH", function() {
-      jasmine.getEnv().requireFunctioningMaps();
-      var originalMaxSize = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
-
-      try {
-        jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
-        expect(jasmineUnderTest.pp(new Map([["a", 1], ["b", 2], ["c", 3]]))).toEqual("Map( [ 'a', 1 ], [ 'b', 2 ], ... )");
-      } finally {
-        jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxSize;
-      }
-    })
-  });
-
-
  describe('stringify arrays', function() {
    it("should stringify arrays properly", function() {
      expect(jasmineUnderTest.pp([1, 2])).toEqual("[ 1, 2 ]");
@@ -119,18 +99,6 @@ describe("jasmineUnderTest.pp", function () {
    }, bar: [1, 2, 3]})).toEqual("Object({ foo: Function, bar: [ 1, 2, 3 ] })");
  });

-  it("should truncate objects with too many keys", function () {
-      var originalMaxLength = jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH;
-      var long = {a: 1, b: 2, c: 3};
-
-      try {
-        jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
-        expect(jasmineUnderTest.pp(long)).toEqual("Object({ a: 1, b: 2, ... })");
-      } finally {
-        jasmineUnderTest.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxLength;
-      }
-  });
-
  it("should print 'null' as the constructor of an object with its own constructor property", function() {
    expect(jasmineUnderTest.pp({constructor: function() {}})).toContain("null({");
    expect(jasmineUnderTest.pp({constructor: 'foo'})).toContain("null({");
@@ -257,18 +225,6 @@ describe("jasmineUnderTest.pp", function () {
    }
  });

-  it("should stringify objects have have a toString that isn't a function", function() {
-    var obj = {
-      toString: "foo"
-    };
-
-    if (jasmine.getEnv().ieVersion < 9) {
-      expect(jasmineUnderTest.pp(obj)).toEqual("Object({  })");
-    } else {
-      expect(jasmineUnderTest.pp(obj)).toEqual("Object({ toString: 'foo' })");
-    }
-  });
-
  it("should stringify objects from anonymous constructors with custom toString", function () {
    var MyAnonymousConstructor = (function() { return function () {}; })();
    MyAnonymousConstructor.toString = function () { return ''; };
--- a/spec/core/QueueRunnerSpec.js
+++ b/spec/core/QueueRunnerSpec.js
@@ -19,26 +19,6 @@ describe("QueueRunner", function() {
    expect(calls).toEqual(['fn1', 'fn2']);
  });

-  it("runs cleanup functions after the others", function() {
-    var calls = [],
-      queueableFn1 = { fn: jasmine.createSpy('fn1') },
-      queueableFn2 = { fn: jasmine.createSpy('fn2') },
-      queueRunner = new jasmineUnderTest.QueueRunner({
-        queueableFns: [queueableFn1],
-        cleanupFns: [queueableFn2]
-      });
-    queueableFn1.fn.and.callFake(function() {
-      calls.push('fn1');
-    });
-    queueableFn2.fn.and.callFake(function() {
-      calls.push('fn2');
-    });
-
-    queueRunner.execute();
-
-    expect(calls).toEqual(['fn1', 'fn2']);
-  });
-
  it("calls each function with a consistent 'this'-- an empty object", function() {
    var queueableFn1 = { fn: jasmine.createSpy('fn1') },
        queueableFn2 = { fn: jasmine.createSpy('fn2') },
@@ -51,7 +31,7 @@ describe("QueueRunner", function() {
    queueRunner.execute();

    var context = queueableFn1.fn.calls.first().object;
-    expect(context).toEqual(new jasmineUnderTest.UserContext());
+    expect(context).toEqual({});
    expect(queueableFn2.fn.calls.first().object).toBe(context);
    expect(asyncContext).toBe(context);
  });
@@ -190,6 +170,7 @@ describe("QueueRunner", function() {

      queueRunner.execute();

+      jasmine.clock().tick();
      expect(onComplete).toHaveBeenCalled();
      expect(onException).toHaveBeenCalled();

@@ -322,84 +303,6 @@ describe("QueueRunner", function() {
    });
  });

-  describe("with a function that returns a promise", function() {
-    function StubPromise() {}
-
-    StubPromise.prototype.then = function(resolve, reject) {
-      this.resolveHandler = resolve;
-      this.rejectHandler = reject;
-    };
-
-    beforeEach(function() {
-      jasmine.clock().install();
-    });
-
-    afterEach(function() {
-      jasmine.clock().uninstall();
-    });
-
-    it("runs the function asynchronously, advancing once the promise is settled", function() {
-      var onComplete = jasmine.createSpy('onComplete'),
-        fnCallback =  jasmine.createSpy('fnCallback'),
-        p1 = new StubPromise(),
-        p2 = new StubPromise(),
-        queueableFn1 = { fn: function() {
-          setTimeout(function() {
-            p1.resolveHandler();
-          }, 100);
-          return p1;
-        } };
-        queueableFn2 = { fn: function() {
-          fnCallback();
-          setTimeout(function() {
-            p2.resolveHandler();
-          }, 100);
-          return p2;
-        } },
-        queueRunner = new jasmineUnderTest.QueueRunner({
-          queueableFns: [queueableFn1, queueableFn2],
-          onComplete: onComplete
-        });
-
-      queueRunner.execute();
-      expect(fnCallback).not.toHaveBeenCalled();
-      expect(onComplete).not.toHaveBeenCalled();
-
-      jasmine.clock().tick(100);
-
-      expect(fnCallback).toHaveBeenCalled();
-      expect(onComplete).not.toHaveBeenCalled();
-
-      jasmine.clock().tick(100);
-
-      expect(onComplete).toHaveBeenCalled();
-    });
-
-    it("fails the function when the promise is rejected", function() {
-      var promise = new StubPromise(),
-        queueableFn1 = { fn: function() {
-          setTimeout(function() { promise.rejectHandler('foo'); }, 100);
-          return promise;
-        } },
-        queueableFn2 = { fn: jasmine.createSpy('fn2') },
-        failFn = jasmine.createSpy('fail'),
-        queueRunner = new jasmineUnderTest.QueueRunner({
-          queueableFns: [queueableFn1, queueableFn2],
-          fail: failFn
-        });
-
-      queueRunner.execute();
-
-      expect(failFn).not.toHaveBeenCalled();
-      expect(queueableFn2.fn).not.toHaveBeenCalled();
-
-      jasmine.clock().tick(100);
-
-      expect(failFn).toHaveBeenCalledWith('foo');
-      expect(queueableFn2.fn).toHaveBeenCalled();
-    });
-  });
-
  it("calls exception handlers when an exception is thrown in a fn", function() {
    var queueableFn = { type: 'queueable',
      fn: function() {
@@ -433,95 +336,20 @@ describe("QueueRunner", function() {
  it("continues running the functions even after an exception is thrown in an async spec", function() {
    var queueableFn = { fn: function(done) { throw new Error("error"); } },
      nextQueueableFn = { fn: jasmine.createSpy("nextFunction") },
+      timeout = { setTimeout: jasmine.createSpy("setTimeout"),
+        clearTimeout: jasmine.createSpy("setTimeout")
+      },
      queueRunner = new jasmineUnderTest.QueueRunner({
-        queueableFns: [queueableFn, nextQueueableFn]
+        queueableFns: [queueableFn, nextQueueableFn],
+        timeout: timeout
      });

    queueRunner.execute();
+    timeout.setTimeout.calls.argsFor(0)[0]();
+
    expect(nextQueueableFn.fn).toHaveBeenCalled();
  });

-  describe("When configured to complete on first error", function() {
-    it("skips to cleanup functions on the first exception", function() {
-      var queueableFn = { fn: function() { throw new Error("error"); } },
-        nextQueueableFn = { fn: jasmine.createSpy("nextFunction") },
-        cleanupFn = { fn: jasmine.createSpy("cleanup") },
-        queueRunner = new jasmineUnderTest.QueueRunner({
-          queueableFns: [queueableFn, nextQueueableFn],
-          cleanupFns: [cleanupFn],
-          completeOnFirstError: true
-        });
-
-      queueRunner.execute();
-      expect(nextQueueableFn.fn).not.toHaveBeenCalled();
-      expect(cleanupFn.fn).toHaveBeenCalled();
-    });
-
-    it("does not skip when a cleanup function throws", function() {
-      var queueableFn = { fn: function() { } },
-        cleanupFn1 = { fn: function() { throw new Error("error"); } },
-        cleanupFn2 = { fn: jasmine.createSpy("cleanupFn2") },
-        queueRunner = new jasmineUnderTest.QueueRunner({
-          queueableFns: [queueableFn],
-          cleanupFns: [cleanupFn1, cleanupFn2],
-          completeOnFirstError: true
-        });
-
-      queueRunner.execute();
-      expect(cleanupFn2.fn).toHaveBeenCalled();
-    });
-
-    describe("with an asynchronous function", function() {
-      beforeEach(function() {
-        jasmine.clock().install();
-      });
-
-      afterEach(function() {
-        jasmine.clock().uninstall();
-      });
-
-
-      it("skips to cleanup functions on the first exception", function() {
-        var errorListeners = [],
-          queueableFn = { fn: function(done) {} },
-          nextQueueableFn = { fn: jasmine.createSpy('nextFunction') },
-          cleanupFn = { fn: jasmine.createSpy('cleanup') },
-          queueRunner = new jasmineUnderTest.QueueRunner({
-            globalErrors: {
-              pushListener: function(f) { errorListeners.push(f); },
-              popListener: function() { errorListeners.pop(); },
-            },
-            queueableFns: [queueableFn, nextQueueableFn],
-            cleanupFns: [cleanupFn],
-            completeOnFirstError: true,
-         });
-
-        queueRunner.execute();
-        errorListeners[errorListeners.length - 1](new Error('error'));
-        expect(nextQueueableFn.fn).not.toHaveBeenCalled();
-        expect(cleanupFn.fn).toHaveBeenCalled();
-      });
-
-      it("skips to cleanup functions when next.fail is called", function() {
-        var queueableFn = { fn: function(done) {
-            done.fail('nope');
-          } },
-          nextQueueableFn = { fn: jasmine.createSpy('nextFunction') },
-          cleanupFn = { fn: jasmine.createSpy('cleanup') },
-          queueRunner = new jasmineUnderTest.QueueRunner({
-            queueableFns: [queueableFn, nextQueueableFn],
-            cleanupFns: [cleanupFn],
-            completeOnFirstError: true,
-         });
-
-        queueRunner.execute();
-        jasmine.clock().tick();
-        expect(nextQueueableFn.fn).not.toHaveBeenCalled();
-        expect(cleanupFn.fn).toHaveBeenCalled();
-      });
-    });
-  });
-
  it("calls a provided complete callback when done", function() {
    var queueableFn = { fn: jasmine.createSpy('fn') },
      completeCallback = jasmine.createSpy('completeCallback'),
@@ -565,53 +393,4 @@ describe("QueueRunner", function() {
      expect(completeCallback).toHaveBeenCalled();
    });
  });
-
-  describe('when user context has not been defined', function() {
-    beforeEach(function() {
-      var fn;
-
-      this.fn = fn = jasmine.createSpy('fn1');
-      this.queueRunner = new jasmineUnderTest.QueueRunner({
-        queueableFns: [{ fn: fn }]
-      });
-    });
-
-    it('runs the functions on the scope of a UserContext', function() {
-      var calls = [],
-          context;
-
-      this.fn.and.callFake(function() {
-        context = this;
-      });
-
-      this.queueRunner.execute();
-
-      expect(context.constructor).toBe(jasmineUnderTest.UserContext);
-    });
-  });
-
-  describe('when user context has been defined', function() {
-    beforeEach(function() {
-      var fn, context;
-
-      this.fn = fn = jasmine.createSpy('fn1');
-      this.context = context = new jasmineUnderTest.UserContext();
-      this.queueRunner = new jasmineUnderTest.QueueRunner({
-        queueableFns: [{ fn: fn }],
-        userContext: context
-      });
-    });
-
-    it('runs the functions on the scope of a UserContext', function() {
-      var calls = [],
-          context;
-      this.fn.and.callFake(function() {
-        context = this;
-      });
-
-      this.queueRunner.execute();
-
-      expect(context).toBe(this.context);
-    });
-  });
 });
--- a/spec/core/SpecSpec.js
+++ b/spec/core/SpecSpec.js
@@ -103,26 +103,8 @@ describe("Spec", function() {

    spec.execute();

-    var options = fakeQueueRunner.calls.mostRecent().args[0];
-    expect(options.queueableFns).toEqual([before, queueableFn]);
-    expect(options.cleanupFns).toEqual([after]);
-  });
-
-  it("tells the queue runner that it's a leaf node", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
-      spec = new jasmineUnderTest.Spec({
-        queueableFn: { fn: function() {} },
-        beforeAndAfterFns: function() {
-          return {befores: [], afters: []}
-        },
-        queueRunnerFactory: fakeQueueRunner
-      });
-
-    spec.execute();
-
-    expect(fakeQueueRunner).toHaveBeenCalledWith(jasmine.objectContaining({
-      isLeaf: true
-    }));
+    var allSpecFns = fakeQueueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(allSpecFns).toEqual([before, queueableFn, after]);
  });

  it("is marked pending if created without a function body", function() {
@@ -141,8 +123,7 @@ describe("Spec", function() {
  });

  it("can be disabled, but still calls callbacks", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner')
-        .and.callFake(function(attrs) { attrs.onComplete(); }),
+    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
      startCallback = jasmine.createSpy('startCallback'),
      specBody = jasmine.createSpy('specBody'),
      resultCallback = jasmine.createSpy('resultCallback'),
@@ -159,7 +140,7 @@ describe("Spec", function() {

    spec.execute();

-    expect(fakeQueueRunner).toHaveBeenCalled();
+    expect(fakeQueueRunner).not.toHaveBeenCalled();
    expect(specBody).not.toHaveBeenCalled();

    expect(startCallback).toHaveBeenCalled();
@@ -167,8 +148,7 @@ describe("Spec", function() {
  });

  it("can be disabled at execution time by a parent", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner')
-        .and.callFake(function(attrs) { attrs.onComplete(); }),
+    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
      startCallback = jasmine.createSpy('startCallback'),
      specBody = jasmine.createSpy('specBody'),
      resultCallback = jasmine.createSpy('resultCallback'),
@@ -183,7 +163,7 @@ describe("Spec", function() {

    expect(spec.result.status).toBe('disabled');

-    expect(fakeQueueRunner).toHaveBeenCalled();
+    expect(fakeQueueRunner).not.toHaveBeenCalled();
    expect(specBody).not.toHaveBeenCalled();

    expect(startCallback).toHaveBeenCalled();
@@ -191,8 +171,7 @@ describe("Spec", function() {
  });

  it("can be marked pending, but still calls callbacks when executed", function() {
-    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner')
-        .and.callFake(function(attrs) { attrs.onComplete(); }),
+    var fakeQueueRunner = jasmine.createSpy('fakeQueueRunner'),
      startCallback = jasmine.createSpy('startCallback'),
      resultCallback = jasmine.createSpy('resultCallback'),
      spec = new jasmineUnderTest.Spec({
@@ -212,7 +191,7 @@ describe("Spec", function() {

    spec.execute();

-    expect(fakeQueueRunner).toHaveBeenCalled();
+    expect(fakeQueueRunner).not.toHaveBeenCalled();

    expect(startCallback).toHaveBeenCalled();
    expect(resultCallback).toHaveBeenCalledWith({
--- a/spec/core/SuiteSpec.js
+++ b/spec/core/SuiteSpec.js
@@ -141,15 +141,5 @@ describe("Suite", function() {
    suite.onException(new jasmineUnderTest.errors.ExpectationFailed());

    expect(suite.getResult().failedExpectations).toEqual([]);
-  });
-
-  describe('#sharedUserContext', function() {
-    beforeEach(function() {
-      this.suite = new jasmineUnderTest.Suite({});
-    });
-
-    it('returns a UserContext', function() {
-      expect(this.suite.sharedUserContext().constructor).toBe(jasmineUnderTest.UserContext);
-    });
-  });
+  })
 });
--- a/spec/core/UserContextSpec.js
+++ b/spec/core/UserContextSpec.js
@@ -1,54 +0,0 @@
-describe("UserContext", function() {
-  it("Behaves just like an plain object", function() {
-    var context = new jasmineUnderTest.UserContext(),
-        properties = [];
-
-    for (var prop in context) {
-      if (obj.hasOwnProperty(prop)) {
-        properties.push(prop);
-      }
-    }
-
-    expect(properties).toEqual([]);
-  });
-
-  describe('.fromExisting', function() {
-    describe('when using an already built context as model', function() {
-      beforeEach(function() {
-        this.context = new jasmineUnderTest.UserContext();
-        this.context.key = 'value';
-        this.cloned = jasmineUnderTest.UserContext.fromExisting(this.context);
-      });
-
-      it('returns a cloned object', function() {
-        expect(this.cloned).toEqual(this.context);
-      });
-
-      it('does not return the same object', function() {
-        expect(this.cloned).not.toBe(this.context);
-      });
-    });
-
-    describe('when using a regular object as parameter', function() {
-      beforeEach(function() {
-        this.context = {};
-        this.value = 'value'
-        this.context.key = this.value;
-        this.cloned = jasmineUnderTest.UserContext.fromExisting(this.context);
-      });
-
-      it('returns an object with the same attributes', function() {
-        expect(this.cloned.key).toEqual(this.value);
-      });
-
-      it('does not return the same object', function() {
-        expect(this.cloned).not.toBe(this.context);
-      });
-
-      it('returns an UserContext', function() {
-        expect(this.cloned.constructor).toBe(jasmineUnderTest.UserContext);
-      });
-    });
-  });
-});
-
--- a/spec/core/integration/EnvSpec.js
+++ b/spec/core/integration/EnvSpec.js
@@ -243,7 +243,7 @@ describe("Env integration", function() {
        } else {
          secondSpecContext = this;
        }
-        expect(this).toEqual(new jasmineUnderTest.UserContext());
+        expect(this).toEqual({});
      });

      env.it("sync spec", function() {
@@ -277,7 +277,7 @@ describe("Env integration", function() {

      env.beforeEach(function() {
        specContext = this;
-        expect(this).toEqual(new jasmineUnderTest.UserContext());
+        expect(this).toEqual({});
      });

      env.it("sync spec", function(underTestCallback) {
@@ -952,15 +952,16 @@ describe("Env integration", function() {
  });

  describe("with a mock clock", function() {
+    var originalTimeout;
+
    beforeEach(function() {
-      this.originalTimeout = jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL;
-      this.realSetTimeout = setTimeout;
+      originalTimeout = jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL;
      jasmine.clock().install();
    });

    afterEach(function() {
      jasmine.clock().uninstall();
-      jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = this.originalTimeout;
+      jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
    });

    it("should wait a specified interval before failing specs haven't called done yet", function(done) {
@@ -1069,6 +1070,7 @@ describe("Env integration", function() {
        env.afterAll(function(innerDone) {
          jasmine.clock().tick(3001);
          innerDone();
+          jasmine.clock().tick(1);
        });
      });

@@ -1078,8 +1080,7 @@ describe("Env integration", function() {

    it('should wait a custom interval before reporting async functions that fail to call done', function(done) {
      var env = new jasmineUnderTest.Env(),
-          reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone', 'suiteDone', 'specDone']),
-          realSetTimeout = this.realSetTimeout;
+          reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone', 'suiteDone', 'specDone']);

      reporter.jasmineDone.and.callFake(function() {
        expect(reporter.specDone).toHaveFailedExpecationsForRunnable('suite beforeAll times out', [
@@ -1109,11 +1110,6 @@ describe("Env integration", function() {
      jasmineUnderTest.DEFAULT_TIMEOUT_INTERVAL = 10000;

      env.describe('suite', function() {
-        env.afterAll(function() {
-          realSetTimeout(function() {
-            jasmine.clock().tick(10);
-          }, 100);
-        });
        env.describe('beforeAll', function() {
          env.beforeAll(function(innerDone) {
            jasmine.clock().tick(5001);
@@ -1299,8 +1295,7 @@ describe("Env integration", function() {

      reporter.jasmineDone.and.callFake(function() {
        expect(reporter.jasmineStarted).toHaveBeenCalledWith({
-          totalSpecsDefined: 1,
-          order: jasmine.any(jasmineUnderTest.Order)
+          totalSpecsDefined: 1
        });

        expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
@@ -1335,8 +1330,7 @@ describe("Env integration", function() {

      reporter.jasmineDone.and.callFake(function() {
        expect(reporter.jasmineStarted).toHaveBeenCalledWith({
-          totalSpecsDefined: 1,
-          order: jasmine.any(jasmineUnderTest.Order)
+          totalSpecsDefined: 1
        });

        expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
@@ -1374,8 +1368,7 @@ describe("Env integration", function() {

    reporter.jasmineDone.and.callFake(function() {
      expect(reporter.jasmineStarted).toHaveBeenCalledWith({
-        totalSpecsDefined: 5,
-        order: jasmine.any(jasmineUnderTest.Order)
+        totalSpecsDefined: 5
      });

      expect(reporter.specDone.calls.count()).toBe(5);
@@ -1432,34 +1425,6 @@ describe("Env integration", function() {
    env.execute();
  });

-  it("should report the random seed at the beginning and end of execution", function(done) {
-    var env = new jasmineUnderTest.Env(),
-        reporter = jasmine.createSpyObj('fakeReporter', [
-          "jasmineStarted",
-          "jasmineDone",
-          "suiteStarted",
-          "suiteDone",
-          "specStarted",
-          "specDone"
-        ]);
-    env.randomizeTests(true);
-    env.seed('123456');
-
-    reporter.jasmineDone.and.callFake(function(doneArg) {
-      expect(reporter.jasmineStarted).toHaveBeenCalled();
-      var startedArg = reporter.jasmineStarted.calls.argsFor(0)[0];
-      expect(startedArg.order.random).toEqual(true);
-      expect(startedArg.order.seed).toEqual('123456');
-
-      expect(doneArg.order.random).toEqual(true);
-      expect(doneArg.order.seed).toEqual('123456');
-      done();
-    });
-
-    env.addReporter(reporter);
-    env.execute();
-  });
-
  it('should report pending spec messages', function(done) {
    var env = new jasmineUnderTest.Env(),
        reporter = jasmine.createSpyObj('fakeReporter', [
@@ -1519,8 +1484,7 @@ describe("Env integration", function() {

    reporter.jasmineDone.and.callFake(function() {
      expect(reporter.jasmineStarted).toHaveBeenCalledWith({
-        totalSpecsDefined: 1,
-        order: jasmine.any(jasmineUnderTest.Order)
+        totalSpecsDefined: 1
      });

      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({ status: 'disabled' }));
--- a/spec/core/integration/SpecRunningSpec.js
+++ b/spec/core/integration/SpecRunningSpec.js
@@ -836,115 +836,4 @@ describe("jasmine spec running", function () {
    env.execute();
  });

-  describe("When throwOnExpectationFailure is set", function() {
-    it("skips to cleanup functions after an error", function(done) {
-      var actions = [];
-
-      env.describe('Something', function() {
-        env.beforeEach(function() {
-          actions.push('outer beforeEach');
-          throw new Error("error");
-        });
-
-        env.afterEach(function() {
-          actions.push('outer afterEach');
-        });
-
-        env.describe('Inner', function() {
-          env.beforeEach(function() {
-            actions.push('inner beforeEach');
-          });
-
-          env.afterEach(function() {
-            actions.push('inner afterEach');
-          });
-
-          env.it('does it' , function() {
-            actions.push('inner it');
-          });
-        });
-      });
-
-      env.throwOnExpectationFailure(true);
-
-      var assertions = function() {
-        expect(actions).toEqual([
-          'outer beforeEach',
-          'inner afterEach',
-          'outer afterEach'
-        ]);
-        done();
-      };
-
-      env.addReporter({jasmineDone: assertions});
-
-      env.execute();
-    });
-
-    it("skips to cleanup functions after done.fail is called", function(done) {
-      var actions = [];
-
-      env.describe('Something', function() {
-        env.beforeEach(function(done) {
-          actions.push('beforeEach');
-          done.fail('error');
-          actions.push('after done.fail');
-        });
-
-        env.afterEach(function() {
-          actions.push('afterEach');
-        });
-
-        env.it('does it' , function() {
-          actions.push('it');
-        });
-      });
-
-      env.throwOnExpectationFailure(true);
-
-      var assertions = function() {
-        expect(actions).toEqual([
-          'beforeEach',
-          'afterEach'
-        ]);
-        done();
-      };
-
-      env.addReporter({jasmineDone: assertions});
-
-      env.execute();
-    });
-
-    it("skips to cleanup functions when an async function times out", function(done) {
-      var actions = [];
-
-      env.describe('Something', function() {
-        env.beforeEach(function(innerDone) {
-          actions.push('beforeEach');
-        }, 1);
-
-        env.afterEach(function() {
-          actions.push('afterEach');
-        });
-
-        env.it('does it' , function() {
-          actions.push('it');
-        });
-      });
-
-      env.throwOnExpectationFailure(true);
-
-      var assertions = function() {
-        expect(actions).toEqual([
-          'beforeEach',
-          'afterEach'
-        ]);
-        done();
-      };
-
-      env.addReporter({jasmineDone: assertions});
-
-      env.execute();
-    });
-  });
 });
--- a/spec/core/matchers/matchersUtilSpec.js
+++ b/spec/core/matchers/matchersUtilSpec.js
@@ -414,40 +414,6 @@ describe("matchersUtil", function() {
      expect(jasmineUnderTest.matchersUtil.equals(setA, setB)).toBe(false);
    });

-    it("passes when comparing two empty maps", function() {
-      jasmine.getEnv().requireFunctioningMaps();
-      expect(jasmineUnderTest.matchersUtil.equals(new Map(), new Map())).toBe(true);
-    });
-
-    it("passes when comparing identical maps", function() {
-      jasmine.getEnv().requireFunctioningMaps();
-      var mapA = new Map([[6, 5]]);
-      var mapB = new Map();
-      mapB.set(6, 5);
-      expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(true);
-    });
-
-    it("fails for maps with different elements", function() {
-      jasmine.getEnv().requireFunctioningMaps();
-      var mapA = new Map([[6, 3], [5, 1]]);
-      var mapB = new Map([[6, 4], [5, 1]]);
-      expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(false);
-    });
-
-    it("fails for maps of different size", function() {
-      jasmine.getEnv().requireFunctioningMaps();
-      var mapA = new Map([[6, 3]]);
-      var mapB = new Map([[6, 4], [5, 1]]);
-      expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(false);
-    });
-
-    it("fails for maps with different insertion order", function() {
-      jasmine.getEnv().requireFunctioningMaps();
-      var mapA = new Map([['a', 3], [6, 1]]);
-      var mapB = new Map([[6, 1], ['a', 3]]);
-      expect(jasmineUnderTest.matchersUtil.equals(mapA, mapB)).toBe(false);
-    });
-
    describe("when running in an environment with array polyfills", function() {
      // IE 8 doesn't support `definePropery` on non-DOM nodes
      if (jasmine.getEnv().ieVersion < 9) { return; }
--- a/spec/core/matchers/toBeCloseToSpec.js
+++ b/spec/core/matchers/toBeCloseToSpec.js
@@ -8,9 +8,6 @@ describe("toBeCloseTo", function() {

    result = matcher.compare(0, 0.001);
    expect(result.pass).toBe(true);
-
-    result = matcher.compare(0, 0.005);
-    expect(result.pass).toBe(true);
  });

  it("fails when not within two decimal places by default", function() {
@@ -19,9 +16,6 @@ describe("toBeCloseTo", function() {

    result = matcher.compare(0, 0.01);
    expect(result.pass).toBe(false);
-
-    result = matcher.compare(0, 0.05);
-    expect(result.pass).toBe(false);
  });

  it("accepts an optional precision argument", function() {
@@ -31,36 +25,8 @@ describe("toBeCloseTo", function() {
    result = matcher.compare(0, 0.1, 0);
    expect(result.pass).toBe(true);

-    result = matcher.compare(0, 0.5, 0);
-    expect(result.pass).toBe(true);
-
    result = matcher.compare(0, 0.0001, 3);
    expect(result.pass).toBe(true);
-
-    result = matcher.compare(0, 0.0005, 3);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(0, 0.00001, 4);
-    expect(result.pass).toBe(true);
-
-    result = matcher.compare(0, 0.00005, 4);
-    expect(result.pass).toBe(true);
-  });
-
-  it("fails when one of the arguments is null", function() {
-    var matcher = jasmineUnderTest.matchers.toBeCloseTo();
-
-    expect(function() {
-      matcher.compare(null, null);
-    }).toThrowError('Cannot use toBeCloseTo with null. Arguments evaluated to: expect(null).toBeCloseTo(null).');
-
-    expect(function() {
-      matcher.compare(0, null);
-    }).toThrowError('Cannot use toBeCloseTo with null. Arguments evaluated to: expect(0).toBeCloseTo(null).');
-
-    expect(function() {
-      matcher.compare(null, 0);
-    }).toThrowError('Cannot use toBeCloseTo with null. Arguments evaluated to: expect(null).toBeCloseTo(0).');
  });

  it("rounds expected values", function() {
@@ -76,15 +42,7 @@ describe("toBeCloseTo", function() {
    result = matcher.compare(1.23, 1.225);
    expect(result.pass).toBe(true);

-    result = matcher.compare(1.23, 1.235);
-    expect(result.pass).toBe(true);
-
-    // 1.2249999 will be rounded to 1.225
    result = matcher.compare(1.23, 1.2249999);
-    expect(result.pass).toBe(true);
-
-    // 1.2249999 will be rounded to 1.224
-    result = matcher.compare(1.23, 1.2244999);
    expect(result.pass).toBe(false);

    result = matcher.compare(1.23, 1.234);
--- a/spec/core/matchers/toEqualSpec.js
+++ b/spec/core/matchers/toEqualSpec.js
@@ -390,37 +390,6 @@ describe("toEqual", function() {
    expect(compareEquals(actual, expected).message).toEqual(message);
  });

-  it("does not report deep mismatches within Maps", function() {
-    // TODO: implement deep comparison of Map elements
-    jasmine.getEnv().requireFunctioningMaps();
-
-    var actual = new Map([['a', 1]]),
-      expected = new Map([['a', 2]]),
-      message = "Expected Map( [ 'a', 1 ] ) to equal Map( [ 'a', 2 ] ).";
-
-    expect(compareEquals(actual, expected).message).toEqual(message);
-  });
-
-  it("reports mismatches between Maps nested in objects", function() {
-    jasmine.getEnv().requireFunctioningMaps();
-
-    var actual = {Maps: [new Map([['a', 1]])]},
-      expected = {Maps: [new Map([['a', 2], ['b', 1]])]},
-      message = "Expected $.Maps[0] = Map( [ 'a', 1 ] ) to equal Map( [ 'a', 2 ], [ 'b', 1 ] ).";
-
-    expect(compareEquals(actual, expected).message).toEqual(message);
-  });
-
-  it("reports mismatches between Maps of different lengths", function() {
-    jasmine.getEnv().requireFunctioningMaps();
-
-    var actual = new Map([['a', 1]]),
-      expected = new Map([['a', 2]]),
-      message = "Expected Map( [ 'a', 1 ] ) to equal Map( [ 'a', 2 ] ).";
-
-    expect(compareEquals(actual, expected).message).toEqual(message);
-  });  
-
  function isNotRunningInBrowser() {
    return typeof document === 'undefined'
  }
--- a/spec/helpers/asyncAwait.js
+++ b/spec/helpers/asyncAwait.js
@@ -1,27 +0,0 @@
-(function(env) {
-  function getAsyncCtor() {
-    try {
-      eval("var func = async function(){};");
-    } catch (e) {
-      return null;
-    }
-
-    return Object.getPrototypeOf(func).constructor;
-  }
-
-  function hasAsyncAwaitSupport() {
-    return getAsyncCtor() !== null;
-  }
-
-  env.makeAsyncAwaitFunction = function() {
-    var AsyncFunction = getAsyncCtor();
-    return new AsyncFunction("");
-  };
-
-  env.requireAsyncAwait = function() {
-    if (!hasAsyncAwaitSupport()) {
-      env.pending("Environment does not support async/await functions");
-    }
-  };
-})(jasmine.getEnv());
-
--- a/spec/helpers/checkForMap.js
+++ b/spec/helpers/checkForMap.js
@@ -1,22 +0,0 @@
-(function(env) {
-  function hasFunctioningMaps() {
-    if (typeof Map === 'undefined') { return false; }
-
-    try {
-      var s = new Map([['a', 4]]);
-      if (s.size !== 1) { return false; }
-      if (s.keys().next().value !== 'a') { return false; }
-      if (s.values().next().value !== 4) { return false; }
-      return true;
-    } catch(e) {
-      return false;
-    }
-  }
-
-  env.requireFunctioningMaps = function() {
-    if (!hasFunctioningMaps()) {
-      env.pending("Browser has incomplete or missing support for Maps");
-    }
-  };
-
-})(jasmine.getEnv());
--- a/spec/html/HtmlReporterSpec.js
+++ b/spec/html/HtmlReporterSpec.js
@@ -691,15 +691,14 @@ describe("New HtmlReporter", function() {
        expect(seedBar).toBeNull();
      });

-      it("should include non-spec query params in the jasmine-skipped link when present", function(){
+      it("should include the random query param in the jasmine-skipped link when randomizing", function(){
        var env = new jasmineUnderTest.Env(),
          container = document.createElement("div"),
          reporter = new jasmineUnderTest.HtmlReporter({
            env: env,
            getContainer: function() { return container; },
            createElement: function() { return document.createElement.apply(document, arguments); },
-            createTextNode: function() { return document.createTextNode.apply(document, arguments); },
-            addToExistingQueryString: function(key, value) { return "?foo=bar&" + key + "=" + value; }
+            createTextNode: function() { return document.createTextNode.apply(document, arguments); }
          });

        reporter.initialize();
@@ -707,7 +706,25 @@ describe("New HtmlReporter", function() {
        reporter.jasmineDone({ order: { random: true } });

        var skippedLink = container.querySelector(".jasmine-skipped a");
-        expect(skippedLink.getAttribute('href')).toEqual('?foo=bar&spec=');
+        expect(skippedLink.getAttribute('href')).toEqual('?random=true');
+      });
+
+      it("should not include the random query param in the jasmine-skipped link when not randomizing", function(){
+        var env = new jasmineUnderTest.Env(),
+        container = document.createElement("div"),
+        reporter = new jasmineUnderTest.HtmlReporter({
+          env: env,
+          getContainer: function() { return container; },
+          createElement: function() { return document.createElement.apply(document, arguments); },
+          createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+        });
+
+        reporter.initialize();
+        reporter.jasmineStarted({ totalSpecsDefined: 1 });
+        reporter.jasmineDone();
+
+        var skippedLink = container.querySelector(".jasmine-skipped a");
+        expect(skippedLink.getAttribute('href')).toEqual('?');
      });
    });

--- a/spec/support/jasmine.json
+++ b/spec/support/jasmine.json
@@ -6,9 +6,7 @@
    "npmPackage/**/*.js"
  ],
  "helpers": [
-    "helpers/asyncAwait.js",
    "helpers/checkForSet.js",
-    "helpers/checkForMap.js",
    "helpers/nodeDefineJasmineUnderTest.js"
  ],
  "random": true
--- a/spec/support/jasmine.yml
+++ b/spec/support/jasmine.yml
@@ -16,10 +16,8 @@ src_files:
  - '**/*.js'
 stylesheets:
 helpers:
-  - 'helpers/asyncAwait.js'
  - 'helpers/BrowserFlags.js'
  - 'helpers/checkForSet.js'
-  - 'helpers/checkForMap.js'
  - 'helpers/defineJasmineUnderTest.js'
 spec_files:
  - '**/*[Ss]pec.js'
--- a/src/core/ClearStack.js
+++ b/src/core/ClearStack.js
@@ -1,7 +1,5 @@
 getJasmineRequireObj().clearStack = function(j$) {
-  var maxInlineCallCount = 10;
-
-  function messageChannelImpl(global, setTimeout) {
+  function messageChannelImpl(global) {
    var channel = new global.MessageChannel(),
        head = {},
        tail = head;
@@ -24,44 +22,25 @@ getJasmineRequireObj().clearStack = function(j$) {
      }
    };

-    var currentCallCount = 0;
    return function clearStack(fn) {
-      currentCallCount++;
-
-      if (currentCallCount < maxInlineCallCount) {
-        tail = tail.next = { task: fn };
-        channel.port2.postMessage(0);
-      } else {
-        currentCallCount = 0;
-        setTimeout(fn);
-      }
+      tail = tail.next = { task: fn };
+      channel.port2.postMessage(0);
    };
  }

  function getClearStack(global) {
-    var currentCallCount = 0;
-    var realSetTimeout = global.setTimeout;
-    var setTimeoutImpl = function clearStack(fn) {
-        Function.prototype.apply.apply(realSetTimeout, [global, [fn, 0]]);
-    };
-
    if (j$.isFunction_(global.setImmediate)) {
      var realSetImmediate = global.setImmediate;
      return function(fn) {
-        currentCallCount++;
-
-        if (currentCallCount < maxInlineCallCount) {
-          realSetImmediate(fn);
-        } else {
-          currentCallCount = 0;
-
-          setTimeoutImpl(fn);
-        }
+        realSetImmediate(fn);
      };
    } else if (!j$.util.isUndefined(global.MessageChannel)) {
-      return messageChannelImpl(global, setTimeoutImpl);
+      return messageChannelImpl(global);
    } else {
-      return setTimeoutImpl;
+      var realSetTimeout = global.setTimeout;
+      return function clearStack(fn) {
+        Function.prototype.apply.apply(realSetTimeout, [global, [fn, 0]]);
+      };
    }
  }

--- a/src/core/Env.js
+++ b/src/core/Env.js
@@ -196,7 +196,6 @@ getJasmineRequireObj().Env = function(j$) {
      options.timeout = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
      options.fail = self.fail;
      options.globalErrors = globalErrors;
-      options.completeOnFirstError = throwOnExpectationFailure && options.isLeaf;

      new j$.QueueRunner(options).execute();
    };
@@ -259,8 +258,7 @@ getJasmineRequireObj().Env = function(j$) {
      }

      reporter.jasmineStarted({
-        totalSpecsDefined: totalSpecsDefined,
-        order: order
+        totalSpecsDefined: totalSpecsDefined
      });

      currentlyExecutingSuites.push(topSuite);
@@ -321,12 +319,6 @@ getJasmineRequireObj().Env = function(j$) {
      }
    };

-    var ensureIsFunctionOrAsync = function(fn, caller) {
-      if (!j$.isFunction_(fn) && !j$.isAsyncFunction_(fn)) {
-        throw new Error(caller + ' expects a function argument; received ' + j$.getType_(fn));
-      }
-    };
-
    var suiteFactory = function(description) {
      var suite = new j$.Suite({
        env: self,
@@ -465,7 +457,7 @@ getJasmineRequireObj().Env = function(j$) {
      // it() sometimes doesn't have a fn argument, so only check the type if
      // it's given.
      if (arguments.length > 1 && typeof fn !== 'undefined') {
-        ensureIsFunctionOrAsync(fn, 'it');
+        ensureIsFunction(fn, 'it');
      }
      var spec = specFactory(description, fn, currentDeclarationSuite, timeout);
      if (currentDeclarationSuite.markedPending) {
@@ -479,7 +471,7 @@ getJasmineRequireObj().Env = function(j$) {
      // xit(), like it(), doesn't always have a fn argument, so only check the
      // type when needed.
      if (arguments.length > 1 && typeof fn !== 'undefined') {
-        ensureIsFunctionOrAsync(fn, 'xit');
+        ensureIsFunction(fn, 'xit');
      }
      var spec = this.it.apply(this, arguments);
      spec.pend('Temporarily disabled with xit');
@@ -487,7 +479,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.fit = function(description, fn, timeout){
-      ensureIsFunctionOrAsync(fn, 'fit');
+      ensureIsFunction(fn, 'fit');
      var spec = specFactory(description, fn, currentDeclarationSuite, timeout);
      currentDeclarationSuite.addChild(spec);
      focusedRunnables.push(spec.id);
@@ -504,7 +496,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.beforeEach = function(beforeEachFunction, timeout) {
-      ensureIsFunctionOrAsync(beforeEachFunction, 'beforeEach');
+      ensureIsFunction(beforeEachFunction, 'beforeEach');
      currentDeclarationSuite.beforeEach({
        fn: beforeEachFunction,
        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
@@ -512,7 +504,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.beforeAll = function(beforeAllFunction, timeout) {
-      ensureIsFunctionOrAsync(beforeAllFunction, 'beforeAll');
+      ensureIsFunction(beforeAllFunction, 'beforeAll');
      currentDeclarationSuite.beforeAll({
        fn: beforeAllFunction,
        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
@@ -520,8 +512,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.afterEach = function(afterEachFunction, timeout) {
-      ensureIsFunctionOrAsync(afterEachFunction, 'afterEach');
-      afterEachFunction.isCleanup = true;
+      ensureIsFunction(afterEachFunction, 'afterEach');
      currentDeclarationSuite.afterEach({
        fn: afterEachFunction,
        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
@@ -529,7 +520,7 @@ getJasmineRequireObj().Env = function(j$) {
    };

    this.afterAll = function(afterAllFunction, timeout) {
-      ensureIsFunctionOrAsync(afterAllFunction, 'afterAll');
+      ensureIsFunction(afterAllFunction, 'afterAll');
      currentDeclarationSuite.afterAll({
        fn: afterAllFunction,
        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
@@ -570,10 +561,6 @@ getJasmineRequireObj().Env = function(j$) {
        message: message,
        error: error && error.message ? error : null
      });
-
-      if (self.throwingExpectationFailures()) {
-        throw new Error(message);
-      }
    };
  }

--- a/src/core/PrettyPrinter.js
+++ b/src/core/PrettyPrinter.js
@@ -8,7 +8,7 @@ getJasmineRequireObj().pp = function(j$) {
  function hasCustomToString(value) {
    // value.toString !== Object.prototype.toString if value has no custom toString but is from another context (e.g.
    // iframe, web worker)
-    return j$.isFunction_(value.toString) && value.toString !== Object.prototype.toString && (value.toString() !== Object.prototype.toString.call(value));
+    return value.toString !== Object.prototype.toString && (value.toString() !== Object.prototype.toString.call(value));
  }

  PrettyPrinter.prototype.format = function(value) {
@@ -36,10 +36,8 @@ getJasmineRequireObj().pp = function(j$) {
        this.emitScalar('HTMLNode');
      } else if (value instanceof Date) {
        this.emitScalar('Date(' + value + ')');
-      } else if (j$.getType_(value) == '[object Set]') {
+      } else if (value.toString && value.toString() == '[object Set]') {
        this.emitSet(value);
-      } else if (j$.getType_(value) == '[object Map]') {
-        this.emitMap(value);
      } else if (value.toString && typeof value === 'object' && !j$.isArray_(value) && hasCustomToString(value)) {
        this.emitScalar(value.toString());
      } else if (j$.util.arrayContains(this.seen, value)) {
@@ -61,28 +59,15 @@ getJasmineRequireObj().pp = function(j$) {
  };

  PrettyPrinter.prototype.iterateObject = function(obj, fn) {
-    var objKeys = keys(obj, j$.isArray_(obj));
-    var isGetter = function isGetter(prop) {};
-
-    if (obj.__lookupGetter__) {
-      isGetter = function isGetter(prop) {
-        var getter = obj.__lookupGetter__(prop);
-        return !j$.util.isUndefined(getter) && getter !== null;
-      };
-
+    for (var property in obj) {
+      if (!Object.prototype.hasOwnProperty.call(obj, property)) { continue; }
+      fn(property, obj.__lookupGetter__ ? (!j$.util.isUndefined(obj.__lookupGetter__(property)) &&
+          obj.__lookupGetter__(property) !== null) : false);
    }
-    var length = Math.min(objKeys.length, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH);
-    for (var i = 0; i < length; i++) {
-      var property = objKeys[i];
-      fn(property, isGetter(property));
-    }
-
-    return objKeys.length > length;
  };

  PrettyPrinter.prototype.emitArray = j$.unimplementedMethod_;
  PrettyPrinter.prototype.emitSet = j$.unimplementedMethod_;
-  PrettyPrinter.prototype.emitMap = j$.unimplementedMethod_;
  PrettyPrinter.prototype.emitObject = j$.unimplementedMethod_;
  PrettyPrinter.prototype.emitScalar = j$.unimplementedMethod_;
  PrettyPrinter.prototype.emitString = j$.unimplementedMethod_;
@@ -90,7 +75,7 @@ getJasmineRequireObj().pp = function(j$) {
  function StringPrettyPrinter() {
    PrettyPrinter.call(this);

-    this.stringParts = [];
+    this.string = '';
  }

  j$.util.inherit(StringPrettyPrinter, PrettyPrinter);
@@ -122,7 +107,11 @@ getJasmineRequireObj().pp = function(j$) {

    var self = this;
    var first = array.length === 0;
-    var truncated = this.iterateObject(array, function(property, isGetter) {
+    this.iterateObject(array, function(property, isGetter) {
+      if (property.match(/^\d+$/)) {
+        return;
+      }
+
      if (first) {
        first = false;
      } else {
@@ -132,8 +121,6 @@ getJasmineRequireObj().pp = function(j$) {
      self.formatProperty(array, property, isGetter);
    });

-    if (truncated) { this.append(', ...'); }
-
    this.append(' ]');
  };

@@ -157,26 +144,6 @@ getJasmineRequireObj().pp = function(j$) {
    this.append(' )');
  };

-  StringPrettyPrinter.prototype.emitMap = function(map) {
-    if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
-      this.append('Map');
-      return;
-    }
-    this.append('Map( ');
-    var size = Math.min(map.size, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH);
-    var iter = map.entries();
-    for (var i = 0; i < size; i++) {
-      if (i > 0) {
-        this.append(', ');
-      }
-      this.format(iter.next().value);
-    }
-    if (map.size > size){
-      this.append(', ...');
-    }
-    this.append(' )');
-  };
-
  StringPrettyPrinter.prototype.emitObject = function(obj) {
    var ctor = obj.constructor,
        constructorName;
@@ -195,7 +162,7 @@ getJasmineRequireObj().pp = function(j$) {
    this.append('({ ');
    var first = true;

-    var truncated = this.iterateObject(obj, function(property, isGetter) {
+    this.iterateObject(obj, function(property, isGetter) {
      if (first) {
        first = false;
      } else {
@@ -205,8 +172,6 @@ getJasmineRequireObj().pp = function(j$) {
      self.formatProperty(obj, property, isGetter);
    });

-    if (truncated) { this.append(', ...'); }
-
    this.append(' })');
  };

@@ -221,41 +186,12 @@ getJasmineRequireObj().pp = function(j$) {
  };

  StringPrettyPrinter.prototype.append = function(value) {
-    this.stringParts.push(value);
+    this.string += value;
  };

-  function keys(obj, isArray) {
-    var allKeys = Object.keys ? Object.keys(obj) :
-      (function(o) {
-          var keys = [];
-          for (var key in o) {
-              if (j$.util.has(o, key)) {
-                  keys.push(key);
-              }
-          }
-          return keys;
-      })(obj);
-
-    if (!isArray) {
-      return allKeys;
-    }
-
-    if (allKeys.length === 0) {
-        return allKeys;
-    }
-
-    var extraKeys = [];
-    for (var i = 0; i < allKeys.length; i++) {
-      if (!/^[0-9]+$/.test(allKeys[i])) {
-        extraKeys.push(allKeys[i]);
-      }
-    }
-
-    return extraKeys;
-  }
  return function(value) {
    var stringPrettyPrinter = new StringPrettyPrinter();
    stringPrettyPrinter.format(value);
-    return stringPrettyPrinter.stringParts.join('');
+    return stringPrettyPrinter.string;
  };
 };
--- a/src/core/QueueRunner.js
+++ b/src/core/QueueRunner.js
@@ -12,18 +12,15 @@ getJasmineRequireObj().QueueRunner = function(j$) {
  }

  function QueueRunner(attrs) {
-    var queueableFns = attrs.queueableFns || [];
-    this.queueableFns = queueableFns.concat(attrs.cleanupFns || []);
-    this.firstCleanupIx = queueableFns.length;
+    this.queueableFns = attrs.queueableFns || [];
    this.onComplete = attrs.onComplete || function() {};
    this.clearStack = attrs.clearStack || function(fn) {fn();};
    this.onException = attrs.onException || function() {};
    this.catchException = attrs.catchException || function() { return true; };
-    this.userContext = attrs.userContext || new j$.UserContext();
+    this.userContext = attrs.userContext || {};
    this.timeout = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
    this.fail = attrs.fail || function() {};
    this.globalErrors = attrs.globalErrors || { pushListener: function() {}, popListener: function() {} };
-    this.completeOnFirstError = !!attrs.completeOnFirstError;
  }

  QueueRunner.prototype.execute = function() {
@@ -32,33 +29,22 @@ getJasmineRequireObj().QueueRunner = function(j$) {
      self.onException(error);
    };
    this.globalErrors.pushListener(this.handleFinalError);
-    this.run(0);
+    this.run(this.queueableFns, 0);
  };

-  QueueRunner.prototype.skipToCleanup = function(lastRanIndex) {
-    if (lastRanIndex < this.firstCleanupIx) {
-      this.run(this.firstCleanupIx);
-    } else {
-      this.run(lastRanIndex + 1);
-    }
-  };
-
-  QueueRunner.prototype.run = function(recursiveIndex) {
-    var length = this.queueableFns.length,
+  QueueRunner.prototype.run = function(queueableFns, recursiveIndex) {
+    var length = queueableFns.length,
      self = this,
      iterativeIndex;


    for(iterativeIndex = recursiveIndex; iterativeIndex < length; iterativeIndex++) {
-      var result = attempt(iterativeIndex);
-
-      if (!result.completedSynchronously) {
-        return;
-      }
-
-      if (this.completeOnFirstError && result.errored) {
-        this.skipToCleanup(iterativeIndex);
+      var queueableFn = queueableFns[iterativeIndex];
+      if (queueableFn.fn.length > 0) {
+        attemptAsync(queueableFn);
        return;
+      } else {
+        attemptSync(queueableFn);
      }
    }

@@ -67,46 +53,41 @@ getJasmineRequireObj().QueueRunner = function(j$) {
      self.onComplete();
    });

-    function attempt() {
+    function attemptSync(queueableFn) {
+      try {
+        queueableFn.fn.call(self.userContext);
+      } catch (e) {
+        handleException(e, queueableFn);
+      }
+    }
+
+    function attemptAsync(queueableFn) {
      var clearTimeout = function () {
          Function.prototype.apply.apply(self.timeout.clearTimeout, [j$.getGlobal(), [timeoutId]]);
        },
+        completedSynchronously = true,
        setTimeout = function(delayedFn, delay) {
          return Function.prototype.apply.apply(self.timeout.setTimeout, [j$.getGlobal(), [delayedFn, delay]]);
        },
-        completedSynchronously = true,
        handleError = function(error) {
          onException(error);
          next();
        },
-        cleanup = once(function() {
+        next = once(function () {
          clearTimeout(timeoutId);
          self.globalErrors.popListener(handleError);
-        }),
-        next = once(function () {
-          cleanup();
-
-          function runNext() {
-            if (self.completeOnFirstError && errored) {
-              self.skipToCleanup(iterativeIndex);
-            } else {
-              self.run(iterativeIndex + 1);
-            }
-          }
-
          if (completedSynchronously) {
-            setTimeout(runNext);
+            setTimeout(function() {
+              self.run(queueableFns, iterativeIndex + 1);
+            });
          } else {
-            runNext();
+            self.run(queueableFns, iterativeIndex + 1);
          }
        }),
-        errored = false,
-        queueableFn = self.queueableFns[iterativeIndex],
        timeoutId;

      next.fail = function() {
        self.fail.apply(null, arguments);
-        errored = true;
        next();
      };

@@ -121,39 +102,24 @@ getJasmineRequireObj().QueueRunner = function(j$) {
      }

      try {
-        if (queueableFn.fn.length === 0) {
-          var maybeThenable = queueableFn.fn.call(self.userContext);
-
-          if (maybeThenable && j$.isFunction_(maybeThenable.then)) {
-            maybeThenable.then(next, next.fail);
-            completedSynchronously = false;
-            return { completedSynchronously: false };
-          }
-        } else {
-          queueableFn.fn.call(self.userContext, next);
-          completedSynchronously = false;
-          return { completedSynchronously: false };
-        }
+        queueableFn.fn.call(self.userContext, next);
+        completedSynchronously = false;
      } catch (e) {
        handleException(e, queueableFn);
-        errored = true;
+        next();
      }
+    }

-      cleanup();
-      return { completedSynchronously: true, errored: errored };
+    function onException(e) {
+      self.onException(e);
+    }

-      function onException(e) {
-        self.onException(e);
-        errored = true;
-      }
-
-      function handleException(e, queueableFn) {
-        onException(e);
-        if (!self.catchException(e)) {
-          //TODO: set a var when we catch an exception and
-          //use a finally block to close the loop in a nice way..
-          throw e;
-        }
+    function handleException(e, queueableFn) {
+      onException(e);
+      if (!self.catchException(e)) {
+        //TODO: set a var when we catch an exception and
+        //use a finally block to close the loop in a nice way..
+        throw e;
      }
    }
  };
--- a/src/core/Spec.js
+++ b/src/core/Spec.js
@@ -50,25 +50,20 @@ getJasmineRequireObj().Spec = function(j$) {

    this.onStart(this);

-    var fns = this.beforeAndAfterFns();
-    var regularFns = fns.befores.concat(this.queueableFn);
+    if (!this.isExecutable() || this.markedPending || enabled === false) {
+      complete(enabled);
+      return;
+    }

-    var runnerConfig = {
-      isLeaf: true,
-      queueableFns: regularFns,
-      cleanupFns: fns.afters,
+    var fns = this.beforeAndAfterFns();
+    var allFns = fns.befores.concat(this.queueableFn).concat(fns.afters);
+
+    this.queueRunnerFactory({
+      queueableFns: allFns,
      onException: function() { self.onException.apply(self, arguments); },
      onComplete: complete,
      userContext: this.userContext()
-    };
-
-    if (!this.isExecutable() || this.markedPending || enabled === false) {
-      runnerConfig.queueableFns = [];
-      runnerConfig.cleanupFns = [];
-      runnerConfig.onComplete = function() { complete(enabled); };
-    }
-
-    this.queueRunnerFactory(runnerConfig);
+    });

    function complete(enabledAgain) {
      self.result.status = self.status(enabledAgain);
--- a/src/core/Suite.js
+++ b/src/core/Suite.js
@@ -88,14 +88,14 @@ getJasmineRequireObj().Suite = function(j$) {

  Suite.prototype.sharedUserContext = function() {
    if (!this.sharedContext) {
-      this.sharedContext = this.parentSuite ? this.parentSuite.clonedSharedUserContext() : new j$.UserContext();
+      this.sharedContext = this.parentSuite ? clone(this.parentSuite.sharedUserContext()) : {};
    }

    return this.sharedContext;
  };

  Suite.prototype.clonedSharedUserContext = function() {
-    return j$.UserContext.fromExisting(this.sharedUserContext());
+    return clone(this.sharedUserContext());
  };

  Suite.prototype.onException = function() {
@@ -147,6 +147,17 @@ getJasmineRequireObj().Suite = function(j$) {
    return !args[0];
  }

+  function clone(obj) {
+    var clonedObj = {};
+    for (var prop in obj) {
+      if (obj.hasOwnProperty(prop)) {
+        clonedObj[prop] = obj[prop];
+      }
+    }
+
+    return clonedObj;
+  }
+
  return Suite;
 };

--- a/src/core/UserContext.js
+++ b/src/core/UserContext.js
@@ -1,18 +0,0 @@
-getJasmineRequireObj().UserContext = function(j$) {
-  function UserContext() {
-  }
-
-  UserContext.fromExisting = function(oldContext) {
-    var context = new UserContext();
-
-    for (var prop in oldContext) {
-      if (oldContext.hasOwnProperty(prop)) {
-        context[prop] = oldContext[prop];
-      }
-    }
-
-    return context;
-  };
-
-  return  UserContext;
-};
--- a/src/core/base.js
+++ b/src/core/base.js
@@ -11,7 +11,6 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
  j$.MAX_PRETTY_PRINT_DEPTH = 40;
  /**
   * Maximum number of array elements to display when pretty printing objects.
-   * This will also limit the number of keys and values displayed for an object.
   * Elements past this number will be ellipised.
   * @name jasmine.MAX_PRETTY_PRINT_ARRAY_LENGTH
   */
@@ -59,10 +58,6 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
    return j$.isA_('Function', value);
  };

-  j$.isAsyncFunction_ = function(value) {
-    return j$.isA_('AsyncFunction', value);
-  };
-
  j$.isA_ = function(typeName, value) {
    return j$.getType_(value) === '[object ' + typeName + ']';
  };
--- a/src/core/matchers/matchersUtil.js
+++ b/src/core/matchers/matchersUtil.js
@@ -239,12 +239,12 @@ getJasmineRequireObj().matchersUtil = function(j$) {
      if (!result) {
        return false;
      }
-    } else if (className == '[object Set]' || className == '[object Map]') {
+    } else if (className == '[object Set]') {
      if (a.size != b.size) {
        diffBuilder.record(a, b);
        return false;
      }
-      var iterA = a.entries(), iterB = b.entries();
+      var iterA = a.values(), iterB = b.values();
      var valA, valB;
      do {
        valA = iterA.next();
--- a/src/core/matchers/toBeCloseTo.js
+++ b/src/core/matchers/toBeCloseTo.js
@@ -15,18 +15,8 @@ getJasmineRequireObj().toBeCloseTo = function() {
          precision = precision || 2;
        }

-        if (expected === null || actual === null) {
-          throw new Error('Cannot use toBeCloseTo with null. Arguments evaluated to: ' +
-            'expect(' + actual + ').toBeCloseTo(' + expected + ').'
-          );
-        }
-
-        var pow = Math.pow(10, precision + 1);
-        var delta = Math.abs(expected - actual);
-        var maxDelta = Math.pow(10, -precision) / 2;
-
        return {
-          pass: Math.round(delta * pow) / pow <= maxDelta
+          pass: Math.abs(expected - actual) < (Math.pow(10, -precision) / 2)
        };
      }
    };
--- a/src/core/requireCore.js
+++ b/src/core/requireCore.js
@@ -49,7 +49,6 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
    j$.SpyRegistry = jRequire.SpyRegistry(j$);
    j$.SpyStrategy = jRequire.SpyStrategy(j$);
    j$.StringMatching = jRequire.StringMatching(j$);
-    j$.UserContext = jRequire.UserContext(j$);
    j$.Suite = jRequire.Suite(j$);
    j$.Timer = jRequire.Timer();
    j$.TreeProcessor = jRequire.TreeProcessor();
--- a/src/html/HtmlReporter.js
+++ b/src/html/HtmlReporter.js
@@ -181,7 +181,7 @@ jasmineRequire.HtmlReporter = function(j$) {

      if (specsExecuted < totalSpecsDefined) {
        var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
-        var skippedLink = addToExistingQueryString('spec', '');
+        var skippedLink = order && order.random ? '?random=true' : '?';
        alert.appendChild(
          createDom('span', {className: 'jasmine-bar jasmine-skipped'},
            createDom('a', {href: skippedLink, title: 'Run all specs'}, skippedMessage)
--- a/travis-node-script.sh
+++ b/travis-node-script.sh
@@ -1,10 +1,4 @@
 #!/bin/bash -e

-rm -rf ~/.nvm
-git clone https://github.com/creationix/nvm.git ~/.nvm
-(cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`)
-source ~/.nvm/nvm.sh
-nvm install v0.12.18
-
 npm install
 npm test
Author	SHA1	Message	Date
Gregg Van Hove	ca5b1de2eb	bump version to 2.6.3	2017-06-07 13:41:22 -07:00
Steve Gravrock	a3bc74776a	Make sure the queue runner goes async for async specs - Even if `done` is called synchronously. See #1327 #1334 jasmine/gulp-jasmine-browser#48 This is a backport of `578f63b9bd` to 2.6.x.	2017-06-06 15:49:37 -07:00