Skip to content

Commit 6fd3da5

Browse files
mtojekmtojek
committed
Verify if build option is set
1 parent 1591615 commit 6fd3da5

File tree

4 files changed

+65
-3
lines changed

4 files changed

+65
-3
lines changed

‎cli/create_test.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,8 @@ func TestCreateWithRichParameters(t *testing.T) {
316316

317317
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
318318

319-
inv, root := clitest.New(t, "create", "my-workspace", "--template", template.Name, "--build-options")
319+
const workspaceName = "my-workspace"
320+
inv, root := clitest.New(t, "create", workspaceName, "--template", template.Name, "--build-options")
320321
clitest.SetupConfig(t, client, root)
321322
doneChan := make(chan struct{})
322323
pty := ptytest.New(t).Attach(inv)
@@ -344,6 +345,19 @@ func TestCreateWithRichParameters(t *testing.T) {
344345
}
345346
}
346347
<-doneChan
348+
349+
// Verify if build option is set
350+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
351+
defer cancel()
352+
353+
workspace, err := client.WorkspaceByOwnerAndName(ctx, user.UserID.String(), workspaceName, codersdk.WorkspaceOptions{})
354+
require.NoError(t, err)
355+
actualParameters, err := client.WorkspaceBuildParameters(ctx, workspace.LatestBuild.ID)
356+
require.NoError(t, err)
357+
require.Contains(t, actualParameters, codersdk.WorkspaceBuildParameter{
358+
Name: ephemeralParameterName,
359+
Value: ephemeralParameterValue,
360+
})
347361
})
348362
}
349363

‎cli/restart_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package cli_test
22

33
import (
4+
"context"
45
"testing"
56

67
"github.com/stretchr/testify/assert"
78
"github.com/stretchr/testify/require"
89

910
"github.com/coder/coder/cli/clitest"
1011
"github.com/coder/coder/coderd/coderdtest"
12+
"github.com/coder/coder/codersdk"
1113
"github.com/coder/coder/provisioner/echo"
1214
"github.com/coder/coder/provisionersdk/proto"
1315
"github.com/coder/coder/pty/ptytest"
@@ -110,5 +112,18 @@ func TestRestart(t *testing.T) {
110112
}
111113
}
112114
<-doneChan
115+
116+
// Verify if build option is set
117+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
118+
defer cancel()
119+
120+
workspace, err := client.WorkspaceByOwnerAndName(ctx, user.UserID.String(), workspace.Name, codersdk.WorkspaceOptions{})
121+
require.NoError(t, err)
122+
actualParameters, err := client.WorkspaceBuildParameters(ctx, workspace.LatestBuild.ID)
123+
require.NoError(t, err)
124+
require.Contains(t, actualParameters, codersdk.WorkspaceBuildParameter{
125+
Name: ephemeralParameterName,
126+
Value: ephemeralParameterValue,
127+
})
113128
})
114129
}

‎cli/start_test.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ import (
44
"testing"
55

66
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
8+
"golang.org/x/net/context"
79

810
"github.com/coder/coder/cli/clitest"
911
"github.com/coder/coder/coderd/coderdtest"
12+
"github.com/coder/coder/codersdk"
1013
"github.com/coder/coder/provisioner/echo"
1114
"github.com/coder/coder/provisionersdk/proto"
1215
"github.com/coder/coder/pty/ptytest"
16+
"github.com/coder/coder/testutil"
1317
)
1418

1519
const (
@@ -81,5 +85,18 @@ func TestStart(t *testing.T) {
8185
}
8286
}
8387
<-doneChan
88+
89+
// Verify if build option is set
90+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
91+
defer cancel()
92+
93+
workspace, err := client.WorkspaceByOwnerAndName(ctx, workspace.OwnerName, workspace.Name, codersdk.WorkspaceOptions{})
94+
require.NoError(t, err)
95+
actualParameters, err := client.WorkspaceBuildParameters(ctx, workspace.LatestBuild.ID)
96+
require.NoError(t, err)
97+
require.Contains(t, actualParameters, codersdk.WorkspaceBuildParameter{
98+
Name: ephemeralParameterName,
99+
Value: ephemeralParameterValue,
100+
})
84101
})
85102
}

‎cli/update_test.go

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/coder/coder/provisioner/echo"
1717
"github.com/coder/coder/provisionersdk/proto"
1818
"github.com/coder/coder/pty/ptytest"
19+
"github.com/coder/coder/testutil"
1920
)
2021

2122
func TestUpdate(t *testing.T) {
@@ -190,12 +191,14 @@ func TestUpdateWithRichParameters(t *testing.T) {
190191
immutableParameterName + ": " + immutableParameterValue + "\n" +
191192
secondParameterName + ": " + secondParameterValue)
192193

193-
inv, root := clitest.New(t, "create", "my-workspace", "--template", template.Name, "--rich-parameter-file", parameterFile.Name(), "-y")
194+
const workspaceName = "my-workspace"
195+
196+
inv, root := clitest.New(t, "create", workspaceName, "--template", template.Name, "--rich-parameter-file", parameterFile.Name(), "-y")
194197
clitest.SetupConfig(t, client, root)
195198
err := inv.Run()
196199
assert.NoError(t, err)
197200

198-
inv, root = clitest.New(t, "update", "my-workspace", "--build-options")
201+
inv, root = clitest.New(t, "update", workspaceName, "--build-options")
199202
clitest.SetupConfig(t, client, root)
200203

201204
doneChan := make(chan struct{})
@@ -219,6 +222,19 @@ func TestUpdateWithRichParameters(t *testing.T) {
219222
}
220223
}
221224
<-doneChan
225+
226+
// Verify if build option is set
227+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
228+
defer cancel()
229+
230+
workspace, err := client.WorkspaceByOwnerAndName(ctx, user.UserID.String(), workspaceName, codersdk.WorkspaceOptions{})
231+
require.NoError(t, err)
232+
actualParameters, err := client.WorkspaceBuildParameters(ctx, workspace.LatestBuild.ID)
233+
require.NoError(t, err)
234+
require.Contains(t, actualParameters, codersdk.WorkspaceBuildParameter{
235+
Name: ephemeralParameterName,
236+
Value: ephemeralParameterValue,
237+
})
222238
})
223239
}
224240

0 commit comments

Comments
 (0)