Skip to content

Replace Settings class by getSettings function #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 28, 2019
Merged

Replace Settings class by getSettings function #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f1ac74d
remove default values from Settings
stephtr Jul 14, 2019
e5fde3b
remodel Settings
stephtr Jul 18, 2019
fa83c18
update changelog
stephtr Jul 18, 2019
f50e634
update comment
stephtr Jul 18, 2019
e453384
add @jest/types dependency, fix small bugs
stephtr Jul 18, 2019
ef65d70
Revert use of @jest/types in Settings.js
stephtr Jul 18, 2019
198d743
add comment about Config class
stephtr Jul 18, 2019
aad6f61
update tests
stephtr Jul 18, 2019
1616e8c
fix flow error
stephtr Jul 18, 2019
8026e92
typescript definition: export correct function
stephtr Jul 18, 2019
bb5e9b4
run prettier
stephtr Jul 18, 2019
cb1e1c6
fix eslint issues
stephtr Jul 18, 2019
d5b4e4e
update test
stephtr Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ Bug-fixes within the same version aren't needed

* upgrade to the latest jest version (24.7.x) - connectdotz

* `Settings.settings` no longer contains the default configuration but starts with `undefined` - stephtr

Before accessing this property, one has to run `Settings.getConfig`.

-->

### 25.0.0
Expand Down
14 changes: 9 additions & 5 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,18 @@ export class Runner extends EventEmitter {
runJestWithUpdateForSnapshots(completion: () => void, args?: string[]): void;
}

export interface ConfigRepresentation {
testRegex: string | string[],
testMatch: string[],
};

export class Settings extends EventEmitter {
constructor(workspace: ProjectWorkspace, options?: Options);
getConfig(completed: Function): void;
getConfigs(completed: Function): void;
getConfig(completed: Function, index?: number): void;
jestVersionMajor: number | null;
settings: {
testRegex: string,
testMatch: string[],
};
configs: ConfigRepresentation[];
settings?: ConfigRepresentation;
}

export class ProjectWorkspace {
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"dependencies": {
"@babel/traverse": "^7.1.2",
"babylon": "^6.14.1",
"jest-config": "^24.7.0",
"jest-snapshot": "^24.7.0",
"typescript": "^3.4.3"
},
Expand Down
14 changes: 2 additions & 12 deletions src/Settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,14 @@

import {ChildProcess} from 'child_process';
import EventEmitter from 'events';
import {defaults as jestConfigDefaults} from 'jest-config';
import type {Options, SpawnOptions} from './types';
import ProjectWorkspace from './project_workspace';
import {createProcess} from './Process';

// This class represents the the configuration of Jest's process
// we want to start with the defaults then override whatever they output
// the interface below can be used to show what we use, as currently the whole
// settings object will be in memory.

// Ideally anything you care about adding should have a default in
// the constructor see https://jestjs.io/docs/configuration.html
// for full deets

// For now, this is all we care about inside the config

type Glob = string;
Expand All @@ -43,7 +37,7 @@ export default class Settings extends EventEmitter {

configs: ConfigRepresentations;

settings: ConfigRepresentation;
settings: ?ConfigRepresentation;

workspace: ProjectWorkspace;

Expand All @@ -59,11 +53,7 @@ export default class Settings extends EventEmitter {
shell: options && options.shell,
};

const {testMatch, testRegex} = jestConfigDefaults;

this.settings = {testMatch, testRegex};

this.configs = [this.settings];
this.configs = [];
this._jsonPattern = new RegExp(/^[\s]*\{/gm);
}

Expand Down
1 change: 0 additions & 1 deletion src/__tests__/settings.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ describe('Settings', () => {
};
const settings = new Settings(workspace, options);
expect(settings.workspace).toEqual(workspace);
expect(settings.settings).toEqual(expect.any(Object));
expect(settings.spawnOptions).toEqual(options);
});

Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3264,7 +3264,7 @@ jest-cli@^24.7.1:
realpath-native "^1.1.0"
yargs "^12.0.2"

jest-config@^24.7.0, jest-config@^24.7.1:
jest-config@^24.7.1:
version "24.7.1"
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.7.1.tgz#6c1dd4db82a89710a3cf66bdba97827c9a1cf052"
integrity sha512-8FlJNLI+X+MU37j7j8RE4DnJkvAghXmBWdArVzypW6WxfGuxiL/CCkzBg0gHtXhD2rxla3IMOSUAHylSKYJ83g==
Expand Down