From 5fa1d3e9bb0fb8a5c4a0cd36f9b9e260f489391b Mon Sep 17 00:00:00 2001 From: cpojer Date: Mon, 7 Dec 2015 15:17:49 -0800 Subject: [PATCH] Fixes for jasmine2 support with the new node-haste. --- .../__tests__/HasteModuleLoader-requireModule-test.js | 6 ++++-- src/testRunners/jasmine/jasmine2.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModule-test.js b/src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModule-test.js index d53200e52a51..0a73625dc4c0 100644 --- a/src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModule-test.js +++ b/src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModule-test.js @@ -59,7 +59,9 @@ describe('HasteModuleLoader', function() { return buildLoader().then(function(loader) { expect(function() { loader.requireModule(rootPath, 'DoesntExist'); - }).toThrow('Cannot find module \'DoesntExist\' from \'root.js\''); + }).toThrow( + new Error('Cannot find module \'DoesntExist\' from \'root.js\'') + ); }); }); @@ -88,7 +90,7 @@ describe('HasteModuleLoader', function() { expect(function() { loader.requireModule(rootPath, './DoesntExist'); }).toThrow( - 'Cannot find module \'./DoesntExist\' from \'root.js\'' + new Error('Cannot find module \'./DoesntExist\' from \'root.js\'') ); }); }); diff --git a/src/testRunners/jasmine/jasmine2.js b/src/testRunners/jasmine/jasmine2.js index 9d8cc7d1836a..32f7d82f597d 100644 --- a/src/testRunners/jasmine/jasmine2.js +++ b/src/testRunners/jasmine/jasmine2.js @@ -90,7 +90,7 @@ function jasmine2(config, environment, moduleLoader, testPath) { }); if (!config.persistModuleRegistryBetweenSpecs) { - moduleLoader.getJestRuntime().resetModuleRegistry(); + moduleLoader.resetModuleRegistry(); } });