Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Remove shared state from tests #1888

Merged
merged 1 commit into from
Feb 28, 2021
Merged

Remove shared state from tests #1888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions internal/envstest/unit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,14 @@ func ExerciseIDNotFound(t *testing.T, membership *database.Membership, h http.Ha
t.Run("id_not_found", func(t *testing.T) {
t.Parallel()

mux := mux.NewRouter()
mux.Handle("/{id}", h)

ctx := project.TestContext(t)
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, membership)
ctx = controller.WithUser(ctx, membership.User)

w, r := BuildFormRequest(ctx, t, http.MethodGet, "/13940890", nil)
mux.ServeHTTP(w, r)
w, r := BuildFormRequest(ctx, t, http.MethodGet, "/", nil)
r = mux.SetURLVars(r, map[string]string{"id": "13940890"})
h.ServeHTTP(w, r)

if got, want := w.Code, http.StatusUnauthorized; got != want {
t.Errorf("Expected %d to be %d", got, want)
Expand Down
29 changes: 16 additions & 13 deletions pkg/controller/apikey/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,7 @@ func TestHandleCreate(t *testing.T) {
t.Parallel()

ctx := project.TestContext(t)
harness := envstest.NewServer(t, testDatabaseInstance)

realm, user, session, err := harness.ProvisionAndLogin()
if err != nil {
t.Fatal(err)
}
ctx = controller.WithSession(ctx, session)
harness := envstest.NewServerConfig(t, testDatabaseInstance)

c := apikey.New(harness.Cacher, harness.Database, harness.Renderer)
handler := c.HandleCreate()
Expand All @@ -60,9 +54,10 @@ func TestHandleCreate(t *testing.T) {
handler := c.HandleCreate()

ctx := ctx
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
Realm: &database.Realm{},
User: &database.User{},
Permissions: rbac.APIKeyWrite,
})

Expand All @@ -81,9 +76,10 @@ func TestHandleCreate(t *testing.T) {
t.Parallel()

ctx := ctx
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
Realm: &database.Realm{},
User: &database.User{},
Permissions: rbac.APIKeyWrite,
})

Expand All @@ -103,13 +99,20 @@ func TestHandleCreate(t *testing.T) {
t.Run("success", func(t *testing.T) {
t.Parallel()

session := &sessions.Session{}
realm, err := harness.Database.FindRealm(1)
if err != nil {
t.Fatal(err)
}

session := &sessions.Session{
Values: make(map[interface{}]interface{}),
}

ctx := ctx
ctx = controller.WithSession(ctx, session)
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
User: &database.User{},
Permissions: rbac.APIKeyWrite,
})

Expand Down
53 changes: 34 additions & 19 deletions pkg/controller/apikey/disable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,14 @@ import (
"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/rbac"
"github.com/gorilla/mux"
"github.com/gorilla/sessions"
)

func TestHandleDisable(t *testing.T) {
t.Parallel()

ctx := project.TestContext(t)
harness := envstest.NewServer(t, testDatabaseInstance)

realm, user, session, err := harness.ProvisionAndLogin()
if err != nil {
t.Fatal(err)
}
ctx = controller.WithSession(ctx, session)

authApp := &database.AuthorizedApp{
RealmID: realm.ID,
Name: "Appy",
}
if _, err := realm.CreateAuthorizedApp(harness.Database, authApp, database.SystemTest); err != nil {
t.Fatal(err)
}
harness := envstest.NewServerConfig(t, testDatabaseInstance)

c := apikey.New(harness.Cacher, harness.Database, harness.Renderer)
handler := c.HandleDisable()
Expand All @@ -58,22 +45,36 @@ func TestHandleDisable(t *testing.T) {
envstest.ExerciseMembershipMissing(t, handler)
envstest.ExercisePermissionMissing(t, handler)
envstest.ExerciseIDNotFound(t, &database.Membership{
Realm: realm,
User: user,
Realm: &database.Realm{},
User: &database.User{},
Permissions: rbac.APIKeyWrite,
}, handler)
})

t.Run("internal_error", func(t *testing.T) {
t.Parallel()

realm, err := harness.Database.FindRealm(1)
if err != nil {
t.Fatal(err)
}

authApp := &database.AuthorizedApp{
RealmID: realm.ID,
Name: "Appy1",
}
if _, err := realm.CreateAuthorizedApp(harness.Database, authApp, database.SystemTest); err != nil {
t.Fatal(err)
}

c := apikey.New(harness.Cacher, harness.BadDatabase, harness.Renderer)
handler := c.HandleDisable()

ctx := ctx
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
User: &database.User{},
Permissions: rbac.APIKeyWrite,
})

Expand All @@ -89,10 +90,24 @@ func TestHandleDisable(t *testing.T) {
t.Run("success", func(t *testing.T) {
t.Parallel()

realm, err := harness.Database.FindRealm(1)
if err != nil {
t.Fatal(err)
}

authApp := &database.AuthorizedApp{
RealmID: realm.ID,
Name: "Appy2",
}
if _, err := realm.CreateAuthorizedApp(harness.Database, authApp, database.SystemTest); err != nil {
t.Fatal(err)
}

ctx := ctx
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
User: &database.User{},
Permissions: rbac.APIKeyWrite,
})

Expand Down
65 changes: 42 additions & 23 deletions pkg/controller/apikey/enable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,15 @@ import (
"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/rbac"
"github.com/gorilla/mux"
"github.com/gorilla/sessions"
"github.com/jinzhu/gorm"
)

func TestHandleEnable(t *testing.T) {
t.Parallel()

ctx := project.TestContext(t)
harness := envstest.NewServer(t, testDatabaseInstance)

realm, user, session, err := harness.ProvisionAndLogin()
if err != nil {
t.Fatal(err)
}
ctx = controller.WithSession(ctx, session)

now := time.Now().UTC().Add(-5 * time.Second)
authApp := &database.AuthorizedApp{
RealmID: realm.ID,
Name: "Appy",
Model: gorm.Model{
DeletedAt: &now,
},
}
if _, err := realm.CreateAuthorizedApp(harness.Database, authApp, database.SystemTest); err != nil {
t.Fatal(err)
}
harness := envstest.NewServerConfig(t, testDatabaseInstance)

c := apikey.New(harness.Cacher, harness.Database, harness.Renderer)
handler := c.HandleEnable()
Expand All @@ -64,8 +47,8 @@ func TestHandleEnable(t *testing.T) {
envstest.ExerciseMembershipMissing(t, handler)
envstest.ExercisePermissionMissing(t, handler)
envstest.ExerciseIDNotFound(t, &database.Membership{
Realm: realm,
User: user,
Realm: &database.Realm{},
User: &database.User{},
Permissions: rbac.APIKeyWrite,
}, handler)
})
Expand All @@ -76,10 +59,28 @@ func TestHandleEnable(t *testing.T) {
c := apikey.New(harness.Cacher, harness.BadDatabase, harness.Renderer)
handler := c.HandleEnable()

realm, err := harness.Database.FindRealm(1)
if err != nil {
t.Fatal(err)
}

now := time.Now().UTC().Add(-5 * time.Second)
authApp := &database.AuthorizedApp{
RealmID: realm.ID,
Name: "Appy1",
Model: gorm.Model{
DeletedAt: &now,
},
}
if _, err := realm.CreateAuthorizedApp(harness.Database, authApp, database.SystemTest); err != nil {
t.Fatal(err)
}

ctx := ctx
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
User: &database.User{},
Permissions: rbac.APIKeyWrite,
})

Expand All @@ -95,10 +96,28 @@ func TestHandleEnable(t *testing.T) {
t.Run("success", func(t *testing.T) {
t.Parallel()

realm, err := harness.Database.FindRealm(1)
if err != nil {
t.Fatal(err)
}

now := time.Now().UTC().Add(-5 * time.Second)
authApp := &database.AuthorizedApp{
RealmID: realm.ID,
Name: "Appy2",
Model: gorm.Model{
DeletedAt: &now,
},
}
if _, err := realm.CreateAuthorizedApp(harness.Database, authApp, database.SystemTest); err != nil {
t.Fatal(err)
}

ctx := ctx
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
User: &database.User{},
Permissions: rbac.APIKeyWrite,
})

Expand Down
42 changes: 22 additions & 20 deletions pkg/controller/apikey/index_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,14 @@ import (
"github.com/google/exposure-notifications-verification-server/pkg/controller/middleware"
"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/rbac"
"github.com/gorilla/sessions"
)

func TestHandleIndex(t *testing.T) {
t.Parallel()

ctx := project.TestContext(t)
harness := envstest.NewServer(t, testDatabaseInstance)

realm, user, session, err := harness.ProvisionAndLogin()
if err != nil {
t.Fatal(err)
}
ctx = controller.WithSession(ctx, session)

authApp := &database.AuthorizedApp{
RealmID: realm.ID,
Name: "Appy",
}
if _, err := realm.CreateAuthorizedApp(harness.Database, authApp, database.SystemTest); err != nil {
t.Fatal(err)
}
harness := envstest.NewServerConfig(t, testDatabaseInstance)

c := apikey.New(harness.Cacher, harness.Database, harness.Renderer)
handler := middleware.InjectCurrentPath()(c.HandleIndex())
Expand All @@ -56,8 +43,8 @@ func TestHandleIndex(t *testing.T) {
envstest.ExerciseMembershipMissing(t, handler)
envstest.ExercisePermissionMissing(t, handler)
envstest.ExerciseBadPagination(t, &database.Membership{
Realm: realm,
User: user,
Realm: &database.Realm{},
User: &database.User{},
Permissions: rbac.APIKeyRead,
}, handler)
})
Expand All @@ -69,9 +56,10 @@ func TestHandleIndex(t *testing.T) {
handler := middleware.InjectCurrentPath()(c.HandleIndex())

ctx := ctx
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
Realm: &database.Realm{},
User: &database.User{},
Permissions: rbac.APIKeyRead,
})

Expand All @@ -86,10 +74,24 @@ func TestHandleIndex(t *testing.T) {
t.Run("success", func(t *testing.T) {
t.Parallel()

realm, err := harness.Database.FindRealm(1)
if err != nil {
t.Fatal(err)
}

authApp := &database.AuthorizedApp{
RealmID: realm.ID,
Name: "Appy",
}
if _, err := realm.CreateAuthorizedApp(harness.Database, authApp, database.SystemTest); err != nil {
t.Fatal(err)
}

ctx := ctx
ctx = controller.WithSession(ctx, &sessions.Session{})
ctx = controller.WithMembership(ctx, &database.Membership{
Realm: realm,
User: user,
User: &database.User{},
Permissions: rbac.APIKeyRead,
})

Expand Down
Loading