Skip to content

Commit

Permalink
Resolve conflicts on tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Dal-Papa committed Mar 29, 2024
1 parent 147a277 commit e5a5134
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
10 changes: 4 additions & 6 deletions auth/email_action_links_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,8 @@ func TestEmailVerificationLink(t *testing.T) {
}

want := map[string]interface{}{
"requestType": "VERIFY_EMAIL",
"email": testEmail,
"returnOobLink": true,
"requestType": "VERIFY_EMAIL",
"email": testEmail,
}
if err := checkActionLinkRequest(want, s); err != nil {
t.Fatalf("EmailVerificationLink() %v", err)
Expand Down Expand Up @@ -154,9 +153,8 @@ func TestPasswordResetLink(t *testing.T) {
}

want := map[string]interface{}{
"requestType": "PASSWORD_RESET",
"email": testEmail,
"returnOobLink": true,
"requestType": "PASSWORD_RESET",
"email": testEmail,
}
if err := checkActionLinkRequest(want, s); err != nil {
t.Fatalf("PasswordResetLink() %v", err)
Expand Down
10 changes: 4 additions & 6 deletions auth/tenant_mgt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,8 @@ func TestTenantEmailVerificationLink(t *testing.T) {
}

want := map[string]interface{}{
"requestType": "VERIFY_EMAIL",
"email": testEmail,
"returnOobLink": true,
"requestType": "VERIFY_EMAIL",
"email": testEmail,
}
if err := checkActionLinkRequestWithURL(want, wantEmailActionURL, s); err != nil {
t.Fatalf("EmailVerificationLink() %v", err)
Expand All @@ -530,9 +529,8 @@ func TestTenantPasswordResetLink(t *testing.T) {
}

want := map[string]interface{}{
"requestType": "PASSWORD_RESET",
"email": testEmail,
"returnOobLink": true,
"requestType": "PASSWORD_RESET",
"email": testEmail,
}
if err := checkActionLinkRequestWithURL(want, wantEmailActionURL, s); err != nil {
t.Fatalf("PasswordResetLink() %v", err)
Expand Down

0 comments on commit e5a5134

Please sign in to comment.