Skip to content

Commit f7cb744

Browse files
johnstcnjohnstcn
committed
wsbuilder: make tests pass
1 parent 2279385 commit f7cb744

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

‎coderd/wsbuilder/wsbuilder_test.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ func TestBuilder_NoOptions(t *testing.T) {
5858
withTemplate,
5959
withInactiveVersion(nil),
6060
withLastBuildFound,
61+
withTemplateVersionVariables(inactiveVersionID, nil),
6162
withRichParameters(nil),
6263
withParameterSchemas(inactiveJobID, nil),
6364
withWorkspaceTags(inactiveVersionID, nil),
@@ -113,6 +114,7 @@ func TestBuilder_Initiator(t *testing.T) {
113114
withTemplate,
114115
withInactiveVersion(nil),
115116
withLastBuildFound,
117+
withTemplateVersionVariables(inactiveVersionID, nil),
116118
withRichParameters(nil),
117119
withParameterSchemas(inactiveJobID, nil),
118120
withWorkspaceTags(inactiveVersionID, nil),
@@ -158,6 +160,7 @@ func TestBuilder_Baggage(t *testing.T) {
158160
withTemplate,
159161
withInactiveVersion(nil),
160162
withLastBuildFound,
163+
withTemplateVersionVariables(inactiveVersionID, nil),
161164
withRichParameters(nil),
162165
withParameterSchemas(inactiveJobID, nil),
163166
withWorkspaceTags(inactiveVersionID, nil),
@@ -195,6 +198,7 @@ func TestBuilder_Reason(t *testing.T) {
195198
withTemplate,
196199
withInactiveVersion(nil),
197200
withLastBuildFound,
201+
withTemplateVersionVariables(inactiveVersionID, nil),
198202
withRichParameters(nil),
199203
withParameterSchemas(inactiveJobID, nil),
200204
withWorkspaceTags(inactiveVersionID, nil),
@@ -232,6 +236,7 @@ func TestBuilder_ActiveVersion(t *testing.T) {
232236
withTemplate,
233237
withActiveVersion(nil),
234238
withLastBuildNotFound,
239+
withTemplateVersionVariables(activeVersionID, nil),
235240
withParameterSchemas(activeJobID, nil),
236241
withWorkspaceTags(activeVersionID, nil),
237242
withProvisionerDaemons([]database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow{}),
@@ -321,6 +326,7 @@ func TestWorkspaceBuildWithTags(t *testing.T) {
321326
withTemplate,
322327
withInactiveVersion(richParameters),
323328
withLastBuildFound,
329+
withTemplateVersionVariables(inactiveVersionID, nil),
324330
withRichParameters(nil),
325331
withParameterSchemas(inactiveJobID, nil),
326332
withWorkspaceTags(inactiveVersionID, workspaceTags),
@@ -459,6 +465,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
459465
withTemplate,
460466
withInactiveVersion(richParameters),
461467
withLastBuildFound,
468+
withTemplateVersionVariables(inactiveVersionID, nil),
462469
withRichParameters(initialBuildParameters),
463470
withParameterSchemas(inactiveJobID, nil),
464471
withWorkspaceTags(inactiveVersionID, nil),
@@ -511,6 +518,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
511518
withTemplate,
512519
withInactiveVersion(richParameters),
513520
withLastBuildFound,
521+
withTemplateVersionVariables(inactiveVersionID, nil),
514522
withRichParameters(nil),
515523
withParameterSchemas(inactiveJobID, schemas),
516524
withWorkspaceTags(inactiveVersionID, nil),
@@ -542,6 +550,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
542550
withTemplate,
543551
withInactiveVersion(richParameters),
544552
withLastBuildFound,
553+
withTemplateVersionVariables(inactiveVersionID, nil),
545554
withRichParameters(initialBuildParameters),
546555
withParameterSchemas(inactiveJobID, nil),
547556
withWorkspaceTags(inactiveVersionID, nil),
@@ -593,6 +602,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
593602
withTemplate,
594603
withActiveVersion(version2params),
595604
withLastBuildFound,
605+
withTemplateVersionVariables(activeVersionID, nil),
596606
withRichParameters(initialBuildParameters),
597607
withParameterSchemas(activeJobID, nil),
598608
withWorkspaceTags(activeVersionID, nil),
@@ -655,6 +665,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
655665
withTemplate,
656666
withActiveVersion(version2params),
657667
withLastBuildFound,
668+
withTemplateVersionVariables(activeVersionID, nil),
658669
withRichParameters(initialBuildParameters),
659670
withParameterSchemas(activeJobID, nil),
660671
withWorkspaceTags(activeVersionID, nil),
@@ -921,6 +932,18 @@ func withParameterSchemas(jobID uuid.UUID, schemas []database.ParameterSchema) f
921932
}
922933
}
923934

935+
func withTemplateVersionVariables(versionID uuid.UUID, params []database.TemplateVersionVariable) func(mTx *dbmock.MockStore) {
936+
return func(mTx *dbmock.MockStore) {
937+
c := mTx.EXPECT().GetTemplateVersionVariables(gomock.Any(), versionID).
938+
Times(1)
939+
if len(params) > 0 {
940+
c.Return(params, nil)
941+
} else {
942+
c.Return(nil, sql.ErrNoRows)
943+
}
944+
}
945+
}
946+
924947
func withRichParameters(params []database.WorkspaceBuildParameter) func(mTx *dbmock.MockStore) {
925948
return func(mTx *dbmock.MockStore) {
926949
c := mTx.EXPECT().GetWorkspaceBuildParameters(gomock.Any(), lastBuildID).

0 commit comments

Comments
 (0)