From b2bdfce365ff412680b3415e64e14574620c1154 Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 24 Jan 2020 22:53:18 +0100 Subject: [PATCH] Fix integration tests --- pkg/integrations/login_test.go | 10 +++++----- pkg/integrations/register_test.go | 14 +++++++------- pkg/integrations/user_change_password_test.go | 8 ++++---- pkg/integrations/user_confirm_email_test.go | 8 ++++---- .../user_password_request_token_test.go | 6 +++--- pkg/integrations/user_password_reset_test.go | 6 +++--- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkg/integrations/login_test.go b/pkg/integrations/login_test.go index 546e0270c..e6ad21810 100644 --- a/pkg/integrations/login_test.go +++ b/pkg/integrations/login_test.go @@ -17,8 +17,8 @@ package integrations import ( - "code.vikunja.io/api/pkg/models" apiv1 "code.vikunja.io/api/pkg/routes/api/v1" + "code.vikunja.io/api/pkg/user" "github.com/stretchr/testify/assert" "net/http" "testing" @@ -36,7 +36,7 @@ func TestLogin(t *testing.T) { t.Run("Empty payload", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.Login, `{}`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeNoUsernamePassword) + assertHandlerErrorCode(t, err, user.ErrCodeNoUsernamePassword) }) t.Run("Not existing user", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.Login, `{ @@ -44,7 +44,7 @@ func TestLogin(t *testing.T) { "password": "1234" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeWrongUsernameOrPassword) + assertHandlerErrorCode(t, err, user.ErrCodeWrongUsernameOrPassword) }) t.Run("Wrong password", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.Login, `{ @@ -52,7 +52,7 @@ func TestLogin(t *testing.T) { "password": "wrong" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeWrongUsernameOrPassword) + assertHandlerErrorCode(t, err, user.ErrCodeWrongUsernameOrPassword) }) t.Run("user with unconfirmed email", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.Login, `{ @@ -60,6 +60,6 @@ func TestLogin(t *testing.T) { "password": "1234" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeEmailNotConfirmed) + assertHandlerErrorCode(t, err, user.ErrCodeEmailNotConfirmed) }) } diff --git a/pkg/integrations/register_test.go b/pkg/integrations/register_test.go index 34b28de03..3ce59a083 100644 --- a/pkg/integrations/register_test.go +++ b/pkg/integrations/register_test.go @@ -17,8 +17,8 @@ package integrations import ( - "code.vikunja.io/api/pkg/models" apiv1 "code.vikunja.io/api/pkg/routes/api/v1" + "code.vikunja.io/api/pkg/user" "github.com/stretchr/testify/assert" "net/http" "testing" @@ -37,7 +37,7 @@ func TestRegister(t *testing.T) { t.Run("Empty payload", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.RegisterUser, `{}`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeNoUsernamePassword) + assertHandlerErrorCode(t, err, user.ErrCodeNoUsernamePassword) }) t.Run("Empty username", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.RegisterUser, `{ @@ -46,7 +46,7 @@ func TestRegister(t *testing.T) { "email": "email@example.com" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeNoUsernamePassword) + assertHandlerErrorCode(t, err, user.ErrCodeNoUsernamePassword) }) t.Run("Empty password", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.RegisterUser, `{ @@ -55,7 +55,7 @@ func TestRegister(t *testing.T) { "email": "email@example.com" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeNoUsernamePassword) + assertHandlerErrorCode(t, err, user.ErrCodeNoUsernamePassword) }) t.Run("Empty email", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.RegisterUser, `{ @@ -64,7 +64,7 @@ func TestRegister(t *testing.T) { "email": "" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeNoUsernamePassword) + assertHandlerErrorCode(t, err, user.ErrCodeNoUsernamePassword) }) t.Run("Already existing username", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.RegisterUser, `{ @@ -73,7 +73,7 @@ func TestRegister(t *testing.T) { "email": "email@example.com" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrorCodeUsernameExists) + assertHandlerErrorCode(t, err, user.ErrorCodeUsernameExists) }) t.Run("Already existing email", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.RegisterUser, `{ @@ -82,6 +82,6 @@ func TestRegister(t *testing.T) { "email": "user1@example.com" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrorCodeUserEmailExists) + assertHandlerErrorCode(t, err, user.ErrorCodeUserEmailExists) }) } diff --git a/pkg/integrations/user_change_password_test.go b/pkg/integrations/user_change_password_test.go index 5d639e29e..e9afdc5ef 100644 --- a/pkg/integrations/user_change_password_test.go +++ b/pkg/integrations/user_change_password_test.go @@ -17,8 +17,8 @@ package integrations import ( - "code.vikunja.io/api/pkg/models" apiv1 "code.vikunja.io/api/pkg/routes/api/v1" + "code.vikunja.io/api/pkg/user" "github.com/stretchr/testify/assert" "net/http" "testing" @@ -39,7 +39,7 @@ func TestUserChangePassword(t *testing.T) { "old_password": "invalid" }`, nil, nil) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeWrongUsernameOrPassword) + assertHandlerErrorCode(t, err, user.ErrCodeWrongUsernameOrPassword) }) t.Run("Empty old password", func(t *testing.T) { _, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserChangePassword, &testuser1, `{ @@ -47,7 +47,7 @@ func TestUserChangePassword(t *testing.T) { "old_password": "" }`, nil, nil) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeEmptyOldPassword) + assertHandlerErrorCode(t, err, user.ErrCodeEmptyOldPassword) }) t.Run("Empty new password", func(t *testing.T) { _, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserChangePassword, &testuser1, `{ @@ -55,6 +55,6 @@ func TestUserChangePassword(t *testing.T) { "old_password": "1234" }`, nil, nil) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeEmptyNewPassword) + assertHandlerErrorCode(t, err, user.ErrCodeEmptyNewPassword) }) } diff --git a/pkg/integrations/user_confirm_email_test.go b/pkg/integrations/user_confirm_email_test.go index 9e439af2d..35bd769f5 100644 --- a/pkg/integrations/user_confirm_email_test.go +++ b/pkg/integrations/user_confirm_email_test.go @@ -17,8 +17,8 @@ package integrations import ( - "code.vikunja.io/api/pkg/models" apiv1 "code.vikunja.io/api/pkg/routes/api/v1" + "code.vikunja.io/api/pkg/user" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" "net/http" @@ -35,16 +35,16 @@ func TestUserConfirmEmail(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.UserConfirmEmail, `{}`) assert.Error(t, err) assert.Equal(t, http.StatusPreconditionFailed, err.(*echo.HTTPError).Code) - assertHandlerErrorCode(t, err, models.ErrCodeInvalidEmailConfirmToken) + assertHandlerErrorCode(t, err, user.ErrCodeInvalidEmailConfirmToken) }) t.Run("Empty token", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.UserConfirmEmail, `{"token": ""}`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeInvalidEmailConfirmToken) + assertHandlerErrorCode(t, err, user.ErrCodeInvalidEmailConfirmToken) }) t.Run("Invalid token", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.UserConfirmEmail, `{"token": "invalidToken"}`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeInvalidEmailConfirmToken) + assertHandlerErrorCode(t, err, user.ErrCodeInvalidEmailConfirmToken) }) } diff --git a/pkg/integrations/user_password_request_token_test.go b/pkg/integrations/user_password_request_token_test.go index e171d7b8b..12f1f72cd 100644 --- a/pkg/integrations/user_password_request_token_test.go +++ b/pkg/integrations/user_password_request_token_test.go @@ -17,8 +17,8 @@ package integrations import ( - "code.vikunja.io/api/pkg/models" apiv1 "code.vikunja.io/api/pkg/routes/api/v1" + "code.vikunja.io/api/pkg/user" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" "net/http" @@ -34,7 +34,7 @@ func TestUserRequestResetPasswordToken(t *testing.T) { t.Run("Empty payload", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.UserRequestResetPasswordToken, `{}`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeNoUsernamePassword) + assertHandlerErrorCode(t, err, user.ErrCodeNoUsernamePassword) }) t.Run("Invalid email address", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.UserRequestResetPasswordToken, `{"email": "user1example.com"}`) @@ -44,6 +44,6 @@ func TestUserRequestResetPasswordToken(t *testing.T) { t.Run("No user with that email address", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.UserRequestResetPasswordToken, `{"email": "user1000@example.com"}`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeUserDoesNotExist) + assertHandlerErrorCode(t, err, user.ErrCodeUserDoesNotExist) }) } diff --git a/pkg/integrations/user_password_reset_test.go b/pkg/integrations/user_password_reset_test.go index 50e09c899..28867b218 100644 --- a/pkg/integrations/user_password_reset_test.go +++ b/pkg/integrations/user_password_reset_test.go @@ -17,8 +17,8 @@ package integrations import ( - "code.vikunja.io/api/pkg/models" apiv1 "code.vikunja.io/api/pkg/routes/api/v1" + "code.vikunja.io/api/pkg/user" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" "net/http" @@ -45,7 +45,7 @@ func TestUserPasswordReset(t *testing.T) { "token": "passwordresettesttoken" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeNoUsernamePassword) + assertHandlerErrorCode(t, err, user.ErrCodeNoUsernamePassword) }) t.Run("Invalid password reset token", func(t *testing.T) { _, err := newTestRequest(t, http.MethodPost, apiv1.UserResetPassword, `{ @@ -53,6 +53,6 @@ func TestUserPasswordReset(t *testing.T) { "token": "invalidtoken" }`) assert.Error(t, err) - assertHandlerErrorCode(t, err, models.ErrCodeInvalidPasswordResetToken) + assertHandlerErrorCode(t, err, user.ErrCodeInvalidPasswordResetToken) }) }