itaditya / trick-or-treat-game

Play it for free here
https://trick-or-treat.netlify.com/
16 stars 17 forks source link

Change from react-testing-library to testing-library/react #61

Closed LeviButcher closed 4 years ago

LeviButcher commented 4 years ago

As requested in #59

Let me know of anything else needed for this merge.

netlify[bot] commented 4 years ago

You can play this version of the game here

Built with commit 4ca5487b2cb16de549244846f433293e36105fcf

https://deploy-preview-61--trick-or-treat.netlify.com

LeviButcher commented 4 years ago

@itaditya I've updated my branch to resolve conflicts with master. I forced push to prevent from creating many commits.

I realized the format command isn't running on the tests directory. Would it be okay to change it to "prettier --write src/* src/*/"?

itaditya commented 4 years ago

That's a good catch @LeviButcher. Ideally a PR should focus only on one thing. Since prettier formatting is different from your work.

But for now, you can make the prettier change.

LeviButcher commented 4 years ago

@itaditya I've updated my branch with latest changes. The format command was breaking trying to format the mp3 file so I changed it to match only .js. But that's not a very good solution since we probably want css files formatted as well.

I can add in a css file match but want to make sure your fine with that and if there are any other patterns we should match on.

itaditya commented 4 years ago

@LeviButcher prettier has the option to ignore files as well. See this https://prettier.io/docs/en/ignore.html#ignoring-files

So we can say ignore mp3 file via .prettierignore file

LeviButcher commented 4 years ago

@itaditya Good to go. :+1:

itaditya commented 4 years ago

Can you run these commands-

git pull upstream master # get the latest code of my master in your fork's branch
npm install # install the dependencies so it auto-generates correct package-lock.json

This will automatically fix the merge conflicts.

itaditya commented 4 years ago

Congrats @LeviButcher