Skip to content

Commit 0204cda

Browse files
johnstcnjohnstcn
committed
move to top-level test
1 parent ad1f40f commit 0204cda

File tree

1 file changed

+70
-70
lines changed

1 file changed

+70
-70
lines changed

‎coderd/workspaces_test.go

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2927,84 +2927,84 @@ func TestWorkspaceDormant(t *testing.T) {
29272927
require.NoError(t, err)
29282928
coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStop, database.WorkspaceTransitionStart)
29292929
})
2930+
}
29302931

2931-
t.Run("FavoriteUnfavorite", func(t *testing.T) {
2932-
t.Parallel()
2933-
// Given:
2934-
var (
2935-
auditRecorder = audit.NewMock()
2936-
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
2937-
Auditor: auditRecorder,
2938-
})
2939-
owner = coderdtest.CreateFirstUser(t, client)
2940-
memberClient, member = coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
2941-
wsb1 = dbfake.WorkspaceBuild(t, db, database.Workspace{OwnerID: member.ID, OrganizationID: owner.OrganizationID}).Do()
2942-
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{OwnerID: owner.UserID, OrganizationID: owner.OrganizationID}).Do()
2943-
)
2932+
func TestWorkspaceFavoriteUnfavorite(t *testing.T) {
2933+
t.Parallel()
2934+
// Given:
2935+
var (
2936+
auditRecorder = audit.NewMock()
2937+
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
2938+
Auditor: auditRecorder,
2939+
})
2940+
owner = coderdtest.CreateFirstUser(t, client)
2941+
memberClient, member = coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
2942+
wsb1 = dbfake.WorkspaceBuild(t, db, database.Workspace{OwnerID: member.ID, OrganizationID: owner.OrganizationID}).Do()
2943+
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{OwnerID: owner.UserID, OrganizationID: owner.OrganizationID}).Do()
2944+
)
29442945

2945-
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
2946-
defer cancel()
2946+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
2947+
defer cancel()
29472948

2948-
// Initially, workspace should not be favored for member.
2949-
workspaces, err := memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
2950-
require.NoError(t, err)
2951-
require.Len(t, workspaces.Workspaces, 1)
2952-
require.False(t, workspaces.Workspaces[0].Favored)
2953-
ws, err := memberClient.Workspace(ctx, wsb1.Workspace.ID)
2954-
require.NoError(t, err)
2955-
require.False(t, ws.Favored)
2949+
// Initially, workspace should not be favored for member.
2950+
workspaces, err := memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
2951+
require.NoError(t, err)
2952+
require.Len(t, workspaces.Workspaces, 1)
2953+
require.False(t, workspaces.Workspaces[0].Favored)
2954+
ws, err := memberClient.Workspace(ctx, wsb1.Workspace.ID)
2955+
require.NoError(t, err)
2956+
require.False(t, ws.Favored)
29562957

2957-
// Also not for owner.
2958-
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
2959-
require.NoError(t, err)
2960-
require.Len(t, workspaces.Workspaces, 2)
2961-
require.False(t, workspaces.Workspaces[0].Favored)
2962-
require.False(t, workspaces.Workspaces[1].Favored)
2958+
// Also not for owner.
2959+
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
2960+
require.NoError(t, err)
2961+
require.Len(t, workspaces.Workspaces, 2)
2962+
require.False(t, workspaces.Workspaces[0].Favored)
2963+
require.False(t, workspaces.Workspaces[1].Favored)
29632964

2964-
// When member pins workspace
2965-
err = memberClient.FavoriteWorkspace(ctx, wsb1.Workspace.ID)
2966-
require.NoError(t, err)
2965+
// When member pins workspace
2966+
err = memberClient.FavoriteWorkspace(ctx, wsb1.Workspace.ID)
2967+
require.NoError(t, err)
29672968

2968-
// Then it should be favored for them
2969-
workspaces, err = memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
2970-
require.NoError(t, err)
2971-
require.Len(t, workspaces.Workspaces, 1)
2972-
require.True(t, workspaces.Workspaces[0].Favored)
2973-
ws, err = memberClient.Workspace(ctx, wsb1.Workspace.ID)
2974-
require.NoError(t, err)
2975-
require.True(t, ws.Favored)
2969+
// Then it should be favored for them
2970+
workspaces, err = memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
2971+
require.NoError(t, err)
2972+
require.Len(t, workspaces.Workspaces, 1)
2973+
require.True(t, workspaces.Workspaces[0].Favored)
2974+
ws, err = memberClient.Workspace(ctx, wsb1.Workspace.ID)
2975+
require.NoError(t, err)
2976+
require.True(t, ws.Favored)
29762977

2977-
// But not for someone else
2978-
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
2979-
require.NoError(t, err)
2980-
require.Len(t, workspaces.Workspaces, 2)
2981-
require.False(t, workspaces.Workspaces[0].Favored)
2982-
require.False(t, workspaces.Workspaces[1].Favored)
2983-
ws, err = client.Workspace(ctx, wsb1.Workspace.ID)
2984-
require.NoError(t, err)
2985-
require.False(t, ws.Favored)
2978+
// But not for someone else
2979+
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
2980+
require.NoError(t, err)
2981+
require.Len(t, workspaces.Workspaces, 2)
2982+
require.False(t, workspaces.Workspaces[0].Favored)
2983+
require.False(t, workspaces.Workspaces[1].Favored)
2984+
ws, err = client.Workspace(ctx, wsb1.Workspace.ID)
2985+
require.NoError(t, err)
2986+
require.False(t, ws.Favored)
29862987

2987-
// When member unpins workspace
2988-
err = memberClient.UnfavoriteWorkspace(ctx, wsb1.Workspace.ID)
2989-
require.NoError(t, err)
2988+
// When member unpins workspace
2989+
err = memberClient.UnfavoriteWorkspace(ctx, wsb1.Workspace.ID)
2990+
require.NoError(t, err)
29902991

2991-
// Then it should no longer be favored
2992-
workspaces, err = memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
2993-
require.NoError(t, err)
2994-
require.Len(t, workspaces.Workspaces, 1)
2995-
require.False(t, workspaces.Workspaces[0].Favored)
2996-
ws, err = memberClient.Workspace(ctx, wsb1.Workspace.ID)
2997-
require.NoError(t, err)
2998-
require.False(t, ws.Favored)
2992+
// Then it should no longer be favored
2993+
workspaces, err = memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
2994+
require.NoError(t, err)
2995+
require.Len(t, workspaces.Workspaces, 1)
2996+
require.False(t, workspaces.Workspaces[0].Favored)
2997+
ws, err = memberClient.Workspace(ctx, wsb1.Workspace.ID)
2998+
require.NoError(t, err)
2999+
require.False(t, ws.Favored)
29993000

3000-
// Assert invariant: workspace should remain unpinned for a different user
3001-
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
3002-
require.NoError(t, err)
3003-
require.Len(t, workspaces.Workspaces, 2)
3004-
require.False(t, workspaces.Workspaces[0].Favored)
3005-
require.False(t, workspaces.Workspaces[1].Favored)
3006-
ws, err = client.Workspace(ctx, wsb1.Workspace.ID)
3007-
require.NoError(t, err)
3008-
require.False(t, ws.Favored)
3009-
})
3001+
// Assert invariant: workspace should remain unpinned for a different user
3002+
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
3003+
require.NoError(t, err)
3004+
require.Len(t, workspaces.Workspaces, 2)
3005+
require.False(t, workspaces.Workspaces[0].Favored)
3006+
require.False(t, workspaces.Workspaces[1].Favored)
3007+
ws, err = client.Workspace(ctx, wsb1.Workspace.ID)
3008+
require.NoError(t, err)
3009+
require.False(t, ws.Favored)
30103010
}

0 commit comments

Comments
 (0)