fix tests

sreya · sreya · commit 3bab0a3e9966 · 2023-07-14T03:53:55.000Z
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -338,6 +338,8 @@ func (q *FakeQuerier) convertToWorkspaceRowsNoLock(ctx context.Context, workspac
 			AutostartSchedule: w.AutostartSchedule,
 			Ttl:               w.Ttl,
 			LastUsedAt:        w.LastUsedAt,
+			LockedAt:          w.LockedAt,
+			DeletingAt:        w.DeletingAt,
 			Count:             count,
 		}
 
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -183,6 +183,7 @@ func (api *API) workspaces(rw http.ResponseWriter, r *http.Request) {
 	} else {
 		for _, v := range wss {
 			if v.DeletingAt == nil {
+				fmt.Println("FUCK")
 				continue
 			}
 			// get the beginning of the day on which deletion is scheduled
diff --git a/enterprise/cli/licenses.go b/enterprise/cli/licenses.go
@@ -12,10 +12,11 @@ import (
 
 	"golang.org/x/xerrors"
 
+	"github.com/google/uuid"
+
 	"github.com/coder/coder/cli/clibase"
 	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/codersdk"
-	"github.com/google/uuid"
 )
 
 var jwtRegexp = regexp.MustCompile(`^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+$`)
diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -264,9 +264,12 @@ func TestTemplates(t *testing.T) {
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
+				},
+			},
 		})
-		_ = coderdenttest.AddFullLicense(t, client)
-
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go
@@ -633,8 +633,12 @@ func TestWorkspacesFiltering(t *testing.T) {
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
+				},
+			},
 		})
-		_ = coderdenttest.AddFullLicense(t, client)
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -684,9 +688,13 @@ func TestWorkspaceLock(t *testing.T) {
 					IncludeProvisionerDaemon: true,
 					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
 				},
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					Features: license.Features{
+						codersdk.FeatureAdvancedTemplateScheduling: 1,
+					},
+				},
 			})
 
-			_         = coderdenttest.AddFullLicense(t, client)
 			version   = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 			_         = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
 			lockedTTL = time.Minute

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,8 @@ func (q *FakeQuerier) convertToWorkspaceRowsNoLock(ctx context.Context, workspac`
`338`	`338`	`AutostartSchedule: w.AutostartSchedule,`
`339`	`339`	`Ttl: w.Ttl,`
`340`	`340`	`LastUsedAt: w.LastUsedAt,`
	`341`	`+ LockedAt: w.LockedAt,`
	`342`	`+ DeletingAt: w.DeletingAt,`
`341`	`343`	`Count: count,`
`342`	`344`	`}`
`343`	`345`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ func (api API) workspaces(rw http.ResponseWriter, r http.Request) {`
`183`	`183`	`} else {`
`184`	`184`	`for _, v := range wss {`
`185`	`185`	`if v.DeletingAt == nil {`
	`186`	`+ fmt.Println("FUCK")`
`186`	`187`	`continue`
`187`	`188`	`}`
`188`	`189`	`// get the beginning of the day on which deletion is scheduled`