Skip to content
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.

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

chore: enforce LF line endings #8809

Merged
merged 3 commits into from
Aug 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- restore-cache: *restore-cache
- run: yarn --no-progress --frozen-lockfile
- save-cache: *save-cache
- run: yarn lint --format junit -o reports/junit/js-lint-results.xml && yarn lint-es5-build --format junit -o reports/junit/js-es5-lint-results.xml && yarn lint:md:ci && yarn check-copyright-headers
- run: yarn lint --format junit -o reports/junit/js-lint-results.xml && yarn lint-es5-build --format junit -o reports/junit/js-es5-lint-results.xml && yarn lint:prettier:ci && yarn check-copyright-headers
- store_test_results:
path: reports/junit

Expand Down
10 changes: 9 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
# EditorConfig helps developers define and maintain consistent
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now this pretty much looks like the typical editorconfig examples, except for the md/snap override

# coding styles between different editors and IDEs
# editorconfig.org
#
# Some of these options are also respected by Prettier

root = true

[*]
indent_style = space
indent_size = 2

end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{*.md,*.snap}]
[*.{md,snap}]
trim_trailing_whitespace = false
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
- `[docs]` Fix MockFunctions example that was using toContain instead of toContainEqual ([#8765](https://github.com/facebook/jest/pull/8765))
- `[*]` Make sure copyright header comment includes license ([#8783](https://github.com/facebook/jest/pull/8783))
- `[docs]` Fix WatchPlugins `jestHooks.shouldRunTestSuite` example that receives an object ([#8784](https://github.com/facebook/jest/pull/8784))
- `[*]` Enforce LF line endings ([#8809](https://github.com/facebook/jest/pull/8809))

### Performance

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"jest-coverage": "yarn jest --coverage",
"lint": "eslint . --cache --report-unused-disable-directives --ext js,jsx,ts,tsx,md",
"lint-es5-build": "eslint --no-eslintrc --no-ignore --env=browser packages/*/build-es5",
"lint:md": "yarn --silent lint:md:ci --fix",
"lint:md:ci": "prettylint '**/*.{md,yml,yaml}' --ignore-path .gitignore",
"lint:prettier": "yarn --silent lint:prettier:ci --fix",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thought I'd also rename the script while on it since it's no longer just md. Simen mentioned this name being misleading some time ago.

"lint:prettier:ci": "prettylint '**/*.{md,yml,yaml}' --ignore-path .gitignore",
"postinstall": "opencollective postinstall && yarn build",
"publish": "yarn build-clean && yarn build && lerna publish --silent",
"test-ci-es5-build-in-browser": "karma start --single-run",
Expand Down
48 changes: 24 additions & 24 deletions packages/expect/src/__tests__/__arbitraries__/sharedSettings.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
*/
import fc from 'fast-check';
// settings for anything arbitrary
export const anythingSettings = {
key: fc.oneof(fc.string(), fc.constantFrom('k1', 'k2', 'k3')),
maxDepth: 2, // Limit object depth (default: 2)
maxKeys: 5, // Limit number of keys per object (default: 5)
withBoxedValues: true,
// Issue #7975 have to be fixed before enabling the generation of Map
withMap: false,
// Issue #7975 have to be fixed before enabling the generation of Set
withSet: false,
};
// assertion settings
export const assertSettings = {}; // eg.: {numRuns: 10000}
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
*/

import fc from 'fast-check';

// settings for anything arbitrary
export const anythingSettings = {
key: fc.oneof(fc.string(), fc.constantFrom('k1', 'k2', 'k3')),
maxDepth: 2, // Limit object depth (default: 2)
maxKeys: 5, // Limit number of keys per object (default: 5)
withBoxedValues: true,
// Issue #7975 have to be fixed before enabling the generation of Map
withMap: false,
// Issue #7975 have to be fixed before enabling the generation of Set
withSet: false,
};

// assertion settings
export const assertSettings = {}; // eg.: {numRuns: 10000}
96 changes: 48 additions & 48 deletions packages/expect/src/__tests__/matchers-toContain.property.test.ts
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
*/
import fc from 'fast-check';
import {
anythingSettings,
assertSettings,
} from './__arbitraries__/sharedSettings';
describe('toContain', () => {
it('should always find the value when inside the array', () => {
fc.assert(
fc.property(
fc.array(fc.anything(anythingSettings)),
fc.array(fc.anything(anythingSettings)),
fc.anything(anythingSettings).filter(v => !Number.isNaN(v)),
(startValues, endValues, v) => {
// Given: startValues, endValues arrays and v value (not NaN)
expect([...startValues, v, ...endValues]).toContain(v);
},
),
assertSettings,
);
});
it('should not find the value if it has been cloned into the array', () => {
fc.assert(
fc.property(
fc.array(fc.anything(anythingSettings)),
fc.array(fc.anything(anythingSettings)),
fc.dedup(fc.anything(anythingSettings), 2),
(startValues, endValues, [a, b]) => {
// Given: startValues, endValues arrays
// and [a, b] equal, but not the same values
// with `typeof a === 'object && a !== null`
fc.pre(typeof a === 'object' && a !== null);
expect([...startValues, a, ...endValues]).not.toContain(b);
},
),
assertSettings,
);
});
});
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
*/

import fc from 'fast-check';
import {
anythingSettings,
assertSettings,
} from './__arbitraries__/sharedSettings';

describe('toContain', () => {
it('should always find the value when inside the array', () => {
fc.assert(
fc.property(
fc.array(fc.anything(anythingSettings)),
fc.array(fc.anything(anythingSettings)),
fc.anything(anythingSettings).filter(v => !Number.isNaN(v)),
(startValues, endValues, v) => {
// Given: startValues, endValues arrays and v value (not NaN)
expect([...startValues, v, ...endValues]).toContain(v);
},
),
assertSettings,
);
});

it('should not find the value if it has been cloned into the array', () => {
fc.assert(
fc.property(
fc.array(fc.anything(anythingSettings)),
fc.array(fc.anything(anythingSettings)),
fc.dedup(fc.anything(anythingSettings), 2),
(startValues, endValues, [a, b]) => {
// Given: startValues, endValues arrays
// and [a, b] equal, but not the same values
// with `typeof a === 'object && a !== null`
fc.pre(typeof a === 'object' && a !== null);
expect([...startValues, a, ...endValues]).not.toContain(b);
},
),
assertSettings,
);
});
});
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
*/
import fc from 'fast-check';
import {
anythingSettings,
assertSettings,
} from './__arbitraries__/sharedSettings';
describe('toContainEqual', () => {
it('should always find the value when inside the array', () => {
fc.assert(
fc.property(
fc.array(fc.anything(anythingSettings)),
fc.array(fc.anything(anythingSettings)),
fc.anything(anythingSettings),
(startValues, endValues, v) => {
// Given: startValues, endValues arrays and v any value
expect([...startValues, v, ...endValues]).toContainEqual(v);
},
),
assertSettings,
);
});
it('should always find the value when cloned inside the array', () => {
fc.assert(
fc.property(
fc.array(fc.anything(anythingSettings)),
fc.array(fc.anything(anythingSettings)),
fc.dedup(fc.anything(anythingSettings), 2),
(startValues, endValues, [a, b]) => {
// Given: startValues, endValues arrays
// and [a, b] identical values
expect([...startValues, a, ...endValues]).toContainEqual(b);
},
),
assertSettings,
);
});
});
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
*/

import fc from 'fast-check';
import {
anythingSettings,
assertSettings,
} from './__arbitraries__/sharedSettings';

describe('toContainEqual', () => {
it('should always find the value when inside the array', () => {
fc.assert(
fc.property(
fc.array(fc.anything(anythingSettings)),
fc.array(fc.anything(anythingSettings)),
fc.anything(anythingSettings),
(startValues, endValues, v) => {
// Given: startValues, endValues arrays and v any value
expect([...startValues, v, ...endValues]).toContainEqual(v);
},
),
assertSettings,
);
});

it('should always find the value when cloned inside the array', () => {
fc.assert(
fc.property(
fc.array(fc.anything(anythingSettings)),
fc.array(fc.anything(anythingSettings)),
fc.dedup(fc.anything(anythingSettings), 2),
(startValues, endValues, [a, b]) => {
// Given: startValues, endValues arrays
// and [a, b] identical values
expect([...startValues, a, ...endValues]).toContainEqual(b);
},
),
assertSettings,
);
});
});
Loading