Skip to content

Commit

Permalink
chore(deps): upgrade flow to 0.66 (#5602)
Browse files Browse the repository at this point in the history
* chore(deps): upgrade flow to 0.66

* simplify assertionResults switch
  • Loading branch information
thymikee authored and cpojer committed Feb 19, 2018
1 parent 71c31d7 commit 402a6fe
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ include_warnings=true
emoji=true

[version]
^0.64.0
^0.66.0
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"eslint-plugin-prettier": "^2.3.1",
"eslint-plugin-react": "^7.1.0",
"eslint-plugin-relay": "~0.0.19",
"flow-bin": "^0.64.0",
"flow-bin": "^0.66.0",
"glob": "^7.1.1",
"graceful-fs": "^4.1.11",
"immutable": "^4.0.0-rc.7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ export const runAndTransformResultsToJestFormat = async ({
case 'pass':
status = 'passed';
break;
case 'skip':
default:
status = 'pending';
break;
}

const ancestorTitles = testResult.testPath.filter(
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-jasmine2/src/jasmine/jasmine_light.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import SpyRegistry from './spy_registry';
import Suite from './Suite';
import Timer from './Timer';

export const create = function(createOptions: Object) {
exports.create = function(createOptions: Object) {
const j$ = Object.assign({}, createOptions);

j$.DEFAULT_TIMEOUT_INTERVAL = 5000;
Expand Down
4 changes: 1 addition & 3 deletions packages/jest-jasmine2/src/queue_runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,14 @@ export default function queueRunner(options: Options) {
);
};

const result: Promise<void> = options.queueableFns.reduce(
const result = options.queueableFns.reduce(
(promise, fn) => promise.then(() => mapper(fn)),
Promise.resolve(),
);

return {
cancel: token.cancel.bind(token),
// $FlowFixMe
catch: result.catch.bind(result),
// $FlowFixMe
then: result.then.bind(result),
};
}
2 changes: 1 addition & 1 deletion types/Circus.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export type TestResult = {|
duration: ?number,
errors: Array<FormattedError>,
status: TestStatus,
testPath: Array<BlockName | TestName>,
testPath: Array<TestName>,
|};

export type TestResults = Array<TestResult>;
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3302,9 +3302,9 @@ flat-cache@^1.2.1:
graceful-fs "^4.1.2"
write "^0.2.1"

flow-bin@^0.64.0:
version "0.64.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.64.0.tgz#ddd3fb3b183ab1ab35a5d5dec9caf5ebbcded167"
flow-bin@^0.66.0:
version "0.66.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.66.0.tgz#a96dde7015dc3343fd552a7b4963c02be705ca26"

flow-remove-types@^1.1.0:
version "1.2.3"
Expand Down

0 comments on commit 402a6fe

Please sign in to comment.