Remove Config type. (jestjs#3366)

tushardhole · Apr 27, 2017 · f200a1f · f200a1f
1 parent f960634
commit f200a1f
Show file tree

Hide file tree

Showing 16 changed files with 103 additions and 265 deletions.
diff --git a/packages/babel-jest/src/index.js b/packages/babel-jest/src/index.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {Config, Path} from 'types/Config';
+import type {Path, ProjectConfig} from 'types/Config';
 import type {TransformOptions} from 'types/Transform';
 
 const crypto = require('crypto');
@@ -104,7 +104,7 @@ const createTransformer = (options: any) => {
     process(
       src: string,
       filename: Path,
-      config: Config,
+      config: ProjectConfig,
       transformOptions: TransformOptions,
     ): string {
       if (!babel) {

diff --git a/packages/jest-cli/src/__tests__/SearchSource-test.js b/packages/jest-cli/src/__tests__/SearchSource-test.js
@@ -46,7 +46,7 @@ describe('SearchSource', () => {
         name,
         rootDir: '.',
         roots: [],
-      }).config;
+      }).options;
       return Runtime.createContext(config, {maxWorkers}).then(context => {
         searchSource = new SearchSource(context);
       });
@@ -62,7 +62,7 @@ describe('SearchSource', () => {
           roots: [],
           testMatch: null,
           testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.jsx?$',
-        }).config;
+        }).options;
         return Runtime.createContext(config, {
           maxWorkers,
         }).then(context => {
@@ -100,7 +100,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests matching a pattern via testRegex', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         moduleFileExtensions: ['js', 'jsx', 'txt'],
         name,
         rootDir,
@@ -121,7 +121,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests matching a pattern via testMatch', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         moduleFileExtensions: ['js', 'jsx', 'txt'],
         name,
         rootDir,
@@ -142,7 +142,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests matching a JS regex pattern', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         moduleFileExtensions: ['js', 'jsx'],
         name,
         rootDir,
@@ -161,7 +161,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests matching a JS glob pattern', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         moduleFileExtensions: ['js', 'jsx'],
         name,
         rootDir,
@@ -180,7 +180,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests with default file extensions using testRegex', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         name,
         rootDir,
         testMatch: null,
@@ -198,7 +198,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests with default file extensions using testMatch', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         name,
         rootDir,
         testMatch,
@@ -216,7 +216,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests with similar but custom file extensions', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         moduleFileExtensions: ['jsx'],
         name,
         rootDir,
@@ -231,7 +231,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests with totally custom foobar file extensions', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         moduleFileExtensions: ['foobar'],
         name,
         rootDir,
@@ -246,7 +246,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests with many kinds of file extensions', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         moduleFileExtensions: ['js', 'jsx'],
         name,
         rootDir,
@@ -264,7 +264,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests using a regex only', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         name,
         rootDir,
         testMatch: null,
@@ -282,7 +282,7 @@ describe('SearchSource', () => {
     });
 
     it('finds tests using a glob only', () => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         name,
         rootDir,
         testMatch,
@@ -314,7 +314,7 @@ describe('SearchSource', () => {
     const rootPath = path.join(rootDir, 'root.js');
 
     beforeEach(done => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         name: 'SearchSource-findRelatedTests-tests',
         rootDir,
       });
@@ -345,7 +345,7 @@ describe('SearchSource', () => {
 
   describe('findRelatedTestsFromPattern', () => {
     beforeEach(done => {
-      const {config} = normalizeConfig({
+      const {options: config} = normalizeConfig({
         moduleFileExtensions: ['js', 'jsx', 'foobar'],
         name,
         rootDir,

diff --git a/packages/jest-cli/src/__tests__/runJest-test.js b/packages/jest-cli/src/__tests__/runJest-test.js