Skip to content

Commit 0fb2a5a

Browse files
kylecarbskylecarbs
committed
Merge branch 'testcleanup' of github.com:coder/coder into testcleanup
2 parents 9fa815c + 57efae2 commit 0fb2a5a

File tree

4 files changed

+85
-72
lines changed

4 files changed

+85
-72
lines changed

‎coderd/projects.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,16 @@ func (api *api) projects(rw http.ResponseWriter, r *http.Request) {
4242
projects, err := api.Database.GetProjectsByOrganizationIDs(r.Context(), organizationIDs)
4343
if errors.Is(err, sql.ErrNoRows) {
4444
err = nil
45-
projects = []database.Project{}
4645
}
4746
if err != nil {
4847
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
4948
Message: fmt.Sprintf("get projects: %s", err.Error()),
5049
})
5150
return
5251
}
52+
if projects == nil {
53+
projects = []database.Project{}
54+
}
5355
render.Status(r, http.StatusOK)
5456
render.JSON(rw, r, projects)
5557
}
@@ -60,14 +62,16 @@ func (api *api) projectsByOrganization(rw http.ResponseWriter, r *http.Request)
6062
projects, err := api.Database.GetProjectsByOrganizationIDs(r.Context(), []string{organization.ID})
6163
if errors.Is(err, sql.ErrNoRows) {
6264
err = nil
63-
projects = []database.Project{}
6465
}
6566
if err != nil {
6667
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
6768
Message: fmt.Sprintf("get projects: %s", err.Error()),
6869
})
6970
return
7071
}
72+
if projects == nil {
73+
projects = []database.Project{}
74+
}
7175
render.Status(r, http.StatusOK)
7276
render.JSON(rw, r, projects)
7377
}

‎coderd/workspacehistory_test.go

+11-7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
2828
ProjectVersionID: uuid.New(),
2929
Transition: database.WorkspaceTransitionCreate,
3030
})
31+
require.Error(t, err)
3132
var apiErr *codersdk.Error
3233
require.ErrorAs(t, err, &apiErr)
3334
require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
@@ -36,8 +37,8 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
3637
t.Run("ProjectVersionImporting", func(t *testing.T) {
3738
t.Parallel()
3839
client := coderdtest.New(t)
39-
coderdtest.NewProvisionerDaemon(t, client)
4040
user := coderdtest.CreateInitialUser(t, client)
41+
coderdtest.NewProvisionerDaemon(t, client)
4142
project := coderdtest.CreateProject(t, client, user.Organization)
4243
workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
4344
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, &echo.Responses{
@@ -47,6 +48,7 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
4748
ProjectVersionID: version.ID,
4849
Transition: database.WorkspaceTransitionCreate,
4950
})
51+
require.Error(t, err)
5052
var apiErr *codersdk.Error
5153
require.ErrorAs(t, err, &apiErr)
5254
require.Equal(t, http.StatusNotAcceptable, apiErr.StatusCode())
@@ -55,8 +57,8 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
5557
t.Run("ProjectVersionFailedImport", func(t *testing.T) {
5658
t.Parallel()
5759
client := coderdtest.New(t)
58-
coderdtest.NewProvisionerDaemon(t, client)
5960
user := coderdtest.CreateInitialUser(t, client)
61+
coderdtest.NewProvisionerDaemon(t, client)
6062
project := coderdtest.CreateProject(t, client, user.Organization)
6163
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, &echo.Responses{
6264
Provision: []*proto.Provision_Response{{}},
@@ -67,6 +69,7 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
6769
ProjectVersionID: version.ID,
6870
Transition: database.WorkspaceTransitionCreate,
6971
})
72+
require.Error(t, err)
7073
var apiErr *codersdk.Error
7174
require.ErrorAs(t, err, &apiErr)
7275
require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode())
@@ -75,8 +78,8 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
7578
t.Run("AlreadyActive", func(t *testing.T) {
7679
t.Parallel()
7780
client := coderdtest.New(t)
78-
coderdtest.NewProvisionerDaemon(t, client)
7981
user := coderdtest.CreateInitialUser(t, client)
82+
coderdtest.NewProvisionerDaemon(t, client)
8083
project := coderdtest.CreateProject(t, client, user.Organization)
8184
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
8285
coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
@@ -90,6 +93,7 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
9093
ProjectVersionID: version.ID,
9194
Transition: database.WorkspaceTransitionCreate,
9295
})
96+
require.Error(t, err)
9397
var apiErr *codersdk.Error
9498
require.ErrorAs(t, err, &apiErr)
9599
require.Equal(t, http.StatusConflict, apiErr.StatusCode())
@@ -98,8 +102,8 @@ func TestPostWorkspaceHistoryByUser(t *testing.T) {
98102
t.Run("UpdatePriorAfterField", func(t *testing.T) {
99103
t.Parallel()
100104
client := coderdtest.New(t)
101-
coderdtest.NewProvisionerDaemon(t, client)
102105
user := coderdtest.CreateInitialUser(t, client)
106+
coderdtest.NewProvisionerDaemon(t, client)
103107
project := coderdtest.CreateProject(t, client, user.Organization)
104108
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
105109
coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
@@ -128,8 +132,8 @@ func TestWorkspaceHistoryByUser(t *testing.T) {
128132
t.Run("ListEmpty", func(t *testing.T) {
129133
t.Parallel()
130134
client := coderdtest.New(t)
131-
coderdtest.NewProvisionerDaemon(t, client)
132135
user := coderdtest.CreateInitialUser(t, client)
136+
coderdtest.NewProvisionerDaemon(t, client)
133137
project := coderdtest.CreateProject(t, client, user.Organization)
134138
workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
135139
history, err := client.ListWorkspaceHistory(context.Background(), "me", workspace.Name)
@@ -141,8 +145,8 @@ func TestWorkspaceHistoryByUser(t *testing.T) {
141145
t.Run("List", func(t *testing.T) {
142146
t.Parallel()
143147
client := coderdtest.New(t)
144-
coderdtest.NewProvisionerDaemon(t, client)
145148
user := coderdtest.CreateInitialUser(t, client)
149+
coderdtest.NewProvisionerDaemon(t, client)
146150
project := coderdtest.CreateProject(t, client, user.Organization)
147151
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
148152
coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
@@ -162,8 +166,8 @@ func TestWorkspaceHistoryByUser(t *testing.T) {
162166
func TestWorkspaceHistoryByName(t *testing.T) {
163167
t.Parallel()
164168
client := coderdtest.New(t)
165-
coderdtest.NewProvisionerDaemon(t, client)
166169
user := coderdtest.CreateInitialUser(t, client)
170+
coderdtest.NewProvisionerDaemon(t, client)
167171
project := coderdtest.CreateProject(t, client, user.Organization)
168172
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
169173
coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)

‎database/dump.sql

+32-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)