move jasmine back to inner scope / don't use iterators

jestjs · Jun 22, 2017 · fd46ea1 · fd46ea1
1 parent 95c774f
commit fd46ea1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/packages/jest-jasmine2/package.json b/packages/jest-jasmine2/package.json
@@ -14,8 +14,7 @@
     "jest-matcher-utils": "^20.0.3",
     "jest-matchers": "^20.0.3",
     "jest-message-util": "^20.0.3",
-    "jest-snapshot": "^20.0.3",
-    "p-map": "^1.1.1"
+    "jest-snapshot": "^20.0.3"
   },
   "devDependencies": {
     "jest-runtime": "^20.0.4"

diff --git a/packages/jest-jasmine2/src/index.js b/packages/jest-jasmine2/src/index.js
@@ -33,7 +33,7 @@ async function jasmine2(
     environment,
     testPath,
   );
-  const jasmineFactory = require(JASMINE);
+  const jasmineFactory = runtime.requireInternalModule(JASMINE);
   const jasmine = jasmineFactory.create();
 
   const env = jasmine.getEnv();

diff --git a/packages/jest-jasmine2/src/queueRunner.js b/packages/jest-jasmine2/src/queueRunner.js
@@ -8,7 +8,6 @@
  * @flow
  */
 
-import pMap from 'p-map';
 import pTimeout from './p-timeout';
 
 type Options = {
@@ -57,7 +56,11 @@ async function queueRunner(options: Options) {
       },
     );
   };
-  return pMap(options.queueableFns, mapper, {concurrency: 1});
+
+  return options.queueableFns.reduce(
+    (promise, fn) => promise.then(() => mapper(fn)),
+    Promise.resolve(),
+  );
 }
 
 module.exports = queueRunner;