Use the correct addMatchers interface from core

- Fixes jasmine/jasmine#1452
jasmine · Nov 28, 2017 · c3271d2 · c3271d2
1 parent e0c9d2b
commit c3271d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/jasmine.js b/lib/jasmine.js
@@ -85,7 +85,7 @@ Jasmine.prototype.configureDefaultReporter = function(options) {
 };
 
 Jasmine.prototype.addMatchers = function(matchers) {
-  this.jasmine.Expectation.addMatchers(matchers);
+  this.env.addMatchers(matchers);
 };
 
 Jasmine.prototype.loadSpecs = function() {

diff --git a/spec/jasmine_spec.js b/spec/jasmine_spec.js
@@ -8,15 +8,13 @@ describe('Jasmine', function() {
       getEnv: jasmine.createSpy('getEnv').and.returnValue({
         addReporter: jasmine.createSpy('addReporter'),
         clearReporters: jasmine.createSpy('clearReporters'),
+        addMatchers: jasmine.createSpy('addMatchers'),
         provideFallbackReporter: jasmine.createSpy('provideFallbackReporter'),
         execute: jasmine.createSpy('execute'),
         throwOnExpectationFailure: jasmine.createSpy('throwOnExpectationFailure'),
         randomizeTests: jasmine.createSpy('randomizeTests')
       }),
-      Timer: jasmine.createSpy('Timer'),
-      Expectation: {
-        addMatchers: jasmine.createSpy('addMatchers')
-      }
+      Timer: jasmine.createSpy('Timer')
     };
 
     this.fakeJasmineCore = {
@@ -157,7 +155,7 @@ describe('Jasmine', function() {
 
   it('adds matchers to the jasmine env', function() {
     this.testJasmine.addMatchers(['fake matcher 1', 'fake matcher 2']);
-    expect(this.bootedJasmine.Expectation.addMatchers).toHaveBeenCalledWith(['fake matcher 1', 'fake matcher 2']);
+    expect(this.testJasmine.env.addMatchers).toHaveBeenCalledWith(['fake matcher 1', 'fake matcher 2']);
   });
 
   describe('loading configurations', function() {