@@ -378,17 +378,12 @@ func TestWorkspaceFilter(t *testing.T) {
378
378
allWorkspaces := make ([]madeWorkspace , 0 )
379
379
380
380
// Create some random workspaces
381
- for i , user := range users {
381
+ for _ , user := range users {
382
382
version := coderdtest .CreateTemplateVersion (t , client , user .Org .ID , nil )
383
383
384
384
// Create a template & workspace in the user's org
385
385
coderdtest .AwaitTemplateVersionJob (t , client , version .ID )
386
- template := coderdtest .CreateTemplate (t , client , user .Org .ID , version .ID , func (request * codersdk.CreateTemplateRequest ) {
387
- // Have even templates share the same name for filter complexity.
388
- if i % 2 == 0 {
389
- request .Name = "even-template"
390
- }
391
- })
386
+ template := coderdtest .CreateTemplate (t , client , user .Org .ID , version .ID )
392
387
availTemplates = append (availTemplates , template )
393
388
workspace := coderdtest .CreateWorkspace (t , user .Client , template .OrganizationID , template .ID )
394
389
allWorkspaces = append (allWorkspaces , madeWorkspace {
@@ -449,21 +444,20 @@ func TestWorkspaceFilter(t *testing.T) {
449
444
{
450
445
Name : "TemplateName" ,
451
446
Filter : codersdk.WorkspaceFilter {
452
- Template : "even-template" ,
447
+ Template : allWorkspaces [ 5 ]. Template . Name ,
453
448
},
454
449
FilterF : func (f codersdk.WorkspaceFilter , workspace madeWorkspace ) bool {
455
450
return workspace .Template .Name == f .Template
456
451
},
457
452
},
458
453
{
459
- Name : "Template& Name" ,
454
+ Name : "Name" ,
460
455
Filter : codersdk.WorkspaceFilter {
461
- Template : "even-template" ,
462
456
// Use a common letter... one has to have this letter in it
463
457
Name : "a" ,
464
458
},
465
459
FilterF : func (f codersdk.WorkspaceFilter , workspace madeWorkspace ) bool {
466
- return workspace . Template . Name == f . Template && strings .Contains (workspace .Workspace .Name , f .Name )
460
+ return strings .Contains (workspace .Workspace .Name , f .Name )
467
461
},
468
462
},
469
463
{
0 commit comments