Skip to content

Commit 1250dbf

Browse files
EmyrkEmyrk
committed
keep moving tests
1 parent 446d51b commit 1250dbf

File tree

4 files changed

+394
-278
lines changed

4 files changed

+394
-278
lines changed

‎coderd/organizations_test.go

Lines changed: 0 additions & 219 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/stretchr/testify/require"
88

99
"github.com/coder/coder/v2/coderd/coderdtest"
10-
"github.com/coder/coder/v2/coderd/util/ptr"
1110
"github.com/coder/coder/v2/codersdk"
1211
"github.com/coder/coder/v2/testutil"
1312
)
@@ -124,221 +123,3 @@ func TestPostOrganizationsByUser(t *testing.T) {
124123
require.Equal(t, "new-org", o.DisplayName) // should match the given `Name`
125124
})
126125
}
127-
128-
func TestPatchOrganizationsByUser(t *testing.T) {
129-
t.Parallel()
130-
t.Run("Conflict", func(t *testing.T) {
131-
t.Parallel()
132-
client := coderdtest.New(t, nil)
133-
user := coderdtest.CreateFirstUser(t, client)
134-
ctx := testutil.Context(t, testutil.WaitMedium)
135-
136-
originalOrg, err := client.Organization(ctx, user.OrganizationID)
137-
require.NoError(t, err)
138-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
139-
Name: "something-unique",
140-
DisplayName: "Something Unique",
141-
})
142-
require.NoError(t, err)
143-
144-
_, err = client.UpdateOrganization(ctx, o.ID.String(), codersdk.UpdateOrganizationRequest{
145-
Name: originalOrg.Name,
146-
})
147-
var apiErr *codersdk.Error
148-
require.ErrorAs(t, err, &apiErr)
149-
require.Equal(t, http.StatusConflict, apiErr.StatusCode())
150-
})
151-
152-
t.Run("ReservedName", func(t *testing.T) {
153-
t.Parallel()
154-
client := coderdtest.New(t, nil)
155-
_ = coderdtest.CreateFirstUser(t, client)
156-
ctx := testutil.Context(t, testutil.WaitMedium)
157-
158-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
159-
Name: "something-unique",
160-
DisplayName: "Something Unique",
161-
})
162-
require.NoError(t, err)
163-
164-
_, err = client.UpdateOrganization(ctx, o.ID.String(), codersdk.UpdateOrganizationRequest{
165-
Name: codersdk.DefaultOrganization,
166-
})
167-
var apiErr *codersdk.Error
168-
require.ErrorAs(t, err, &apiErr)
169-
require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
170-
})
171-
172-
t.Run("InvalidName", func(t *testing.T) {
173-
t.Parallel()
174-
client := coderdtest.New(t, nil)
175-
_ = coderdtest.CreateFirstUser(t, client)
176-
ctx := testutil.Context(t, testutil.WaitMedium)
177-
178-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
179-
Name: "something-unique",
180-
DisplayName: "Something Unique",
181-
})
182-
require.NoError(t, err)
183-
184-
_, err = client.UpdateOrganization(ctx, o.ID.String(), codersdk.UpdateOrganizationRequest{
185-
Name: "something unique but not url safe",
186-
})
187-
var apiErr *codersdk.Error
188-
require.ErrorAs(t, err, &apiErr)
189-
require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
190-
})
191-
192-
t.Run("UpdateById", func(t *testing.T) {
193-
t.Parallel()
194-
client := coderdtest.New(t, nil)
195-
_ = coderdtest.CreateFirstUser(t, client)
196-
ctx := testutil.Context(t, testutil.WaitMedium)
197-
198-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
199-
Name: "new-org",
200-
DisplayName: "New organization",
201-
})
202-
require.NoError(t, err)
203-
204-
o, err = client.UpdateOrganization(ctx, o.ID.String(), codersdk.UpdateOrganizationRequest{
205-
Name: "new-new-org",
206-
})
207-
require.NoError(t, err)
208-
require.Equal(t, "new-new-org", o.Name)
209-
})
210-
211-
t.Run("UpdateByName", func(t *testing.T) {
212-
t.Parallel()
213-
client := coderdtest.New(t, nil)
214-
_ = coderdtest.CreateFirstUser(t, client)
215-
ctx := testutil.Context(t, testutil.WaitMedium)
216-
217-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
218-
Name: "new-org",
219-
DisplayName: "New organization",
220-
})
221-
require.NoError(t, err)
222-
223-
o, err = client.UpdateOrganization(ctx, o.Name, codersdk.UpdateOrganizationRequest{
224-
Name: "new-new-org",
225-
})
226-
require.NoError(t, err)
227-
require.Equal(t, "new-new-org", o.Name)
228-
require.Equal(t, "New organization", o.DisplayName) // didn't change
229-
})
230-
231-
t.Run("UpdateDisplayName", func(t *testing.T) {
232-
t.Parallel()
233-
client := coderdtest.New(t, nil)
234-
_ = coderdtest.CreateFirstUser(t, client)
235-
ctx := testutil.Context(t, testutil.WaitMedium)
236-
237-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
238-
Name: "new-org",
239-
DisplayName: "New organization",
240-
})
241-
require.NoError(t, err)
242-
243-
o, err = client.UpdateOrganization(ctx, o.Name, codersdk.UpdateOrganizationRequest{
244-
DisplayName: "The Newest One",
245-
})
246-
require.NoError(t, err)
247-
require.Equal(t, "new-org", o.Name) // didn't change
248-
require.Equal(t, "The Newest One", o.DisplayName)
249-
})
250-
251-
t.Run("UpdateDescription", func(t *testing.T) {
252-
t.Parallel()
253-
client := coderdtest.New(t, nil)
254-
_ = coderdtest.CreateFirstUser(t, client)
255-
ctx := testutil.Context(t, testutil.WaitMedium)
256-
257-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
258-
Name: "new-org",
259-
DisplayName: "New organization",
260-
})
261-
require.NoError(t, err)
262-
263-
o, err = client.UpdateOrganization(ctx, o.Name, codersdk.UpdateOrganizationRequest{
264-
Description: ptr.Ref("wow, this organization description is so updated!"),
265-
})
266-
267-
require.NoError(t, err)
268-
require.Equal(t, "new-org", o.Name) // didn't change
269-
require.Equal(t, "New organization", o.DisplayName) // didn't change
270-
require.Equal(t, "wow, this organization description is so updated!", o.Description)
271-
})
272-
273-
t.Run("UpdateIcon", func(t *testing.T) {
274-
t.Parallel()
275-
client := coderdtest.New(t, nil)
276-
_ = coderdtest.CreateFirstUser(t, client)
277-
ctx := testutil.Context(t, testutil.WaitMedium)
278-
279-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
280-
Name: "new-org",
281-
DisplayName: "New organization",
282-
})
283-
require.NoError(t, err)
284-
285-
o, err = client.UpdateOrganization(ctx, o.Name, codersdk.UpdateOrganizationRequest{
286-
Icon: ptr.Ref("/emojis/1f48f-1f3ff.png"),
287-
})
288-
289-
require.NoError(t, err)
290-
require.Equal(t, "new-org", o.Name) // didn't change
291-
require.Equal(t, "New organization", o.DisplayName) // didn't change
292-
require.Equal(t, "/emojis/1f48f-1f3ff.png", o.Icon)
293-
})
294-
}
295-
296-
func TestDeleteOrganizationsByUser(t *testing.T) {
297-
t.Parallel()
298-
t.Run("Default", func(t *testing.T) {
299-
t.Parallel()
300-
client := coderdtest.New(t, nil)
301-
user := coderdtest.CreateFirstUser(t, client)
302-
ctx := testutil.Context(t, testutil.WaitMedium)
303-
304-
o, err := client.Organization(ctx, user.OrganizationID)
305-
require.NoError(t, err)
306-
307-
err = client.DeleteOrganization(ctx, o.ID.String())
308-
var apiErr *codersdk.Error
309-
require.ErrorAs(t, err, &apiErr)
310-
require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
311-
})
312-
313-
t.Run("DeleteById", func(t *testing.T) {
314-
t.Parallel()
315-
client := coderdtest.New(t, nil)
316-
_ = coderdtest.CreateFirstUser(t, client)
317-
ctx := testutil.Context(t, testutil.WaitMedium)
318-
319-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
320-
Name: "doomed",
321-
DisplayName: "Doomed",
322-
})
323-
require.NoError(t, err)
324-
325-
err = client.DeleteOrganization(ctx, o.ID.String())
326-
require.NoError(t, err)
327-
})
328-
329-
t.Run("DeleteByName", func(t *testing.T) {
330-
t.Parallel()
331-
client := coderdtest.New(t, nil)
332-
_ = coderdtest.CreateFirstUser(t, client)
333-
ctx := testutil.Context(t, testutil.WaitMedium)
334-
335-
o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
336-
Name: "doomed",
337-
DisplayName: "Doomed",
338-
})
339-
require.NoError(t, err)
340-
341-
err = client.DeleteOrganization(ctx, o.Name)
342-
require.NoError(t, err)
343-
})
344-
}

‎coderd/users_test.go

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -480,65 +480,6 @@ func TestPostUsers(t *testing.T) {
480480
require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
481481
})
482482

483-
t.Run("OrganizationNoAccess", func(t *testing.T) {
484-
t.Parallel()
485-
client := coderdtest.New(t, nil)
486-
first := coderdtest.CreateFirstUser(t, client)
487-
notInOrg, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
488-
other, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID, rbac.RoleOwner(), rbac.RoleMember())
489-
490-
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
491-
defer cancel()
492-
493-
org, err := other.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
494-
Name: "another",
495-
})
496-
require.NoError(t, err)
497-
498-
_, err = notInOrg.CreateUser(ctx, codersdk.CreateUserRequest{
499-
Email: "some@domain.com",
500-
Username: "anotheruser",
501-
Password: "SomeSecurePassword!",
502-
OrganizationID: org.ID,
503-
})
504-
var apiErr *codersdk.Error
505-
require.ErrorAs(t, err, &apiErr)
506-
require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
507-
})
508-
509-
t.Run("CreateWithoutOrg", func(t *testing.T) {
510-
t.Parallel()
511-
auditor := audit.NewMock()
512-
client := coderdtest.New(t, &coderdtest.Options{Auditor: auditor})
513-
firstUser := coderdtest.CreateFirstUser(t, client)
514-
515-
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
516-
defer cancel()
517-
518-
// Add an extra org to try and confuse user creation
519-
_, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
520-
Name: "foobar",
521-
})
522-
require.NoError(t, err)
523-
524-
numLogs := len(auditor.AuditLogs())
525-
526-
user, err := client.CreateUser(ctx, codersdk.CreateUserRequest{
527-
Email: "another@user.org",
528-
Username: "someone-else",
529-
Password: "SomeSecurePassword!",
530-
})
531-
require.NoError(t, err)
532-
numLogs++ // add an audit log for user create
533-
534-
require.Len(t, auditor.AuditLogs(), numLogs)
535-
require.Equal(t, database.AuditActionCreate, auditor.AuditLogs()[numLogs-1].Action)
536-
require.Equal(t, database.AuditActionLogin, auditor.AuditLogs()[numLogs-3].Action)
537-
538-
require.Len(t, user.OrganizationIDs, 1)
539-
assert.Equal(t, firstUser.OrganizationID, user.OrganizationIDs[0])
540-
})
541-
542483
t.Run("Create", func(t *testing.T) {
543484
t.Parallel()
544485
auditor := audit.NewMock()

0 commit comments

Comments
 (0)