Standardize file names: Fix integration folder names #5298

jamischarles · 2018-01-13T04:07:26Z

Summary

This is the first of many PRs to standardize file names and fix #4969. Per @thymikee guidance I'll be making these changes incrementally. This PR only renames folder names. A future PR will include filenames.

In this PR I:

ran mv integration_tests integration-tests
renamed all the subfolders under integration-tests

Now the folders (not filenames yet) follow standard Facebook practice:

- Files that primarily export types, objects or classes should use CapitalizedFileNames.js and should mirror what’s inside 1:1.
- Files that export a single function should have the function name with camelCase in it.
- Folder names should use dashes, unless they are special folders.

List of commands I ran for all subfolders:

find . -name '*.js' -print0 | xargs -0 sed -i "" "s/integration_tests/integration-tests/g" I ran this command across .md, .snap, .json, .gitignore files

Folders I left untouched

__mocks__, node_modules, __tests__, basically anything with a leading __

All the test cases pass. I'm happy to squash the commits as well. Any feedback?

codecov-io · 2018-01-13T04:17:27Z

Codecov Report

Merging #5298 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #5298   +/-   ##
=======================================
  Coverage   61.22%   61.22%           
=======================================
  Files         205      205           
  Lines        6894     6894           
  Branches        4        4           
=======================================
  Hits         4221     4221           
  Misses       2672     2672           
  Partials        1        1

Impacted Files	Coverage Δ
...bel-plugin-jest-hoist/__test_modules__/Unmocked.js	`100% <ø> (ø)`
...ests/babel-plugin-jest-hoist/__test_modules__/d.js	`100% <ø> (ø)`
integration-tests/coverage-remapping/covered.ts	`85.71% <ø> (ø)`
...ests/babel-plugin-jest-hoist/__test_modules__/b.js	`0% <ø> (ø)`
...s/coverage-report/cached-duplicates/a/identical.js	`100% <ø> (ø)`
...ests/babel-plugin-jest-hoist/__test_modules__/c.js	`100% <ø> (ø)`
...ests/babel-plugin-jest-hoist/__test_modules__/a.js	`0% <ø> (ø)`
...gration-tests/babel-plugin-jest-hoist/mock-file.js	`100% <ø> (ø)`
...babel-plugin-jest-hoist/__test_modules__/Mocked.js	`0% <ø> (ø)`
...s/coverage-report/cached-duplicates/b/identical.js	`100% <ø> (ø)`
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c799a02...87b3db4. Read the comment docs.

thymikee · 2018-01-13T08:58:12Z

CHANGELOG.md

+### Chore & Maintenance
+
+* `[filenames]` Standardize folder names under `integration-tests/`
+  ([#x](https://github.com/facebook/jest/pull/x))


x = 5298 🙂

thymikee

Looks good, small nits noted

thymikee · 2018-01-13T09:03:44Z

integration-tests/__tests__/global_setup.test.js

@@ -13,14 +13,14 @@ const path = require('path');
 const runJest = require('../runJest');
 const {cleanup} = require('../utils');

-const DIR = path.join(os.tmpdir(), 'jest_global_setup');
+const DIR = path.join(os.tmpdir(), 'jest_global-setup');


In multiple places this need to be changed to: jest-global-setup (and jest-global-teardown accordingly too)

Right you are! Searched and fixed these files:

→ git status -s M integration-tests/__tests__/global_setup.test.js M integration-tests/__tests__/global_teardown.test.js M integration-tests/global-setup/__tests__/setup1.test.js M integration-tests/global-setup/__tests__/setup2.test.js M integration-tests/global-setup/__tests__/setup3.test.js M integration-tests/global-setup/setup.js M integration-tests/global-teardown/__tests__/teardown1.test.js M integration-tests/global-teardown/__tests__/teardown2.test.js M integration-tests/global-teardown/__tests__/teardown3.test.js M integration-tests/global-teardown/teardown.js

jamischarles · 2018-01-13T17:28:09Z

@thymikee Both nits addressed.

thymikee

Looks like these 2 changes are the last for this PR :D

thymikee · 2018-01-13T18:26:25Z

integration-tests/__tests__/clear_cache.test.js

@@ -13,19 +13,19 @@ const os = require('os');
 const path = require('path');
 const runJest = require('../runJest');

-const CACHE = path.resolve(os.tmpdir(), 'clear_cache_directory');
+const CACHE = path.resolve(os.tmpdir(), 'clear-cache_directory');


clear-cache-directory

thymikee · 2018-01-13T18:26:55Z

integration-tests/__tests__/custom_reporters.test.js

@@ -14,7 +14,7 @@ const runJest = require('../runJest');
 const os = require('os');
 const path = require('path');

-const DIR = path.resolve(os.tmpdir(), 'custom_reporters_test_dir');
+const DIR = path.resolve(os.tmpdir(), 'custom-reporters_test_dir');


custom-reporters-test-dir

Ah yes. Sorry about that. Both of these are fixed.

Fixes all the folder names in the integration-tests folder to follow Facebook internal file / folder naming conventions. This is the first of several incremental PRs.

thymikee

Looks like it, thank you!

jamischarles · 2018-01-14T16:08:16Z

🎉 thanks.

@thymikee thank you for all your help. Next PR should come next Friday.

thymikee · 2018-01-14T16:09:01Z

You're welcome!

github-actions · 2021-05-12T23:07:16Z

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
Please note this issue tracker is not a help forum. We recommend using StackOverflow or our discord channel for questions.

chore(filenames): use dash for integration_tests/

3f15450

facebook-github-bot added the CLA Signed ✔️ label Jan 13, 2018

thymikee reviewed Jan 13, 2018

View reviewed changes

thymikee requested changes Jan 13, 2018

View reviewed changes

thymikee reviewed Jan 13, 2018

View reviewed changes

jamischarles force-pushed the fix_integration_folder_names branch from 154b3f3 to 5501be2 Compare January 13, 2018 17:25

jamischarles mentioned this pull request Jan 13, 2018

Standardize file naming #4969

Closed

thymikee reviewed Jan 13, 2018

View reviewed changes

chore(filenames): fix intergration-tests subfolders

87b3db4

Fixes all the folder names in the integration-tests folder to follow Facebook internal file / folder naming conventions. This is the first of several incremental PRs.

jamischarles force-pushed the fix_integration_folder_names branch from 5501be2 to 87b3db4 Compare January 13, 2018 19:45

thymikee approved these changes Jan 13, 2018

View reviewed changes

cpojer merged commit 0580b5b into jestjs:master Jan 14, 2018

renovate-tests mentioned this pull request Feb 6, 2018

Update dependency jest to v22 - autoclosed renovate-tests/changelog-md#3

Closed

renovate bot mentioned this pull request Feb 14, 2018

fix(deps): update dependency jest to ^22.0.0 manekinekko/devoxx-assistant#3

Open

github-actions bot locked as resolved and limited conversation to collaborators May 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Standardize file names: Fix integration folder names #5298

Standardize file names: Fix integration folder names #5298

jamischarles commented Jan 13, 2018

codecov-io commented Jan 13, 2018 •

edited

Loading

thymikee Jan 13, 2018

jamischarles Jan 13, 2018

thymikee left a comment

thymikee Jan 13, 2018

jamischarles Jan 13, 2018

jamischarles commented Jan 13, 2018

thymikee left a comment

thymikee Jan 13, 2018

thymikee Jan 13, 2018

jamischarles Jan 13, 2018

thymikee left a comment

jamischarles commented Jan 14, 2018

thymikee commented Jan 14, 2018

github-actions bot commented May 12, 2021

Standardize file names: Fix integration folder names #5298

Standardize file names: Fix integration folder names #5298

Conversation

jamischarles commented Jan 13, 2018

codecov-io commented Jan 13, 2018 • edited Loading

Codecov Report

thymikee Jan 13, 2018

Choose a reason for hiding this comment

jamischarles Jan 13, 2018

Choose a reason for hiding this comment

thymikee left a comment

Choose a reason for hiding this comment

thymikee Jan 13, 2018

Choose a reason for hiding this comment

jamischarles Jan 13, 2018

Choose a reason for hiding this comment

jamischarles commented Jan 13, 2018

thymikee left a comment

Choose a reason for hiding this comment

thymikee Jan 13, 2018

Choose a reason for hiding this comment

thymikee Jan 13, 2018

Choose a reason for hiding this comment

jamischarles Jan 13, 2018

Choose a reason for hiding this comment

thymikee left a comment

Choose a reason for hiding this comment

jamischarles commented Jan 14, 2018

thymikee commented Jan 14, 2018

github-actions bot commented May 12, 2021

codecov-io commented Jan 13, 2018 •

edited

Loading