Remove AGPL Coder entitlements endpoint test

kylecarbs · kylecarbs · commit be96fff2684c · 2022-09-15T04:20:06.000Z
diff --git a/coderd/coderd_test.go b/coderd/coderd_test.go
@@ -17,7 +17,6 @@ import (
 
 	"github.com/coder/coder/buildinfo"
 	"github.com/coder/coder/coderd/coderdtest"
-	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/tailnet"
 	"github.com/coder/coder/testutil"
 )
@@ -115,22 +114,3 @@ func TestDERPLatencyCheck(t *testing.T) {
 	defer res.Body.Close()
 	require.Equal(t, http.StatusOK, res.StatusCode)
 }
-
-func TestEntitlements(t *testing.T) {
-	t.Parallel()
-	t.Run("GET", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
-		result, err := client.Entitlements(context.Background())
-		require.NoError(t, err)
-		assert.False(t, result.HasLicense)
-		assert.Empty(t, result.Warnings)
-		for _, f := range codersdk.FeatureNames {
-			require.Contains(t, result.Features, f)
-			fe := result.Features[f]
-			assert.False(t, fe.Enabled)
-			assert.Equal(t, codersdk.EntitlementNotEntitled, fe.Entitlement)
-		}
-	})
-}
diff --git a/coderd/users.go b/coderd/users.go
@@ -1181,9 +1181,9 @@ func (api *API) createUser(ctx context.Context, store database.Store, req create
 func (api *API) setAuthCookie(rw http.ResponseWriter, cookie *http.Cookie) {
 	http.SetCookie(rw, cookie)
 
-	devurlCookie := api.applicationCookie(cookie)
-	if devurlCookie != nil {
-		http.SetCookie(rw, devurlCookie)
+	appCookie := api.applicationCookie(cookie)
+	if appCookie != nil {
+		http.SetCookie(rw, appCookie)
 	}
 }
 
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -32,7 +32,11 @@ func TestFirstUser(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 
-		_, err := client.CreateFirstUser(ctx, codersdk.CreateFirstUserRequest{})
+		has, err := client.HasFirstUser(context.Background())
+		require.NoError(t, err)
+		require.False(t, has)
+
+		_, err = client.CreateFirstUser(ctx, codersdk.CreateFirstUserRequest{})
 		require.Error(t, err)
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -1181,9 +1181,9 @@ func (api *API) createUser(ctx context.Context, store database.Store, req create`
`1181`	`1181`	`func (api API) setAuthCookie(rw http.ResponseWriter, cookie http.Cookie) {`
`1182`	`1182`	`http.SetCookie(rw, cookie)`
`1183`	`1183`
`1184`		`- devurlCookie := api.applicationCookie(cookie)`
`1185`		`- if devurlCookie != nil {`
`1186`		`- http.SetCookie(rw, devurlCookie)`
	`1184`	`+ appCookie := api.applicationCookie(cookie)`
	`1185`	`+ if appCookie != nil {`
	`1186`	`+ http.SetCookie(rw, appCookie)`
`1187`	`1187`	`}`
`1188`	`1188`	`}`
`1189`	`1189`