Skip to content

Commit

Permalink
Merge remote-tracking branch 'yukong/feature-#116' into feature-woowa…
Browse files Browse the repository at this point in the history
…course-teams#116

# Conflicts:
#	backend/src/main/resources/application.yml
#	backend/src/test/java/com/woowacourse/momo/fixture/MemberFixture.java
  • Loading branch information
kyukong committed Aug 2, 2022
2 parents a54a4b1 + a4db3c1 commit 97bad90
Showing 1 changed file with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
@SuppressWarnings("NonAsciiCharacters")
@Getter
public enum MemberFixture {

MOMO("momo", "qwe123!@#", "모모"),
DUDU("dudu", "qwe123!@#", "두두"),
GUGU("gugu", "qwe123!@#", "구구");

MOMO("[email protected]", "qwe123!@#", "momo"),
DUDU("[email protected]", "qwe123!@#", "dudu"),
INVALID_EMAIL("invalidEmail", "qwe123!@#", "invalidEmail"),
;

private final String userId;
private final String password;
Expand Down

0 comments on commit 97bad90

Please sign in to comment.