Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d182b69

Browse files
kylecarbskylecarbs
committed
Fix CLI tests
1 parent aa2c852 commit d182b69

File tree

3 files changed

+52
-52
lines changed

3 files changed

+52
-52
lines changed

‎codersdk/projects_test.go

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"testing"
66

7+
"github.com/google/uuid"
78
"github.com/stretchr/testify/require"
89

910
"github.com/coder/coder/coderd"
@@ -42,7 +43,8 @@ func TestProject(t *testing.T) {
4243
t.Parallel()
4344
client := coderdtest.New(t)
4445
user := coderdtest.CreateInitialUser(t, client)
45-
project := coderdtest.CreateProject(t, client, user.Organization)
46+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
47+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
4648
_, err := client.Project(context.Background(), user.Organization, project.Name)
4749
require.NoError(t, err)
4850
})
@@ -54,8 +56,8 @@ func TestCreateProject(t *testing.T) {
5456
t.Parallel()
5557
client := coderdtest.New(t)
5658
_, err := client.CreateProject(context.Background(), "org", coderd.CreateProjectRequest{
57-
Name: "something",
58-
Provisioner: database.ProvisionerTypeEcho,
59+
Name: "something",
60+
VersionImportJobID: uuid.New(),
5961
})
6062
require.Error(t, err)
6163
})
@@ -64,7 +66,8 @@ func TestCreateProject(t *testing.T) {
6466
t.Parallel()
6567
client := coderdtest.New(t)
6668
user := coderdtest.CreateInitialUser(t, client)
67-
_ = coderdtest.CreateProject(t, client, user.Organization)
69+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
70+
_ = coderdtest.CreateProject(t, client, user.Organization, job.ID)
6871
})
6972
}
7073

@@ -81,8 +84,8 @@ func TestProjectVersions(t *testing.T) {
8184
t.Parallel()
8285
client := coderdtest.New(t)
8386
user := coderdtest.CreateInitialUser(t, client)
84-
project := coderdtest.CreateProject(t, client, user.Organization)
85-
87+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
88+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
8689
_, err := client.ProjectVersions(context.Background(), user.Organization, project.Name)
8790
require.NoError(t, err)
8891
})
@@ -101,9 +104,9 @@ func TestProjectVersion(t *testing.T) {
101104
t.Parallel()
102105
client := coderdtest.New(t)
103106
user := coderdtest.CreateInitialUser(t, client)
104-
project := coderdtest.CreateProject(t, client, user.Organization)
105-
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
106-
_, err := client.ProjectVersion(context.Background(), user.Organization, project.Name, version.Name)
107+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
108+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
109+
_, err := client.ProjectVersion(context.Background(), user.Organization, project.Name, project.ActiveVersionID.String())
107110
require.NoError(t, err)
108111
})
109112
}
@@ -121,8 +124,12 @@ func TestCreateProjectVersion(t *testing.T) {
121124
t.Parallel()
122125
client := coderdtest.New(t)
123126
user := coderdtest.CreateInitialUser(t, client)
124-
project := coderdtest.CreateProject(t, client, user.Organization)
125-
_ = coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
127+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
128+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
129+
_, err := client.CreateProjectVersion(context.Background(), user.Organization, project.Name, coderd.CreateProjectVersionRequest{
130+
ImportJobID: job.ID,
131+
})
132+
require.NoError(t, err)
126133
})
127134
}
128135

@@ -140,10 +147,10 @@ func TestProjectVersionParameters(t *testing.T) {
140147
client := coderdtest.New(t)
141148
user := coderdtest.CreateInitialUser(t, client)
142149
coderdtest.NewProvisionerDaemon(t, client)
143-
project := coderdtest.CreateProject(t, client, user.Organization)
144-
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
145-
coderdtest.AwaitProjectImportJob(t, client, user.Organization, project.Name, version.Name)
146-
_, err := client.ProjectVersionParameters(context.Background(), user.Organization, project.Name, version.Name)
150+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
151+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
152+
coderdtest.AwaitProvisionerJob(t, client, user.Organization, job.ID)
153+
_, err := client.ProjectVersionParameters(context.Background(), user.Organization, project.Name, project.ActiveVersionID.String())
147154
require.NoError(t, err)
148155
})
149156
}
@@ -161,8 +168,8 @@ func TestProjectParameters(t *testing.T) {
161168
t.Parallel()
162169
client := coderdtest.New(t)
163170
user := coderdtest.CreateInitialUser(t, client)
164-
coderdtest.NewProvisionerDaemon(t, client)
165-
project := coderdtest.CreateProject(t, client, user.Organization)
171+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
172+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
166173
_, err := client.ProjectParameters(context.Background(), user.Organization, project.Name)
167174
require.NoError(t, err)
168175
})
@@ -181,8 +188,8 @@ func TestCreateProjectParameter(t *testing.T) {
181188
t.Parallel()
182189
client := coderdtest.New(t)
183190
user := coderdtest.CreateInitialUser(t, client)
184-
coderdtest.NewProvisionerDaemon(t, client)
185-
project := coderdtest.CreateProject(t, client, user.Organization)
191+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
192+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
186193
_, err := client.CreateProjectParameter(context.Background(), user.Organization, project.Name, coderd.CreateParameterValueRequest{
187194
Name: "example",
188195
SourceValue: "source-value",

‎codersdk/provisioners_test.go

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/google/uuid"
99
"github.com/stretchr/testify/require"
1010

11-
"github.com/coder/coder/coderd"
1211
"github.com/coder/coder/coderd/coderdtest"
1312
"github.com/coder/coder/database"
1413
"github.com/coder/coder/provisioner/echo"
@@ -64,10 +63,8 @@ func TestProvisionerJobLogs(t *testing.T) {
6463
client := coderdtest.New(t)
6564
user := coderdtest.CreateInitialUser(t, client)
6665
_ = coderdtest.NewProvisionerDaemon(t, client)
67-
project := coderdtest.CreateProject(t, client, user.Organization, nil)
68-
version, err := client.ProjectVersion(context.Background(), user.Organization, project.Name, "latest")
69-
require.NoError(t, err)
70-
_, err = client.ProvisionerJobLogs(context.Background(), user.Organization, version.Import.ID)
66+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
67+
_, err := client.ProvisionerJobLogs(context.Background(), user.Organization, job.ID)
7168
require.NoError(t, err)
7269
})
7370
}
@@ -86,30 +83,22 @@ func TestFollowProvisionerJobLogsAfter(t *testing.T) {
8683
client := coderdtest.New(t)
8784
user := coderdtest.CreateInitialUser(t, client)
8885
_ = coderdtest.NewProvisionerDaemon(t, client)
89-
project := coderdtest.CreateProject(t, client, user.Organization)
90-
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, &echo.Responses{
91-
Parse: echo.ParseComplete,
92-
Provision: []*sdkproto.Provision_Response{{
93-
Type: &sdkproto.Provision_Response_Log{
86+
before := database.Now()
87+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, &echo.Responses{
88+
Parse: []*sdkproto.Parse_Response{{
89+
Type: &sdkproto.Parse_Response_Log{
9490
Log: &sdkproto.Log{
9591
Output: "hello",
9692
},
9793
},
9894
}, {
99-
Type: &sdkproto.Provision_Response_Complete{
100-
Complete: &sdkproto.Provision_Complete{},
95+
Type: &sdkproto.Parse_Response_Complete{
96+
Complete: &sdkproto.Parse_Complete{},
10197
},
10298
}},
99+
Provision: echo.ProvisionComplete,
103100
})
104-
coderdtest.AwaitProjectImportJob(t, client, user.Organization, project.Name, version.Name)
105-
workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
106-
after := database.Now()
107-
history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
108-
ProjectVersionID: version.ID,
109-
Transition: database.WorkspaceTransitionStart,
110-
})
111-
require.NoError(t, err)
112-
logs, err := client.FollowProvisionerJobLogsAfter(context.Background(), user.Organization, history.Provision.ID, after)
101+
logs, err := client.FollowProvisionerJobLogsAfter(context.Background(), user.Organization, job.ID, before)
113102
require.NoError(t, err)
114103
_, ok := <-logs
115104
require.True(t, ok)

‎codersdk/workspaces_test.go

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ func TestWorkspacesByProject(t *testing.T) {
4242
t.Parallel()
4343
client := coderdtest.New(t)
4444
user := coderdtest.CreateInitialUser(t, client)
45-
project := coderdtest.CreateProject(t, client, user.Organization)
45+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
46+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
4647
_, err := client.WorkspacesByProject(context.Background(), user.Organization, project.Name)
4748
require.NoError(t, err)
4849
})
@@ -61,7 +62,8 @@ func TestWorkspace(t *testing.T) {
6162
t.Parallel()
6263
client := coderdtest.New(t)
6364
user := coderdtest.CreateInitialUser(t, client)
64-
project := coderdtest.CreateProject(t, client, user.Organization)
65+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
66+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
6567
workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
6668
_, err := client.Workspace(context.Background(), "", workspace.Name)
6769
require.NoError(t, err)
@@ -81,7 +83,8 @@ func TestListWorkspaceHistory(t *testing.T) {
8183
t.Parallel()
8284
client := coderdtest.New(t)
8385
user := coderdtest.CreateInitialUser(t, client)
84-
project := coderdtest.CreateProject(t, client, user.Organization)
86+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
87+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
8588
workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
8689
_, err := client.ListWorkspaceHistory(context.Background(), "", workspace.Name)
8790
require.NoError(t, err)
@@ -102,12 +105,12 @@ func TestWorkspaceHistory(t *testing.T) {
102105
client := coderdtest.New(t)
103106
user := coderdtest.CreateInitialUser(t, client)
104107
_ = coderdtest.NewProvisionerDaemon(t, client)
105-
project := coderdtest.CreateProject(t, client, user.Organization)
106-
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
107-
coderdtest.AwaitProjectImportJob(t, client, user.Organization, project.Name, version.Name)
108+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
109+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
110+
coderdtest.AwaitProvisionerJob(t, client, user.Organization, job.ID)
108111
workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
109112
_, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
110-
ProjectVersionID: version.ID,
113+
ProjectVersionID: project.ActiveVersionID,
111114
Transition: database.WorkspaceTransitionStart,
112115
})
113116
require.NoError(t, err)
@@ -127,7 +130,8 @@ func TestCreateWorkspace(t *testing.T) {
127130
t.Parallel()
128131
client := coderdtest.New(t)
129132
user := coderdtest.CreateInitialUser(t, client)
130-
project := coderdtest.CreateProject(t, client, user.Organization)
133+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
134+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
131135
_ = coderdtest.CreateWorkspace(t, client, "", project.ID)
132136
})
133137
}
@@ -146,12 +150,12 @@ func TestCreateWorkspaceHistory(t *testing.T) {
146150
client := coderdtest.New(t)
147151
user := coderdtest.CreateInitialUser(t, client)
148152
_ = coderdtest.NewProvisionerDaemon(t, client)
149-
project := coderdtest.CreateProject(t, client, user.Organization)
150-
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
151-
coderdtest.AwaitProjectImportJob(t, client, user.Organization, project.Name, version.Name)
153+
job := coderdtest.CreateProjectImportProvisionerJob(t, client, user.Organization, nil)
154+
project := coderdtest.CreateProject(t, client, user.Organization, job.ID)
155+
coderdtest.AwaitProvisionerJob(t, client, user.Organization, job.ID)
152156
workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
153157
_, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
154-
ProjectVersionID: version.ID,
158+
ProjectVersionID: project.ActiveVersionID,
155159
Transition: database.WorkspaceTransitionStart,
156160
})
157161
require.NoError(t, err)

0 commit comments

Comments
 (0)