Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd7a788d

Browse files
authored
test(site): e2e: restart workspace with ephemeral parameters (#9304)
1 parentaed891b commitd7a788d

File tree

5 files changed

+219
-52
lines changed

5 files changed

+219
-52
lines changed

‎site/e2e/helpers.ts‎

Lines changed: 97 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -34,52 +34,16 @@ export const createWorkspace = async (
3434
constname=randomName()
3535
awaitpage.getByLabel("name").fill(name)
3636

37-
for(constbuildParameterofbuildParameters){
38-
constrichParameter=richParameters.find(
39-
(richParam)=>richParam.name===buildParameter.name,
40-
)
41-
if(!richParameter){
42-
thrownewError(
43-
"build parameter is expected to be present in rich parameter schema",
44-
)
45-
}
46-
47-
constparameterLabel=awaitpage.waitForSelector(
48-
"[data-testid='parameter-field-"+richParameter.name+"']",
49-
{state:"visible"},
50-
)
51-
52-
if(richParameter.type==="bool"){
53-
constparameterField=awaitparameterLabel.waitForSelector(
54-
"[data-testid='parameter-field-bool'] .MuiRadio-root input[value='"+
55-
buildParameter.value+
56-
"']",
57-
)
58-
awaitparameterField.check()
59-
}elseif(richParameter.options.length>0){
60-
constparameterField=awaitparameterLabel.waitForSelector(
61-
"[data-testid='parameter-field-options'] .MuiRadio-root input[value='"+
62-
buildParameter.value+
63-
"']",
64-
)
65-
awaitparameterField.check()
66-
}elseif(richParameter.type==="list(string)"){
67-
thrownewError("not implemented yet")// FIXME
68-
}else{
69-
// text or number
70-
constparameterField=awaitparameterLabel.waitForSelector(
71-
"[data-testid='parameter-field-text'] input",
72-
)
73-
awaitparameterField.fill(buildParameter.value)
74-
}
75-
}
76-
37+
awaitfillParameters(page,richParameters,buildParameters)
7738
awaitpage.getByTestId("form-submit").click()
7839

7940
awaitexpect(page).toHaveURL("/@admin/"+name)
80-
awaitpage.waitForSelector("[data-testid='build-status']",{
81-
state:"visible",
82-
})
41+
awaitpage.waitForSelector(
42+
"span[data-testid='build-status'] >> text=Running",
43+
{
44+
state:"visible",
45+
},
46+
)
8347
returnname
8448
}
8549

@@ -213,6 +177,50 @@ export const sshIntoWorkspace = async (
213177
})
214178
}
215179

180+
exportconststopWorkspace=async(page:Page,workspaceName:string)=>{
181+
awaitpage.goto("/@admin/"+workspaceName,{
182+
waitUntil:"domcontentloaded",
183+
})
184+
awaitexpect(page).toHaveURL("/@admin/"+workspaceName)
185+
186+
awaitpage.getByTestId("workspace-stop-button").click()
187+
188+
awaitpage.waitForSelector(
189+
"span[data-testid='build-status'] >> text=Stopped",
190+
{
191+
state:"visible",
192+
},
193+
)
194+
}
195+
196+
exportconstbuildWorkspaceWithParameters=async(
197+
page:Page,
198+
workspaceName:string,
199+
richParameters:RichParameter[]=[],
200+
buildParameters:WorkspaceBuildParameter[]=[],
201+
confirm:boolean=false,
202+
)=>{
203+
awaitpage.goto("/@admin/"+workspaceName,{
204+
waitUntil:"domcontentloaded",
205+
})
206+
awaitexpect(page).toHaveURL("/@admin/"+workspaceName)
207+
208+
awaitpage.getByTestId("build-parameters-button").click()
209+
210+
awaitfillParameters(page,richParameters,buildParameters)
211+
awaitpage.getByTestId("build-parameters-submit").click()
212+
if(confirm){
213+
awaitpage.getByTestId("confirm-button").click()
214+
}
215+
216+
awaitpage.waitForSelector(
217+
"span[data-testid='build-status'] >> text=Running",
218+
{
219+
state:"visible",
220+
},
221+
)
222+
}
223+
216224
// startAgent runs the coder agent with the provided token.
217225
// It awaits the agent to be ready before returning.
218226
exportconststartAgent=async(page:Page,token:string):Promise<void>=>{
@@ -561,3 +569,49 @@ export const echoResponsesWithParameters = (
561569
],
562570
}
563571
}
572+
573+
exportconstfillParameters=async(
574+
page:Page,
575+
richParameters:RichParameter[]=[],
576+
buildParameters:WorkspaceBuildParameter[]=[],
577+
)=>{
578+
for(constbuildParameterofbuildParameters){
579+
constrichParameter=richParameters.find(
580+
(richParam)=>richParam.name===buildParameter.name,
581+
)
582+
if(!richParameter){
583+
thrownewError(
584+
"build parameter is expected to be present in rich parameter schema",
585+
)
586+
}
587+
588+
constparameterLabel=awaitpage.waitForSelector(
589+
"[data-testid='parameter-field-"+richParameter.name+"']",
590+
{state:"visible"},
591+
)
592+
593+
if(richParameter.type==="bool"){
594+
constparameterField=awaitparameterLabel.waitForSelector(
595+
"[data-testid='parameter-field-bool'] .MuiRadio-root input[value='"+
596+
buildParameter.value+
597+
"']",
598+
)
599+
awaitparameterField.check()
600+
}elseif(richParameter.options.length>0){
601+
constparameterField=awaitparameterLabel.waitForSelector(
602+
"[data-testid='parameter-field-options'] .MuiRadio-root input[value='"+
603+
buildParameter.value+
604+
"']",
605+
)
606+
awaitparameterField.check()
607+
}elseif(richParameter.type==="list(string)"){
608+
thrownewError("not implemented yet")// FIXME
609+
}else{
610+
// text or number
611+
constparameterField=awaitparameterLabel.waitForSelector(
612+
"[data-testid='parameter-field-text'] input",
613+
)
614+
awaitparameterField.fill(buildParameter.value)
615+
}
616+
}
617+
}

‎site/e2e/parameters.ts‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export const firstParameter: RichParameter = {
2828
name:"first_parameter",
2929
displayName:"First parameter",
3030
type:"number",
31-
options:[],
3231
description:"This is first parameter.",
3332
icon:"/emojis/1f310.png",
3433
defaultValue:"123",
@@ -43,10 +42,8 @@ export const secondParameter: RichParameter = {
4342
name:"second_parameter",
4443
displayName:"Second parameter",
4544
type:"string",
46-
options:[],
4745
description:"This is second parameter.",
4846
defaultValue:"abc",
49-
icon:"",
5047
order:2,
5148
}
5249

@@ -56,7 +53,6 @@ export const thirdParameter: RichParameter = {
5653

5754
name:"third_parameter",
5855
type:"string",
59-
options:[],
6056
description:"This is third parameter.",
6157
defaultValue:"",
6258
mutable:true,
@@ -69,10 +65,8 @@ export const fourthParameter: RichParameter = {
6965

7066
name:"fourth_parameter",
7167
type:"bool",
72-
options:[],
7368
description:"This is fourth parameter.",
7469
defaultValue:"true",
75-
icon:"",
7670
order:3,
7771
}
7872

@@ -105,7 +99,6 @@ export const fifthParameter: RichParameter = {
10599
],
106100
description:"This is fifth parameter.",
107101
defaultValue:"def",
108-
icon:"",
109102
order:3,
110103
}
111104

@@ -116,7 +109,6 @@ export const sixthParameter: RichParameter = {
116109
name:"sixth_parameter",
117110
displayName:"Sixth parameter",
118111
type:"number",
119-
options:[],
120112
description:"This is sixth parameter.",
121113
icon:"/emojis/1f310.png",
122114
required:true,
@@ -131,8 +123,34 @@ export const seventhParameter: RichParameter = {
131123
name:"seventh_parameter",
132124
displayName:"Seventh parameter",
133125
type:"string",
134-
options:[],
135126
description:"This is seventh parameter.",
136127
required:true,
137128
order:1,
138129
}
130+
131+
// Build options
132+
133+
exportconstfirstBuildOption:RichParameter={
134+
...emptyParameter,
135+
136+
name:"first_build_option",
137+
displayName:"First build option",
138+
type:"string",
139+
description:"This is first build option.",
140+
icon:"/emojis/1f310.png",
141+
defaultValue:"ABCDEF",
142+
mutable:true,
143+
ephemeral:true,
144+
}
145+
146+
exportconstsecondBuildOption:RichParameter={
147+
...emptyParameter,
148+
149+
name:"second_build_option",
150+
displayName:"Second build option",
151+
type:"bool",
152+
description:"This is second build option.",
153+
defaultValue:"false",
154+
mutable:true,
155+
ephemeral:true,
156+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import{test}from"@playwright/test"
2+
import{
3+
buildWorkspaceWithParameters,
4+
createTemplate,
5+
createWorkspace,
6+
echoResponsesWithParameters,
7+
verifyParameters,
8+
}from"../helpers"
9+
10+
import{firstBuildOption,secondBuildOption}from"../parameters"
11+
import{RichParameter}from"../provisionerGenerated"
12+
13+
test("restart workspace with ephemeral parameters",async({ page})=>{
14+
constrichParameters:RichParameter[]=[firstBuildOption,secondBuildOption]
15+
consttemplate=awaitcreateTemplate(
16+
page,
17+
echoResponsesWithParameters(richParameters),
18+
)
19+
constworkspaceName=awaitcreateWorkspace(page,template)
20+
21+
// Verify that build options are default (not selected).
22+
awaitverifyParameters(page,workspaceName,richParameters,[
23+
{name:firstBuildOption.name,value:firstBuildOption.defaultValue},
24+
{name:secondBuildOption.name,value:secondBuildOption.defaultValue},
25+
])
26+
27+
// Now, restart the workspace with ephemeral parameters selected.
28+
constbuildParameters=[
29+
{name:firstBuildOption.name,value:"AAAAA"},
30+
{name:secondBuildOption.name,value:"true"},
31+
]
32+
awaitbuildWorkspaceWithParameters(
33+
page,
34+
workspaceName,
35+
richParameters,
36+
buildParameters,
37+
true,
38+
)
39+
40+
// Verify that build options are default (not selected).
41+
awaitverifyParameters(page,workspaceName,richParameters,[
42+
{name:firstBuildOption.name,value:firstBuildOption.defaultValue},
43+
{name:secondBuildOption.name,value:secondBuildOption.defaultValue},
44+
])
45+
})
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import{test}from"@playwright/test"
2+
import{
3+
buildWorkspaceWithParameters,
4+
createTemplate,
5+
createWorkspace,
6+
echoResponsesWithParameters,
7+
stopWorkspace,
8+
verifyParameters,
9+
}from"../helpers"
10+
11+
import{firstBuildOption,secondBuildOption}from"../parameters"
12+
import{RichParameter}from"../provisionerGenerated"
13+
14+
test("start workspace with ephemeral parameters",async({ page})=>{
15+
constrichParameters:RichParameter[]=[firstBuildOption,secondBuildOption]
16+
consttemplate=awaitcreateTemplate(
17+
page,
18+
echoResponsesWithParameters(richParameters),
19+
)
20+
constworkspaceName=awaitcreateWorkspace(page,template)
21+
22+
// Verify that build options are default (not selected).
23+
awaitverifyParameters(page,workspaceName,richParameters,[
24+
{name:firstBuildOption.name,value:firstBuildOption.defaultValue},
25+
{name:secondBuildOption.name,value:secondBuildOption.defaultValue},
26+
])
27+
28+
// Stop the workspace
29+
awaitstopWorkspace(page,workspaceName)
30+
31+
// Now, start the workspace with ephemeral parameters selected.
32+
constbuildParameters=[
33+
{name:firstBuildOption.name,value:"AAAAA"},
34+
{name:secondBuildOption.name,value:"true"},
35+
]
36+
37+
awaitbuildWorkspaceWithParameters(
38+
page,
39+
workspaceName,
40+
richParameters,
41+
buildParameters,
42+
)
43+
44+
// Verify that build options are default (not selected).
45+
awaitverifyParameters(page,workspaceName,richParameters,[
46+
{name:firstBuildOption.name,value:firstBuildOption.defaultValue},
47+
{name:secondBuildOption.name,value:secondBuildOption.defaultValue},
48+
])
49+
})

‎site/src/components/WorkspaceActions/Buttons.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export const StopButton: FC<WorkspaceAction> = ({ handleAction, loading }) => {
9494
loadingPosition="start"
9595
startIcon={<CropSquareIcon/>}
9696
onClick={handleAction}
97+
data-testid="workspace-stop-button"
9798
>
9899
Stop
99100
</LoadingButton>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp