Merge branch 'master' into 3.0-features

2018-02-02 16:33:38 -08:00
parent 42e00b3bc5 70bce55721
commit 274011ed03
15 changed files with 543 additions and 206 deletions
--- a/spec/core/asymmetric_equality/AnythingSpec.js
+++ b/spec/core/asymmetric_equality/AnythingSpec.js
@@ -48,7 +48,7 @@ describe("Anything", function() {
  });

  it("matches a Symbol", function() {
-    jasmine.getEnv().requireFunctioningSets();
+    jasmine.getEnv().requireFunctioningSymbols();

    var anything = new jasmineUnderTest.Anything();