fix unit tests

Emyrk · Emyrk · commit d4a8b81be75d · 2023-06-07T11:47:40.000-05:00
diff --git a/coderd/database/dbauthz/querier_test.go b/coderd/database/dbauthz/querier_test.go
@@ -336,7 +336,10 @@ func (s *MethodTestSuite) TestLicense() {
 		check.Args().Asserts().Returns("")
 	}))
 	s.Run("GetDefaultProxyConfig", s.Subtest(func(db database.Store, check *expects) {
-		check.Args().Asserts().Returns(database.GetDefaultProxyConfigRow{})
+		check.Args().Asserts().Returns(database.GetDefaultProxyConfigRow{
+			DisplayName: "Default",
+			IconUrl:     "/emojis/1f3e1.png",
+		})
 	}))
 	s.Run("GetLogoURL", s.Subtest(func(db database.Store, check *expects) {
 		err := db.UpsertLogoURL(context.Background(), "value")
diff --git a/enterprise/cli/workspaceproxy_test.go b/enterprise/cli/workspaceproxy_test.go
@@ -82,8 +82,15 @@ func Test_ProxyCRUD(t *testing.T) {
 		// Also check via the api
 		proxies, err := client.WorkspaceProxies(ctx)
 		require.NoError(t, err, "failed to get workspace proxies")
-		require.Len(t, proxies, 1, "expected 1 proxy")
-		require.Equal(t, expectedName, proxies[0].Name, "expected proxy name to match")
+		// Include primary
+		require.Len(t, proxies, 2, "expected 1 proxy")
+		found := false
+		for _, proxy := range proxies {
+			if proxy.Name == expectedName {
+				found = true
+			}
+		}
+		require.True(t, found, "expected proxy to be found")
 	})
 
 	t.Run("Delete", func(t *testing.T) {
@@ -130,6 +137,6 @@ func Test_ProxyCRUD(t *testing.T) {
 
 		proxies, err := client.WorkspaceProxies(ctx)
 		require.NoError(t, err, "failed to get workspace proxies")
-		require.Len(t, proxies, 0, "expected no proxies")
+		require.Len(t, proxies, 1, "expected only primary proxy")
 	})
 }
diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go
@@ -325,7 +325,8 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
 
 		proxies, err := client.WorkspaceProxies(ctx)
 		require.NoError(t, err)
-		require.Len(t, proxies, 0)
+		// Default proxy is always there
+		require.Len(t, proxies, 1)
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,8 @@ func TestWorkspaceProxyCRUD(t *testing.T) {`
`325`	`325`
`326`	`326`	`proxies, err := client.WorkspaceProxies(ctx)`
`327`	`327`	`require.NoError(t, err)`
`328`		`- require.Len(t, proxies, 0)`
	`328`	`+ // Default proxy is always there`
	`329`	`+ require.Len(t, proxies, 1)`
`329`	`330`	`})`
`330`	`331`	`}`
`331`	`332`