coder
diff --git a/‎cli/organizationmembers_test.go
Lines changed: 38 additions & 0 deletions b/‎cli/organizationmembers_test.go
Lines changed: 38 additions & 0 deletions
diff --git a/‎coderd/apidoc/docs.go
Lines changed: 0 additions & 3 deletions b/‎coderd/apidoc/docs.go
Lines changed: 0 additions & 3 deletions
diff --git a/‎coderd/apidoc/swagger.json
Lines changed: 0 additions & 1 deletion b/‎coderd/apidoc/swagger.json
Lines changed: 0 additions & 1 deletion
diff --git a/‎coderd/members_test.go
Lines changed: 59 additions & 0 deletions b/‎coderd/members_test.go
Lines changed: 59 additions & 0 deletions
@@ -9,6 +9,7 @@ import (
 	"github.com/coder/coder/v2/cli/clitest"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -34,3 +35,40 @@ func TestListOrganizationMembers(t *testing.T) {
 		require.Contains(t, buf.String(), owner.UserID.String())
 	})
 }
+
+func TestAddOrganizationMembers(t *testing.T) {
+	t.Parallel()
+
+	t.Run("OK", func(t *testing.T) {
+		t.Parallel()
+
+		ownerClient := coderdtest.New(t, &coderdtest.Options{})
+		owner := coderdtest.CreateFirstUser(t, ownerClient)
+		_, user := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
+
+		ctx := testutil.Context(t, testutil.WaitMedium)
+		//nolint:gocritic // must be an owner, only owners can create orgs
+		otherOrg, err := ownerClient.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name:        "Other",
+			DisplayName: "",
+			Description: "",
+			Icon:        "",
+		})
+		require.NoError(t, err, "create another organization")
+
+		inv, root := clitest.New(t, "organization", "members", "add", "--organization", otherOrg.ID.String(), user.Username)
+		//nolint:gocritic // must be an owner
+		clitest.SetupConfig(t, ownerClient, root)
+
+		buf := new(bytes.Buffer)
+		inv.Stdout = buf
+		err = inv.WithContext(ctx).Run()
+		require.NoError(t, err)
+
+		//nolint:gocritic // must be an owner
+		members, err := ownerClient.OrganizationMembers(ctx, otherOrg.ID)
+		require.NoError(t, err)
+
+		require.Len(t, members, 2)
+	})
+}
@@ -13,6 +13,65 @@ import (
 	"github.com/coder/coder/v2/testutil"
 )
 
+func TestAddMember(t *testing.T) {
+	t.Parallel()
+
+	t.Run("OK", func(t *testing.T) {
+		t.Parallel()
+		owner := coderdtest.New(t, nil)
+		first := coderdtest.CreateFirstUser(t, owner)
+		ctx := testutil.Context(t, testutil.WaitMedium)
+		org, err := owner.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name:        "other",
+			DisplayName: "",
+			Description: "",
+			Icon:        "",
+		})
+		require.NoError(t, err)
+
+		// Make a user not in the second organization
+		_, user := coderdtest.CreateAnotherUser(t, owner, first.OrganizationID)
+
+		members, err := owner.OrganizationMembers(ctx, org.ID)
+		require.NoError(t, err)
+		require.Len(t, members, 1) // Verify just the 1 member
+
+		// Add user to org
+		_, err = owner.PostOrganizationMember(ctx, org.ID, user.Username)
+		require.NoError(t, err)
+
+		members, err = owner.OrganizationMembers(ctx, org.ID)
+		require.NoError(t, err)
+		// Owner + new member
+		require.Len(t, members, 2)
+		require.ElementsMatch(t,
+			[]uuid.UUID{first.UserID, user.ID},
+			db2sdk.List(members, onlyIDs))
+	})
+
+	t.Run("UserNotExists", func(t *testing.T) {
+		t.Parallel()
+		owner := coderdtest.New(t, nil)
+		_ = coderdtest.CreateFirstUser(t, owner)
+		ctx := testutil.Context(t, testutil.WaitMedium)
+
+		org, err := owner.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name:        "other",
+			DisplayName: "",
+			Description: "",
+			Icon:        "",
+		})
+		require.NoError(t, err)
+
+		// Add user to org
+		_, err = owner.PostOrganizationMember(ctx, org.ID, uuid.NewString())
+		require.Error(t, err)
+		var apiErr *codersdk.Error
+		require.ErrorAs(t, err, &apiErr)
+		require.Contains(t, apiErr.Message, "must be an existing")
+	})
+}
+
 func TestListMembers(t *testing.T) {
 	t.Parallel()