keep moving tests

coder · Emyrk · Jul 25, 2024 · Jul 24, 2024 · Jul 24, 2024 · Jul 24, 2024
commit c59d370731313246caf6fdd61c7836cffc74a7c3
diff --git a/coderd/audit_test.go b/coderd/audit_test.go
@@ -95,92 +95,6 @@ func TestAuditLogs(t *testing.T) {
 		require.Equal(t, foundUser, *alogs.AuditLogs[0].User)
 	})
 
-	t.Run("IncludeOrganization", func(t *testing.T) {
-		t.Parallel()
-
-		ctx := context.Background()
-		client := coderdtest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-			Name:        "new-org",
-			DisplayName: "New organization",
-			Description: "A new organization to love and cherish until the test is over.",
-			Icon:        "/emojis/1f48f-1f3ff.png",
-		})
-		require.NoError(t, err)
-
-		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			OrganizationID: o.ID,
-			ResourceID:     user.UserID,
-		})
-		require.NoError(t, err)
-
-		alogs, err := client.AuditLogs(ctx, codersdk.AuditLogsRequest{
-			Pagination: codersdk.Pagination{
-				Limit: 1,
-			},
-		})
-		require.NoError(t, err)
-		require.Equal(t, int64(1), alogs.Count)
-		require.Len(t, alogs.AuditLogs, 1)
-
-		// Make sure the organization is fully populated.
-		require.Equal(t, &codersdk.MinimalOrganization{
-			ID:          o.ID,
-			Name:        o.Name,
-			DisplayName: o.DisplayName,
-			Icon:        o.Icon,
-		}, alogs.AuditLogs[0].Organization)
-
-		// OrganizationID is deprecated, but make sure it is set.
-		require.Equal(t, o.ID, alogs.AuditLogs[0].OrganizationID)
-
-		// Delete the org and try again, should be mostly empty.
-		err = client.DeleteOrganization(ctx, o.ID.String())
-		require.NoError(t, err)
-
-		alogs, err = client.AuditLogs(ctx, codersdk.AuditLogsRequest{
-			Pagination: codersdk.Pagination{
-				Limit: 1,
-			},
-		})
-		require.NoError(t, err)
-		require.Equal(t, int64(1), alogs.Count)
-		require.Len(t, alogs.AuditLogs, 1)
-
-		require.Equal(t, &codersdk.MinimalOrganization{
-			ID: o.ID,
-		}, alogs.AuditLogs[0].Organization)
-
-		// OrganizationID is deprecated, but make sure it is set.
-		require.Equal(t, o.ID, alogs.AuditLogs[0].OrganizationID)
-
-		// Some audit entries do not have an organization at all, in which case the
-		// response omits the organization.
-		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
-			ResourceType: codersdk.ResourceTypeAPIKey,
-			ResourceID:   user.UserID,
-		})
-		require.NoError(t, err)
-
-		alogs, err = client.AuditLogs(ctx, codersdk.AuditLogsRequest{
-			SearchQuery: "resource_type:api_key",
-			Pagination: codersdk.Pagination{
-				Limit: 1,
-			},
-		})
-		require.NoError(t, err)
-		require.Equal(t, int64(1), alogs.Count)
-		require.Len(t, alogs.AuditLogs, 1)
-
-		// The other will have no organization.
-		require.Equal(t, (*codersdk.MinimalOrganization)(nil), alogs.AuditLogs[0].Organization)
-
-		// OrganizationID is deprecated, but make sure it is empty.
-		require.Equal(t, uuid.Nil, alogs.AuditLogs[0].OrganizationID)
-	})
-
 	t.Run("WorkspaceBuildAuditLink", func(t *testing.T) {
 		t.Parallel()
 

diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go
@@ -25,24 +25,6 @@ func TestOrganizationByUserAndName(t *testing.T) {
 		require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
 	})
 
-	t.Run("NoMember", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, nil)
-		first := coderdtest.CreateFirstUser(t, client)
-		other, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
-		ctx := testutil.Context(t, testutil.WaitLong)
-
-		org, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-			Name:        "another",
-			DisplayName: "Another",
-		})
-		require.NoError(t, err)
-		_, err = other.OrganizationByUserAndName(ctx, codersdk.Me, org.Name)
-		var apiErr *codersdk.Error
-		require.ErrorAs(t, err, &apiErr)
-		require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
-	})
-
 	t.Run("Valid", func(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t, nil)
@@ -56,70 +38,3 @@ func TestOrganizationByUserAndName(t *testing.T) {
 	})
 }
 
-func TestPostOrganizationsByUser(t *testing.T) {
-	t.Parallel()
-	t.Run("Conflict", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		ctx := testutil.Context(t, testutil.WaitLong)
-
-		org, err := client.Organization(ctx, user.OrganizationID)
-		require.NoError(t, err)
-		_, err = client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-			Name:        org.Name,
-			DisplayName: org.DisplayName,
-		})
-		var apiErr *codersdk.Error
-		require.ErrorAs(t, err, &apiErr)
-		require.Equal(t, http.StatusConflict, apiErr.StatusCode())
-	})
-
-	t.Run("InvalidName", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
-		ctx := testutil.Context(t, testutil.WaitLong)
-
-		_, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-			Name:        "A name which is definitely not url safe",
-			DisplayName: "New",
-		})
-		var apiErr *codersdk.Error
-		require.ErrorAs(t, err, &apiErr)
-		require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
-	})
-
-	t.Run("Create", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
-		ctx := testutil.Context(t, testutil.WaitLong)
-
-		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-			Name:        "new-org",
-			DisplayName: "New organization",
-			Description: "A new organization to love and cherish forever.",
-			Icon:        "/emojis/1f48f-1f3ff.png",
-		})
-		require.NoError(t, err)
-		require.Equal(t, "new-org", o.Name)
-		require.Equal(t, "New organization", o.DisplayName)
-		require.Equal(t, "A new organization to love and cherish forever.", o.Description)
-		require.Equal(t, "/emojis/1f48f-1f3ff.png", o.Icon)
-	})
-
-	t.Run("CreateWithoutExplicitDisplayName", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
-		ctx := testutil.Context(t, testutil.WaitLong)
-
-		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
-			Name: "new-org",
-		})
-		require.NoError(t, err)
-		require.Equal(t, "new-org", o.Name)
-		require.Equal(t, "new-org", o.DisplayName) // should match the given `Name`
-	})
-}
diff --git a/enterprise/coderd/audit_test.go b/enterprise/coderd/audit_test.go
@@ -0,0 +1,114 @@
+package coderd_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/v2/coderd/coderdtest"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
+	"github.com/coder/coder/v2/enterprise/coderd/license"
+)
+
+func TestEnterpriseAuditLogs(t *testing.T) {
+	t.Parallel()
+
+	t.Run("IncludeOrganization", func(t *testing.T) {
+		t.Parallel()
+
+		ctx := context.Background()
+		dv := coderdtest.DeploymentValues(t)
+		dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				DeploymentValues: dv,
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureMultipleOrganizations: 1,
+				},
+			},
+		})
+
+		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name:        "new-org",
+			DisplayName: "New organization",
+			Description: "A new organization to love and cherish until the test is over.",
+			Icon:        "/emojis/1f48f-1f3ff.png",
+		})
+		require.NoError(t, err)
+
+		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
+			OrganizationID: o.ID,
+			ResourceID:     user.UserID,
+		})
+		require.NoError(t, err)
+
+		alogs, err := client.AuditLogs(ctx, codersdk.AuditLogsRequest{
+			Pagination: codersdk.Pagination{
+				Limit: 1,
+			},
+		})
+		require.NoError(t, err)
+		require.Equal(t, int64(1), alogs.Count)
+		require.Len(t, alogs.AuditLogs, 1)
+
+		// Make sure the organization is fully populated.
+		require.Equal(t, &codersdk.MinimalOrganization{
+			ID:          o.ID,
+			Name:        o.Name,
+			DisplayName: o.DisplayName,
+			Icon:        o.Icon,
+		}, alogs.AuditLogs[0].Organization)
+
+		// OrganizationID is deprecated, but make sure it is set.
+		require.Equal(t, o.ID, alogs.AuditLogs[0].OrganizationID)
+
+		// Delete the org and try again, should be mostly empty.
+		err = client.DeleteOrganization(ctx, o.ID.String())
+		require.NoError(t, err)
+
+		alogs, err = client.AuditLogs(ctx, codersdk.AuditLogsRequest{
+			Pagination: codersdk.Pagination{
+				Limit: 1,
+			},
+		})
+		require.NoError(t, err)
+		require.Equal(t, int64(1), alogs.Count)
+		require.Len(t, alogs.AuditLogs, 1)
+
+		require.Equal(t, &codersdk.MinimalOrganization{
+			ID: o.ID,
+		}, alogs.AuditLogs[0].Organization)
+
+		// OrganizationID is deprecated, but make sure it is set.
+		require.Equal(t, o.ID, alogs.AuditLogs[0].OrganizationID)
+
+		// Some audit entries do not have an organization at all, in which case the
+		// response omits the organization.
+		err = client.CreateTestAuditLog(ctx, codersdk.CreateTestAuditLogRequest{
+			ResourceType: codersdk.ResourceTypeAPIKey,
+			ResourceID:   user.UserID,
+		})
+		require.NoError(t, err)
+
+		alogs, err = client.AuditLogs(ctx, codersdk.AuditLogsRequest{
+			SearchQuery: "resource_type:api_key",
+			Pagination: codersdk.Pagination{
+				Limit: 1,
+			},
+		})
+		require.NoError(t, err)
+		require.Equal(t, int64(1), alogs.Count)
+		require.Len(t, alogs.AuditLogs, 1)
+
+		// The other will have no organization.
+		require.Equal(t, (*codersdk.MinimalOrganization)(nil), alogs.AuditLogs[0].Organization)
+
+		// OrganizationID is deprecated, but make sure it is empty.
+		require.Equal(t, uuid.Nil, alogs.AuditLogs[0].OrganizationID)
+	})
+}