Skip to content

Commit 3d0a780

Browse files
authored
Merge pull request #20 from database-playground/pan93412/dbp-99-clean-up-backend-default-groups
DBP-99: clean up backend default groups
2 parents 653a5c9 + 7542a99 commit 3d0a780

19 files changed

+93
-1003
lines changed

cli/promote_test.go

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/database-playground/backend-v2/ent/group"
99
"github.com/database-playground/backend-v2/ent/user"
1010
"github.com/database-playground/backend-v2/internal/testhelper"
11+
"github.com/database-playground/backend-v2/internal/useraccount"
1112

1213
_ "github.com/mattn/go-sqlite3"
1314
)
@@ -24,17 +25,17 @@ func TestPromoteAdmin(t *testing.T) {
2425
t.Fatalf("Setup failed: %v", err)
2526
}
2627

27-
// Get the new-user group to assign to the user initially
28-
newUserGroup, err := entClient.Group.Query().Where(group.Name("new-user")).Only(ctx)
28+
// Get the student group to assign to the user initially
29+
studentGroup, err := entClient.Group.Query().Where(group.Name(useraccount.StudentGroupSlug)).Only(ctx)
2930
if err != nil {
30-
t.Fatalf("Failed to get new-user group: %v", err)
31+
t.Fatalf("Failed to get student group: %v", err)
3132
}
3233

3334
// Create a test user
3435
testUser, err := entClient.User.Create().
3536
SetEmail("[email protected]").
3637
SetName("Test User").
37-
SetGroup(newUserGroup).
38+
SetGroup(studentGroup).
3839
Save(ctx)
3940
if err != nil {
4041
t.Fatalf("Failed to create test user: %v", err)
@@ -148,17 +149,17 @@ func TestPromoteAdmin(t *testing.T) {
148149
t.Fatalf("Setup failed: %v", err)
149150
}
150151

151-
// Get the new-user group to assign to the user initially
152-
newUserGroup, err := entClient.Group.Query().Where(group.Name("new-user")).Only(ctx)
152+
// Get the student group to assign to the user initially
153+
studentGroup, err := entClient.Group.Query().Where(group.Name(useraccount.StudentGroupSlug)).Only(ctx)
153154
if err != nil {
154-
t.Fatalf("Failed to get new-user group: %v", err)
155+
t.Fatalf("Failed to get student group: %v", err)
155156
}
156157

157158
// Create a test user
158159
_, err = entClient.User.Create().
159160
SetEmail("[email protected]").
160161
SetName("Test User").
161-
SetGroup(newUserGroup).
162+
SetGroup(studentGroup).
162163
Save(ctx)
163164
if err != nil {
164165
t.Fatalf("Failed to create test user: %v", err)
@@ -188,17 +189,17 @@ func TestPromoteAdmin(t *testing.T) {
188189
t.Fatalf("Setup failed: %v", err)
189190
}
190191

191-
// Get the new-user group to assign to users initially
192-
newUserGroup, err := entClient.Group.Query().Where(group.Name("new-user")).Only(ctx)
192+
// Get the student group to assign to users initially
193+
studentGroup, err := entClient.Group.Query().Where(group.Name(useraccount.StudentGroupSlug)).Only(ctx)
193194
if err != nil {
194-
t.Fatalf("Failed to get new-user group: %v", err)
195+
t.Fatalf("Failed to get student group: %v", err)
195196
}
196197

197198
// Create multiple test users
198199
user1, err := entClient.User.Create().
199200
SetEmail("[email protected]").
200201
SetName("User 1").
201-
SetGroup(newUserGroup).
202+
SetGroup(studentGroup).
202203
Save(ctx)
203204
if err != nil {
204205
t.Fatalf("Failed to create user1: %v", err)
@@ -207,7 +208,7 @@ func TestPromoteAdmin(t *testing.T) {
207208
user2, err := entClient.User.Create().
208209
SetEmail("[email protected]").
209210
SetName("User 2").
210-
SetGroup(newUserGroup).
211+
SetGroup(studentGroup).
211212
Save(ctx)
212213
if err != nil {
213214
t.Fatalf("Failed to create user2: %v", err)
@@ -271,17 +272,17 @@ func TestPromoteAdmin(t *testing.T) {
271272
t.Fatalf("Setup failed: %v", err)
272273
}
273274

274-
// Get the new-user group to assign to the user initially
275-
newUserGroup, err := entClient.Group.Query().Where(group.Name("new-user")).Only(ctx)
275+
// Get the student group to assign to the user initially
276+
studentGroup, err := entClient.Group.Query().Where(group.Name(useraccount.StudentGroupSlug)).Only(ctx)
276277
if err != nil {
277-
t.Fatalf("Failed to get new-user group: %v", err)
278+
t.Fatalf("Failed to get student group: %v", err)
278279
}
279280

280281
// Create a test user with lowercase email
281282
_, err = entClient.User.Create().
282283
SetEmail("[email protected]").
283284
SetName("Test User").
284-
SetGroup(newUserGroup).
285+
SetGroup(studentGroup).
285286
Save(ctx)
286287
if err != nil {
287288
t.Fatalf("Failed to create test user: %v", err)

0 commit comments

Comments
 (0)