Skip to content

Fix: unbreak master #5672

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
thymikee merged 4 commits into from
Feb 26, 2018
Merged

Fix: unbreak master #5672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6a6108
Fix object assigning in jest-editor-support test
thymikee Feb 26, 2018
e8f73eb
Use yarn.lock as cache key, start cache versioning
thymikee Feb 26, 2018
265b75e
fix lint
thymikee Feb 26, 2018
a49df4d
inline spawn options
thymikee Feb 26, 2018
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
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
aliases:
- &restore-cache
keys:
- dependencies-{{ .Branch }}-{{ checksum "package.json" }}
- v1-dependencies-{{ .Branch }}-{{ "yarn.lock" }}
Copy link
Contributor Author

@thymikee thymikee Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm now using yarn.lock as a cache key, as it's more adequate in this case.

# Fallback in case checksum fails
- dependencies-{{ .Branch }}-
- v1-dependencies-{{ .Branch }}-

- &save-cache
paths:
- node_modules
- website/node_modules
key: dependencies-{{ .Branch }}-{{ checksum "package.json" }}
key: v1-dependencies-{{ .Branch }}-{{ "yarn.lock" }}

- &yarn-install
run: |
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

### Features

* `[jest-jasmine2]` Adds error throwing and descriptive errors to `it`/ `test`
for invalid arguements. `[jest-circus]` Adds error throwing and descriptive
errors to `it`/ `test` for invalid arguements.
* `[jest-jasmine2]` Adds error throwing and descriptive errors to `it`/ `test`
for invalid arguements. `[jest-circus]` Adds error throwing and descriptive
errors to `it`/ `test` for invalid arguements.
* `[jest-matcher-utils]` Add `isNot` option to `matcherHint` function
([#5512](https://github.com/facebook/jest/pull/5512))

Expand Down
9 changes: 6 additions & 3 deletions packages/jest-editor-support/src/__tests__/settings.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,11 @@ describe('Settings', () => {
on: () => {},
stdout: new EventEmitter(),
});
const spawnOptions = {shell: true};
const options: any = Object.assign({}, createProcess, spawnOptions);

const options: any = {
createProcess,
shell: true,
};
const settings = new Settings(workspace, options);
settings.getConfig(() => {});

Expand All @@ -164,7 +167,7 @@ describe('Settings', () => {
rootPath,
},
['--showConfig'],
spawnOptions,
{shell: true},
);
});
});
Expand Down