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

standardize filenames in e2e #7471

Merged
merged 75 commits into from
Jan 10, 2019
Merged

standardize filenames in e2e #7471

merged 75 commits into from
Jan 10, 2019

Conversation

GGonryun
Copy link
Contributor

@GGonryun GGonryun commented Dec 5, 2018

Summary

This Pull Request helps standardizes file names with Facebook's naming conventions as outlined in issue #4969.

The following folders inside of ./e2e/ and their corresponding files, tests, or snapshots have been modified and checked:

auto-clear-mocks
auto-reset-mocks
auto-restore-mocks
babel-plugin-jest-hoist
bad-source-map
before-all-filtered
browser-support
clear-cache

The folder's corresponding tests can be located in ./e2e/__tests__/<folder_name>.test.js.
The folder's corresponding snapshots can be located in ./e2e/__tests__/__snapshots__/.

Test plan

executed yarn run clean-all and yarn install and yarn jest.
yarn jest yields no failures and similar results when compared to master.

@thymikee
Copy link
Collaborator

thymikee commented Dec 5, 2018

I don't think it's necessary to change these, but if you must, don't change to underscore_case – when in doubt use camelCase.

Feel free to take jest-runner and jest-runtime :)

@GGonryun
Copy link
Contributor Author

GGonryun commented Dec 5, 2018

I don't think it's necessary to change these, but if you must, don't change to underscore_case – when in doubt use camelCase.

Sorry about that! Thank you for the additional clarification

Feel free to take jest-runner and jest-runtime :)

Thank you! Should I be adding these to a new PR each or just add them to this one?

@thymikee
Copy link
Collaborator

thymikee commented Dec 5, 2018

Feel free to do it in one shot :)

@GGonryun GGonryun changed the title standardize filenames in e2e/bad-source-map standardize filenames in e2e and packages Dec 5, 2018
@GGonryun GGonryun changed the title standardize filenames in e2e and packages standardize filenames in e2e/bad-source-map and packages/jest-runner and packages/jest-runtime Dec 6, 2018
@thymikee
Copy link
Collaborator

thymikee commented Dec 6, 2018

Ouch, I forgot about this one #7464
So please just scope this PR to e2e, sorry for confusion

@GGonryun
Copy link
Contributor Author

GGonryun commented Dec 6, 2018

@thymikee I'm a bit confused on how to undo my changes for jest-runtime and jest-runner. Do I reset back to the commit 455cedc and then continue with e2e from there after I rebase?

thank you for all the assistance! 😄

@thymikee
Copy link
Collaborator

thymikee commented Dec 6, 2018

You can throw away last commit, e.g by
git reset --hard 1284004

@GGonryun GGonryun changed the title standardize filenames in e2e/bad-source-map and packages/jest-runner and packages/jest-runtime standardize filenames in e2e Dec 6, 2018
@GGonryun
Copy link
Contributor Author

GGonryun commented Jan 9, 2019

I believe the e2e folder is done now. :)

Should I open a new PR for the other folders which need standardizing?

@SimenB
Copy link
Member

SimenB commented Jan 9, 2019

This is fantastic, thank you so much for tackling it!

@SimenB
Copy link
Member

SimenB commented Jan 9, 2019

@thymikee mind merging if it looks alright to you?

Copy link
Collaborator

@thymikee thymikee left a comment

Choose a reason for hiding this comment

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

Looking good! Left some final comments. Plus, looks like these files were renamed wrongly (GitHub makes it impossible to comment on renamed files, shame):

  • e2e/testNamePattern_skipped/package.json → e2e/test-name-pattern/package.json
  • e2e/testNamePattern/package.json → e2e/test-name-pattern-skipped/package.json

@@ -5,10 +5,10 @@
"jest": {
"collectCoverageOnlyFrom": {
"<rootDir>/this-directory-is-covered/Covered.js": true,
Copy link
Collaborator

@thymikee thymikee Jan 9, 2019

Choose a reason for hiding this comment

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

Is this left with capital case on purpose? I've seen at least one more similar case (with (...)/Covered.js), so make sure to adjust that as well if you change that

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did miss these files, sorry! I also deleted the left over files named .e2e/transform/babel-jest/this-directory-is-covered/ExcludedFromCoverage.js and ./e2e/transform/no-babel-jest/this-directory-is-covered/ExcludedFromCoverage.js in the same location

@GGonryun
Copy link
Contributor Author

Sorry about that last mess of commits, I was trying to change the two file names and couldn't get git to recognize the swap, is it because the two files are identical?

@thymikee thymikee merged commit 5f4e5cd into jestjs:master Jan 10, 2019
@thymikee
Copy link
Collaborator

Thanks for staying with us on that, appreciated!

captain-yossarian pushed a commit to captain-yossarian/jest that referenced this pull request Jul 18, 2019
* standardizing file names to fit facebook standards

* updating filenames to better fit facebook standards

* standardizing jest-runner filenames to fit facebook standards

* standardizing file names in /e2e/before-all-filtered

* resolving naming discrepencies inside of files

* standardizing filenames in e2e/before-each-queue and corresponding tests

* standardizing several tests in ./e2e/__test__/

* standardizing filenames for babel-plugin-jest-hoist and related test files

* standardizing file-names for folders 'browser-support' and 'clear-cache' and their corresponding test files

* resolving issue with karma referencing non-standard browserTest

* resolving issue with karma referencing non-standard browserTest filename

* standardizing file names to fit facebook standards

* updating filenames to better fit facebook standards

* Add issue template labels (jestjs#7470)

* Add issue template labels

* Lint

* standardizing jest-runner filenames to fit facebook standards

* allow `bail` setting to control when to bail out of a failing test run (jestjs#7335)

* standardizing file names in /e2e/before-all-filtered

* resolving naming discrepencies inside of files

* standardizing filenames in e2e/before-each-queue and corresponding tests

* standardizing several tests in ./e2e/__test__/

* standardizing filenames for babel-plugin-jest-hoist and related test files

* standardizing file-names for folders 'browser-support' and 'clear-cache' and their corresponding test files

* resolving issue with karma referencing non-standard browserTest

* resolving issue with karma referencing non-standard browserTest filename

* standardizing file names in e2e/__test__

* standardizing file names in compare-dom-nodes

* standardizing file names for coverage-report and coverage-remap

* updating case sensitive filenames

* renaming files to fit facebook standards

* adding case sensitive file changes

* resolving dependency issues after renaming case sensitive files.

* standardizing file names to fit facebook standards

* adjusting file names and snapshots to fit facebook standards

* adjusting file names to fit facebook standards

* resolves bug with nodeAssertionError not being found by test suite

* changing references to match file name

* changing file name to check test-jest-circus

* readding a previously deleted snapshot

* Update e2e/bad-source-map/__tests__/badSourceMap.js comment to reflect new file name

Co-Authored-By: GGonryun <amodestduck@gmail.com>

* improving file naming conventions letters g & j

* changing filename to fit facebook standards

* renaming filenames to fit facebook standards for 'L'

* renaming filenames to fit facebook standards for 'M'

* renaming filenames to fit facebook standards for 'N'

* resolving leftover merge conflicts

* reverting error in naming by changing filename back to uppercase

* renaming filenames 'O' to fit facebook standards.

* renaming filenames 'P' to fit facebook standards.

* renaming filenames 'R' to fit facebook standards.

* renaming filenames 'S' to fit facebook standards.

* changing regex to match temporary folder name

* renaming filenames 'T' to fit facebook standards.

* renaming filenames 'U' to fit facebook standards.

* renaming filenames 'V' to fit facebook standards.

* renaming filenames 'W' to fit facebook standards.

* updating snapshots to reflect standardized file names

* Rename e2e/test-name-pattern-skipped/package.json to e2e/test-name-pattern-temp/package.json

* Rename e2e/test-name-pattern/package.json to e2e/test-name-pattern-skipped/package.json

* Rename e2e/test-name-pattern-skipped/package.json to e2e/test-name-pattern.package.json

* Rename e2e/test-name-pattern-temp/package.json to e2e/test-name-pattern/package.json

* Rename e2e/test-name-pattern.package.json to e2e/test-name-pattern-skipped/package.json

* removing left over files and adjusting file names previously missed

* deleting more leftover files
@github-actions
Copy link

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants