Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3789a52

Browse files
committed
chore: add tests for shared_with_user filter
1 parentff034db commit3789a52

File tree

2 files changed

+103
-2
lines changed

2 files changed

+103
-2
lines changed

‎coderd/searchquery/search_test.go‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,31 @@ func TestSearchWorkspace(t *testing.T) {
312312
},
313313
},
314314
},
315+
{
316+
Name:"SharedWithUser",
317+
Query:`shared_with_user:3dd8b1b8-dff5-4b22-8ae9-c243ca136ecf`,
318+
Setup:func(t*testing.T,db database.Store) {
319+
dbgen.User(t,db, database.User{
320+
ID:uuid.MustParse("3dd8b1b8-dff5-4b22-8ae9-c243ca136ecf"),
321+
})
322+
},
323+
Expected: database.GetWorkspacesParams{
324+
SharedWithUserID:uuid.MustParse("3dd8b1b8-dff5-4b22-8ae9-c243ca136ecf"),
325+
},
326+
},
327+
{
328+
Name:"SharedWithUserByName",
329+
Query:`shared_with_user:wibble`,
330+
Setup:func(t*testing.T,db database.Store) {
331+
dbgen.User(t,db, database.User{
332+
ID:uuid.MustParse("3dd8b1b8-dff5-4b22-8ae9-c243ca136ecf"),
333+
Username:"wibble",
334+
})
335+
},
336+
Expected: database.GetWorkspacesParams{
337+
SharedWithUserID:uuid.MustParse("3dd8b1b8-dff5-4b22-8ae9-c243ca136ecf"),
338+
},
339+
},
315340

316341
// Failures
317342
{

‎coderd/workspaces_test.go‎

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,7 +1813,7 @@ func TestWorkspaceFilter(t *testing.T) {
18131813
})
18141814
}
18151815

1816-
t.Run("SharedWithUser",func(t*testing.T) {
1816+
t.Run("Shared",func(t*testing.T) {
18171817
t.Parallel()
18181818

18191819
dv:=coderdtest.DeploymentValues(t)
@@ -1851,7 +1851,7 @@ func TestWorkspaceFilter(t *testing.T) {
18511851
require.Equal(t,workspaces.Workspaces[0].ID,sharedWorkspace.ID)
18521852
})
18531853

1854-
t.Run("NotSharedWithUser",func(t*testing.T) {
1854+
t.Run("NotShared",func(t*testing.T) {
18551855
t.Parallel()
18561856

18571857
dv:=coderdtest.DeploymentValues(t)
@@ -1888,6 +1888,82 @@ func TestWorkspaceFilter(t *testing.T) {
18881888
require.Equal(t,1,workspaces.Count,"expected only one workspace")
18891889
require.Equal(t,workspaces.Workspaces[0].ID,notSharedWorkspace.ID)
18901890
})
1891+
1892+
t.Run("SharedWithUserByID",func(t*testing.T) {
1893+
t.Parallel()
1894+
1895+
dv:=coderdtest.DeploymentValues(t)
1896+
dv.Experiments= []string{string(codersdk.ExperimentWorkspaceSharing)}
1897+
1898+
var (
1899+
client,db=coderdtest.NewWithDatabase(t,&coderdtest.Options{
1900+
DeploymentValues:dv,
1901+
})
1902+
orgOwner=coderdtest.CreateFirstUser(t,client)
1903+
_,workspaceOwner=coderdtest.CreateAnotherUser(t,client,orgOwner.OrganizationID,rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))
1904+
sharedWorkspace=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
1905+
OwnerID:workspaceOwner.ID,
1906+
OrganizationID:orgOwner.OrganizationID,
1907+
}).Do().Workspace
1908+
_=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
1909+
OwnerID:workspaceOwner.ID,
1910+
OrganizationID:orgOwner.OrganizationID,
1911+
}).Do().Workspace
1912+
_,toShareWithUser=coderdtest.CreateAnotherUser(t,client,orgOwner.OrganizationID)
1913+
ctx=testutil.Context(t,testutil.WaitMedium)
1914+
)
1915+
1916+
client.UpdateWorkspaceACL(ctx,sharedWorkspace.ID, codersdk.UpdateWorkspaceACL{
1917+
UserRoles:map[string]codersdk.WorkspaceRole{
1918+
toShareWithUser.ID.String():codersdk.WorkspaceRoleUse,
1919+
},
1920+
})
1921+
1922+
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
1923+
SharedWithUser:toShareWithUser.ID.String(),
1924+
})
1925+
require.NoError(t,err,"fetch workspaces")
1926+
require.Equal(t,1,workspaces.Count,"expected only one workspace")
1927+
require.Equal(t,workspaces.Workspaces[0].ID,sharedWorkspace.ID)
1928+
})
1929+
1930+
t.Run("SharedWithUserByUsername",func(t*testing.T) {
1931+
t.Parallel()
1932+
1933+
dv:=coderdtest.DeploymentValues(t)
1934+
dv.Experiments= []string{string(codersdk.ExperimentWorkspaceSharing)}
1935+
1936+
var (
1937+
client,db=coderdtest.NewWithDatabase(t,&coderdtest.Options{
1938+
DeploymentValues:dv,
1939+
})
1940+
orgOwner=coderdtest.CreateFirstUser(t,client)
1941+
_,workspaceOwner=coderdtest.CreateAnotherUser(t,client,orgOwner.OrganizationID,rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))
1942+
sharedWorkspace=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
1943+
OwnerID:workspaceOwner.ID,
1944+
OrganizationID:orgOwner.OrganizationID,
1945+
}).Do().Workspace
1946+
_=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
1947+
OwnerID:workspaceOwner.ID,
1948+
OrganizationID:orgOwner.OrganizationID,
1949+
}).Do().Workspace
1950+
_,toShareWithUser=coderdtest.CreateAnotherUser(t,client,orgOwner.OrganizationID)
1951+
ctx=testutil.Context(t,testutil.WaitMedium)
1952+
)
1953+
1954+
client.UpdateWorkspaceACL(ctx,sharedWorkspace.ID, codersdk.UpdateWorkspaceACL{
1955+
UserRoles:map[string]codersdk.WorkspaceRole{
1956+
toShareWithUser.ID.String():codersdk.WorkspaceRoleUse,
1957+
},
1958+
})
1959+
1960+
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
1961+
SharedWithUser:toShareWithUser.Username,
1962+
})
1963+
require.NoError(t,err,"fetch workspaces")
1964+
require.Equal(t,1,workspaces.Count,"expected only one workspace")
1965+
require.Equal(t,workspaces.Workspaces[0].ID,sharedWorkspace.ID)
1966+
})
18911967
}
18921968

18931969
// TestWorkspaceFilterManual runs some specific setups with basic checks.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp