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

Add test to check for Contributor and Contributor+ Checklists #9772

Merged
merged 39 commits into from
Sep 2, 2022

Conversation

AndrewGable
Copy link
Contributor

@AndrewGable AndrewGable commented Jul 7, 2022

Details

Adds a check for a complete contributor and contributor plus checklist on every PR. It works as follows:

  1. Triggered when a PR is created, body of the PR is edited, or a comment is made or edited.
  2. Looks through the entire comment history
  3. Looks and sees if it contains both the completed C and C+ checklist

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/214975

Tests

  1. This test should fail on this PR at the start
  2. I will check them all off and you should notice the error message will change
  3. The "final reviewer" will leave a completed C+ checklist
  4. The test should then pass

PR Review Checklist

Contributor (PR Author) Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • Any functional components have the displayName property
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

PR Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • Any functional components have the displayName property
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

QA Steps

  • Verify that no errors appear in the JS console

@AndrewGable AndrewGable requested a review from roryabraham July 7, 2022 22:25
@AndrewGable AndrewGable requested a review from a team as a code owner July 7, 2022 22:25
@AndrewGable AndrewGable self-assigned this Jul 7, 2022
@melvin-bot melvin-bot bot requested review from amyevans and removed request for a team July 7, 2022 22:26
@AndrewGable AndrewGable changed the title Add test to check for Contributor and Contributor+ Checklists [HOLD]Add test to check for Contributor and Contributor+ Checklists Jul 7, 2022
@AndrewGable
Copy link
Contributor Author

Test is failing for a different reason than expected, I will look into it.

@AndrewGable
Copy link
Contributor Author

Ok this is now failing as expected per the tests

@AndrewGable
Copy link
Contributor Author

Tests still failing until a C+ (AKA reviewer) checks their checklist completely off.

@AndrewGable AndrewGable changed the title [HOLD]Add test to check for Contributor and Contributor+ Checklists Add test to check for Contributor and Contributor+ Checklists Jul 19, 2022
Copy link
Contributor

@amyevans amyevans left a comment

Choose a reason for hiding this comment

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

A couple thoughts, though not necessarily blockers

const _ = require('underscore');
const GitHubUtils = require('../../../libs/GithubUtils');

const issue = github.context.payload.issue ? github.context.payload.issue.number : github.context.payload.pull_request.number;
Copy link
Contributor

Choose a reason for hiding this comment

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

Are context, payload, and pull_request guaranteed to exist? Would be slightly safer to use optional chaining:

Suggested change
const issue = github.context.payload.issue ? github.context.payload.issue.number : github.context.payload.pull_request.number;
const issue = github.context?.payload?.issue ? github.context.payload.issue.number : github.context?.payload?.pull_request?.number;

return;
}

console.log('All checklist are complete 🎉');
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
console.log('All checklist are complete 🎉');
console.log('All checklists are complete 🎉');

.github/workflows/testChecklists.yml Outdated Show resolved Hide resolved
.github/workflows/testChecklists.yml Show resolved Hide resolved
Comment on lines 8 to 52
const contributorChecklist = `#### Contributor (PR Author) Checklist
- [x] I linked the correct issue in the \`### Fixed Issues\` section above
- [x] I wrote clear testing steps that cover the changes made in this PR
- [x] I added steps for local testing in the \`Tests\` section
- [x] I added steps for Staging and/or Production testing in the \`QA steps\` section
- [x] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- [x] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- [x] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
- [x] I ran the tests on **all platforms** & verified they passed on:
- [x] iOS / native
- [x] Android / native
- [x] iOS / Safari
- [x] Android / Chrome
- [x] MacOS / Chrome
- [x] MacOS / Desktop
- [x] I verified there are no console errors (if there’s a console error not related to the PR, report it or open an issue for it to be fixed)
- [x] I followed proper code patterns (see [Reviewing the code](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
- [x] I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. \`toggleReport\` and not \`onIconClick\`)
- [x] I verified that comments were added to code that is not self explanatory
- [x] I verified that any new or modified comments were clear, correct English, and explained “why” the code was doing something instead of only explaining “what” the code was doing.
- [x] I verified any copy / text shown in the product was added in all \`src/languages/*\` files
- [x] I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
- [x] I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named “index.js”. All platform-specific files are named for the platform the code supports as outlined in the README.
- [x] I verified the JSDocs style guidelines (in [\`STYLE.md\`](https://github.com/Expensify/App/blob/main/STYLE.md#jsdocs)) were followed
- [x] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- [x] I followed the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md)
- [x] I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like \`Avatar\`, I verified the components using \`Avatar\` are working as expected)
- [x] I verified all code is DRY (the PR does not include any logic written more than once, with the exception of tests)
- [x] I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
- [x] If a new component is created I verified that:
- [x] A similar component does not exist in the codebase
- [x] All props are defined accurately and each prop has a \`/** comment above it */\`
- [x] Any functional components have the \`displayName\` property
- [x] The file is named correctly
- [x] The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- [x] The only data being stored in the state is data necessary for rendering and nothing else
- [x] For Class Components, any internal methods passed to components event handlers are bound to \`this\` properly so there are no scoping issues (i.e. for \`onClick={this.submit}\` the method \`this.submit\` should be bound to \`this\` in the constructor)
- [x] Any internal methods bound to \`this\` are necessary to be bound (i.e. avoid \`this.submit = this.submit.bind(this);\` if \`this.submit\` is never passed to a component event handler like \`onClick\`)
- [x] All JSX used for rendering exists in the render method
- [x] The component has the minimum amount of code necessary for its purpose and it is
- [x] If a new CSS style is added I verified that:
- [x] A similar style doesn’t already exist
- [x] The style can’t be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. \`StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG\`)
- [x] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like \`Avatar\` is modified, I verified that \`Avatar\` is working as expected in all cases)
- [x] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.`;
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, I feel like this approach of essentially duplicating the checklist text here and searching for its presence via includes has the potential to create headaches. If the checklist text changes between the opening of the PR and the time it's being reviewed, the check could fail until the author/reviewer hunts down the latest version of the list and copy/pastes it in. For example there have been already updates to the checklist such as this since the opening of this PR. (I suppose you could argue that's a feature not a bug, but 😐). Without digging into the workflow code a bit, it might not be obvious how to fix the failure.

Additionally, the duplication means the lists are prone to diverging (e.g. if someone updates PULL_REQUEST_TEMPLATE.md without updating this file). Would it be possible to read the contents of the MD file (or the PR body?), use a regex to isolate the checklist, then search for any unchecked boxes instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Without digging into the workflow code a bit, it might not be obvious how to fix the failure.

This is all true and fair feedback! I can update the error message, but will also update the tests with this new change from main.

Would it be possible to read the contents of the MD file

Yes, it should be possible to read the PR checklist template as it's in the repo, but I do wonder if it's the direction we want to head in? We've been discussing how to improve this and have been discussing possibly having a bot comment with the checklist depending on the contents of the PR.

Additionally, I did initially try doing this via regex, and it's a very nasty regex.

Copy link
Contributor

Choose a reason for hiding this comment

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

having a bot comment with the checklist depending on the contents of the PR

Oh nice, that does sound like a fabulous alternative

it's a very nasty regex

😬 Fair

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok so for now can we use this as a "V1" and then improve with a 🤖 in the future for specific PR checklists?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, I'm on board

@AndrewGable
Copy link
Contributor Author

Bump

@amyevans
Copy link
Contributor

amyevans commented Aug 3, 2022

As I check off each box it's triggering the GitHub action to run - I wonder if there's a way to delay that?

@amyevans
Copy link
Contributor

amyevans commented Aug 3, 2022

I hadn't previously realized that checking off boxes that are in a <details> section closes the accordion each time, which is super obnoxious behavior GitHub 🙄 . Anyway, instead of continuing to use the UI to check them off, I edited the markdown in the OP, and that also prevents the GitHub Action from triggering a bunch of extra times.

However, now that all boxes are checked, the action is still failing @AndrewGable

@AndrewGable
Copy link
Contributor Author

Thank you Amy, I will look into this soon.

@melvin-bot

This comment was marked as outdated.

@AndrewGable
Copy link
Contributor Author

Ok @roryabraham and @amyevans this has been updated! I've tested it quite a lot and improved it from the V1. It now only runs on PR comments, PR reviews, and PRs that contain a checkbox item, so it should limit the noise.

@AndrewGable AndrewGable requested a review from amyevans August 31, 2022 15:53
amyevans
amyevans previously approved these changes Sep 2, 2022
@AndrewGable
Copy link
Contributor Author

@roryabraham Do you want to review?

description: Auth token for New Expensify Github
required: true
runs:
using: 'node12'
Copy link
Contributor

Choose a reason for hiding this comment

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

Use node 16?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah yes - I will update to use nvm version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Guess we can't, I will use node16 👍

@AndrewGable AndrewGable merged commit 74f5528 into main Sep 2, 2022
@AndrewGable AndrewGable deleted the andrew-checklist branch September 2, 2022 10:54
@melvin-bot melvin-bot bot added the Emergency label Sep 2, 2022
@melvin-bot
Copy link

melvin-bot bot commented Sep 2, 2022

@AndrewGable looks like this was merged without passing tests. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@AndrewGable
Copy link
Contributor Author

Tests had passed 👎

@OSBotify
Copy link
Contributor

OSBotify commented Sep 2, 2022

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

OSBotify commented Sep 5, 2022

🚀 Deployed to staging by @AndrewGable in version: 1.1.97-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 web 🕸 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants