toby3d/auth
toby3d
/
auth
1
0
Fork 0
Code Actions Packages Releases Activity

➖ Removed require dependency

This commit is contained in:
Maxim Lebedev 2022-02-02 00:17:22 +05:00
parent 39f4bfd714
commit d5448c3766
Signed by: toby3d
GPG Key ID: 1F14E25B7C119FC5
8 changed files with 80 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/client/repository/http/http_client_test.go
View File

@ -6,7 +6,6 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
http "github.com/valyala/fasthttp"
repository "source.toby3d.me/website/indieauth/internal/client/repository/http"
@ -41,7 +40,9 @@ func TestGet(t *testing.T) {
t.Cleanup(cleanup)
result, err := repository.NewHTTPClientRepository(httpClient).Get(context.TODO(), client.ID)
require.NoError(t, err)
if err != nil {
t.Fatal(err)
}
assert.Equal(t, client.Name, result.Name)
assert.Equal(t, client.ID.String(), result.ID.String())

6
internal/health/delivery/http/health_http_test.go
View File

@ -5,7 +5,6 @@ import (
"github.com/fasthttp/router"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
http "github.com/valyala/fasthttp"
delivery "source.toby3d.me/website/indieauth/internal/health/delivery/http"
@ -27,7 +26,10 @@ func TestRequestHandler(t *testing.T) {
resp := http.AcquireResponse()
defer http.ReleaseResponse(resp)
require.NoError(t, client.Do(req, resp))
if err := client.Do(req, resp); err != nil {
t.Fatal(err)
}
assert.Equal(t, http.StatusOK, resp.StatusCode())
assert.Equal(t, `{"ok": true}`, string(resp.Body()))
}

40
internal/ticket/repository/memory/memory_ticket_test.go
View File

@ -3,13 +3,11 @@ package memory_test
import (
"context"
"path"
"reflect"
"sync"
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"source.toby3d.me/website/indieauth/internal/domain"
repository "source.toby3d.me/website/indieauth/internal/ticket/repository/memory"
)
@ -20,15 +18,21 @@ func TestCreate(t *testing.T) {
store := new(sync.Map)
ticket := domain.TestTicket(t)
require.NoError(t, repository.NewMemoryTicketRepository(store, domain.TestConfig(t)).
Create(context.TODO(), ticket))
if err := repository.NewMemoryTicketRepository(store, domain.TestConfig(t)).
Create(context.TODO(), ticket); err != nil {
t.Fatal(err)
}
src, ok := store.Load(path.Join(repository.DefaultPathPrefix, ticket.Ticket))
require.True(t, ok)
storePath := path.Join(repository.DefaultPathPrefix, ticket.Ticket)
result, ok := src.(*repository.Ticket)
require.True(t, ok)
assert.Equal(t, ticket, result.Ticket)
src, ok := store.Load(storePath)
if !ok {
t.Fatalf("Load(%s) = %t, want %t", storePath, ok, true)
}
if result, _ := src.(*repository.Ticket); !reflect.DeepEqual(result.Ticket, ticket) {
t.Errorf("Create(%+v) = %+v, want %+v", ticket, result.Ticket, ticket)
}
}
func TestGetAndDelete(t *testing.T) {
@ -44,10 +48,16 @@ func TestGetAndDelete(t *testing.T) {
result, err := repository.NewMemoryTicketRepository(store, domain.TestConfig(t)).
GetAndDelete(context.TODO(), ticket.Ticket)
require.NoError(t, err)
assert.Equal(t, ticket, result)
if err != nil {
t.Fatal(err)
}
src, ok := store.Load(path.Join(repository.DefaultPathPrefix, ticket.Ticket))
assert.False(t, ok)
assert.Nil(t, src)
if !reflect.DeepEqual(result, ticket) {
t.Errorf("GetAndDelete(%s) = %+v, want %+v", ticket.Ticket, result, ticket)
}
storePath := path.Join(repository.DefaultPathPrefix, ticket.Ticket)
if src, _ := store.Load(storePath); src != nil {
t.Errorf("Load(%s) = %+v, want %+v", storePath, src, nil)
}
}

6
internal/ticket/usecase/ticket_ucase_test.go
View File

@ -7,7 +7,6 @@ import (
"github.com/fasthttp/router"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
http "github.com/valyala/fasthttp"
"source.toby3d.me/website/indieauth/internal/common"
@ -41,7 +40,10 @@ func TestRedeem(t *testing.T) {
result, err := ucase.NewTicketUseCase(nil, client, domain.TestConfig(t)).
Redeem(context.TODO(), ticket)
require.NoError(t, err)
if err != nil {
t.Fatal(err)
}
assert.Equal(t, token.AccessToken, result.AccessToken)
assert.Equal(t, token.Me.String(), result.Me.String())
assert.Equal(t, token.Scope, result.Scope)

20
internal/token/delivery/http/token_http_test.go
View File

@ -9,7 +9,6 @@ import (
"github.com/fasthttp/router"
json "github.com/goccy/go-json"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
http "github.com/valyala/fasthttp"
"source.toby3d.me/website/indieauth/internal/common"
@ -62,11 +61,17 @@ func TestVerification(t *testing.T) {
resp := http.AcquireResponse()
defer http.ReleaseResponse(resp)
require.NoError(t, client.Do(req, resp))
if err := client.Do(req, resp); err != nil {
t.Fatal(err)
}
assert.Equal(t, http.StatusOK, resp.StatusCode())
result := new(delivery.TokenVerificationResponse)
require.NoError(t, json.Unmarshal(resp.Body(), result))
if err := json.Unmarshal(resp.Body(), result); err != nil {
t.Fatal(err)
}
assert.Equal(t, token.ClientID.String(), result.ClientID.String())
assert.Equal(t, token.Me.String(), result.Me.String())
assert.Equal(t, token.Scope.String(), result.Scope.String())
@ -107,12 +112,17 @@ func TestRevocation(t *testing.T) {
resp := http.AcquireResponse()
defer http.ReleaseResponse(resp)
require.NoError(t, client.Do(req, resp))
if err := client.Do(req, resp); err != nil {
t.Fatal(err)
}
assert.Equal(t, http.StatusOK, resp.StatusCode())
assert.Equal(t, `{}`, strings.TrimSpace(string(resp.Body())))
result, err := tokens.Get(context.TODO(), accessToken.AccessToken)
require.NoError(t, err)
if err != nil {
t.Fatal(err)
}
assert.Equal(t, accessToken.AccessToken, result.AccessToken)
}

5
internal/token/repository/memory/memory_token_test.go
View File

@ -7,7 +7,6 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"source.toby3d.me/website/indieauth/internal/domain"
"source.toby3d.me/website/indieauth/internal/token"
@ -21,7 +20,9 @@ func TestCreate(t *testing.T) {
accessToken := domain.TestToken(t)
repo := repository.NewMemoryTokenRepository(store)
require.NoError(t, repo.Create(context.TODO(), accessToken))
if err := repo.Create(context.TODO(), accessToken); err != nil {
t.Fatal(err)
}
result, ok := store.Load(path.Join(repository.DefaultPathPrefix, accessToken.AccessToken))
assert.True(t, ok)

31
internal/token/usecase/token_ucase_test.go
View File

@ -2,11 +2,11 @@ package usecase_test
import (
"context"
"errors"
"sync"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"source.toby3d.me/website/indieauth/internal/domain"
"source.toby3d.me/website/indieauth/internal/token"
@ -32,7 +32,10 @@ func TestVerify(t *testing.T) {
accessToken := domain.TestToken(t)
result, err := ucase.Verify(context.TODO(), accessToken.AccessToken)
require.NoError(t, err)
if err != nil {
t.Fatal(err)
}
assert.Equal(t, accessToken.AccessToken, result.AccessToken)
assert.Equal(t, accessToken.Scope, result.Scope)
assert.Equal(t, accessToken.ClientID.String(), result.ClientID.String())
@ -43,11 +46,18 @@ func TestVerify(t *testing.T) {
t.Parallel()
accessToken := domain.TestToken(t)
require.NoError(t, repo.Create(context.TODO(), accessToken))
if err := repo.Create(context.TODO(), accessToken); err != nil {
t.Fatal(err)
}
result, err := ucase.Verify(context.TODO(), accessToken.AccessToken)
require.ErrorIs(t, err, token.ErrRevoke)
assert.Nil(t, result)
if !errors.Is(err, token.ErrRevoke) {
t.Errorf("Verify(%s) = %v, want %v", accessToken.AccessToken, err, token.ErrRevoke)
}
if result != nil {
t.Errorf("Verify(%s) = %v, want %v", accessToken.AccessToken, result, nil)
}
})
}
@ -58,10 +68,15 @@ func TestRevoke(t *testing.T) {
accessToken := domain.TestToken(t)
repo := repository.NewMemoryTokenRepository(new(sync.Map))
require.NoError(t, usecase.NewTokenUseCase(repo, nil, config).
Revoke(context.TODO(), accessToken.AccessToken))
if err := usecase.NewTokenUseCase(repo, nil, config).
Revoke(context.TODO(), accessToken.AccessToken); err != nil {
t.Fatal(err)
}
result, err := repo.Get(context.TODO(), accessToken.AccessToken)
assert.NoError(t, err)
if err != nil {
t.Error(err)
}
assert.Equal(t, accessToken.AccessToken, result.AccessToken)
}

5
internal/user/repository/http/http_user_test.go
View File

@ -8,7 +8,6 @@ import (
"github.com/fasthttp/router"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
http "github.com/valyala/fasthttp"
"source.toby3d.me/website/indieauth/internal/common"
@ -45,7 +44,9 @@ func TestGet(t *testing.T) {
t.Cleanup(cleanup)
result, err := repository.NewHTTPUserRepository(client).Get(context.TODO(), user.Me)
require.NoError(t, err)
if err != nil {
t.Fatal(err)
}
// NOTE(toby3d): endpoints
assert.Equal(t, user.AuthorizationEndpoint.String(), result.AuthorizationEndpoint.String())