Skip to content

Commit

Permalink
restart Appveyor build
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronabramov committed Jul 26, 2017
1 parent 5b236da commit 5a8ccf2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/jest-cli/src/cli/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ const _getConfigs = (

hasDeprecationWarnings = parsedConfig.hasDeprecationWarnings;
globalConfig = parsedConfig.globalConfig;
configs = [parsedConfig.projectConfig];
configs = [parsedConfig.config];
if (globalConfig.projects && globalConfig.projects.length) {
// Even though we had one project in CLI args, there might be more
// projects defined in the config.
Expand All @@ -227,7 +227,7 @@ const _getConfigs = (
if (projects.length > 1) {
const parsedConfigs = projects.map(root => readConfig(argv, root, true));
_ensureNoDuplicateConfigs(parsedConfigs, projects);
configs = parsedConfigs.map(({projectConfig}) => projectConfig);
configs = parsedConfigs.map(({config}) => config);
if (!hasDeprecationWarnings) {
hasDeprecationWarnings = parsedConfigs.some(
({hasDeprecationWarnings}) => !!hasDeprecationWarnings,
Expand Down
4 changes: 2 additions & 2 deletions packages/jest-config/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function readConfig(
configPath: ?Path,
globalConfig: GlobalConfig,
hasDeprecationWarnings: boolean,
projectConfig: ProjectConfig,
config: ProjectConfig,
} {
let rawOptions;
let configPath;
Expand All @@ -54,10 +54,10 @@ function readConfig(
const {options, hasDeprecationWarnings} = normalize(rawOptions, argv);
const {globalConfig, projectConfig} = getConfigs(options);
return {
config: projectConfig,
configPath,
globalConfig,
hasDeprecationWarnings,
projectConfig,
};
}

Expand Down

0 comments on commit 5a8ccf2

Please sign in to comment.