Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Chloe task17 #13

Merged
merged 10 commits into from
Nov 7, 2022
Merged

Chloe task17 #13

merged 10 commits into from
Nov 7, 2022

Conversation

chloe684
Copy link
Contributor

@chloe684 chloe684 commented Nov 6, 2022

Added two methods in TownController that emit events to the townService + associated tests in TownController.tests:

  • clickedAcceptConvAreaInvite
  • clickedDeclineConvAreaInvite

Added two new events in CoveyTownSocket (which the two methods above emit).
Added two new listeners in Town that catch these two new events & call acceptConversationAreaInvite and declineConversationAreaInvite respectively + associated tests in Town.tests.

Also did some cleanup:

  • added back in TownController tests (for decline, send, cancel friend request) which got accidentally removed I think
  • removed some stale comments
  • modified declineConversationAreaInvite to take in a TeleportInviteSingular type instead, the same way acceptConversationAreaInvite does

…Modified backend declineConvAreaInvite to take in a TeleportInviteSingular type instead and modified tests accordingly. Added back in some of the TownController clicked method tests that for some reason had been removed
Copy link
Contributor

@dylanmarin dylanmarin left a comment

Choose a reason for hiding this comment

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

couple of comments but looks good

will approve though and leave you to make those changes since they are minor

frontend/src/classes/TownController.ts Show resolved Hide resolved
townService/src/town/Town.test.ts Show resolved Hide resolved
townService/src/town/Town.test.ts Show resolved Hide resolved
@taylor-stevens taylor-stevens added this to the Sprint 2 milestone Nov 6, 2022
@taylor-stevens taylor-stevens added documentation Improvements or additions to documentation enhancement New feature or request tests New tests for the added code labels Nov 6, 2022
Copy link
Contributor

@jafedor jafedor left a comment

Choose a reason for hiding this comment

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

Overall functionality looks good, just a couple spelling things and testing idea to consider.

frontend/src/classes/TownController.ts Outdated Show resolved Hide resolved
frontend/src/classes/TownController.ts Outdated Show resolved Hide resolved
townService/src/town/Town.test.ts Show resolved Hide resolved
chloe684 and others added 3 commits November 7, 2022 07:38
typo

Co-authored-by: Jessica Fedor <71146773+jafedor@users.noreply.github.com>
Copy link
Collaborator

@taylor-stevens taylor-stevens left a comment

Choose a reason for hiding this comment

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

just some nit things, everything looks good to me!

Copy link
Contributor

@jafedor jafedor left a comment

Choose a reason for hiding this comment

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

Looks good to merge after suggested changes made.

@chloe684 chloe684 merged commit 9796287 into sprint1.5/2-dev Nov 7, 2022
@chloe684 chloe684 deleted the chloe-task17 branch November 7, 2022 15:51
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
documentation Improvements or additions to documentation enhancement New feature or request tests New tests for the added code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants