@spinnaker/amazon 2026.3.2 → 2026.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (202) hide show
  1. package/dist/common/AwsModalFooter.d.ts +1 -1
  2. package/dist/deploymentStrategy/AdditionalFields.d.ts +1 -1
  3. package/dist/function/CreateLambdaFunction.d.ts +1 -1
  4. package/dist/function/configure/ExecutionRole.d.ts +1 -1
  5. package/dist/function/configure/FunctionBasicInformation.d.ts +1 -1
  6. package/dist/function/configure/FunctionDebugAndErrorHandling.d.ts +1 -1
  7. package/dist/function/configure/FunctionEnvironmentVariables.d.ts +1 -1
  8. package/dist/function/configure/FunctionSettings.d.ts +1 -1
  9. package/dist/function/configure/FunctionTags.d.ts +1 -1
  10. package/dist/function/configure/Network.d.ts +1 -1
  11. package/dist/function/details/AmazonFunctionDetails.d.ts +1 -1
  12. package/dist/function/details/FunctionActions.d.ts +1 -1
  13. package/dist/index.js +279 -1
  14. package/dist/index.js.map +1 -1
  15. package/dist/instance/details/AmazonInstanceInformation.d.ts +2 -2
  16. package/dist/instance/details/CostFactor.d.ts +2 -2
  17. package/dist/instance/details/InstanceDns.d.ts +2 -2
  18. package/dist/instance/details/InstanceInformation.d.ts +2 -2
  19. package/dist/instance/details/InstanceSecurityGroups.d.ts +2 -2
  20. package/dist/instance/details/InstanceStatus.d.ts +2 -2
  21. package/dist/instance/details/InstanceTags.d.ts +2 -2
  22. package/dist/loadBalancer/configure/AmazonLoadBalancerChoiceModal.d.ts +1 -1
  23. package/dist/loadBalancer/configure/application/ALBListeners.d.ts +1 -1
  24. package/dist/loadBalancer/configure/application/ConfigureOidcConfigModal.d.ts +1 -1
  25. package/dist/loadBalancer/configure/application/ConfigureRedirectConfigModal.d.ts +1 -1
  26. package/dist/loadBalancer/configure/application/CreateApplicationLoadBalancer.d.ts +1 -1
  27. package/dist/loadBalancer/configure/application/TargetGroups.d.ts +1 -1
  28. package/dist/loadBalancer/configure/classic/AdvancedSettings.d.ts +1 -1
  29. package/dist/loadBalancer/configure/classic/HealthCheck.d.ts +1 -1
  30. package/dist/loadBalancer/configure/classic/Listeners.d.ts +1 -1
  31. package/dist/loadBalancer/configure/common/AmazonCertificateSelectField.d.ts +1 -1
  32. package/dist/loadBalancer/configure/common/LoadBalancerLocation.d.ts +1 -1
  33. package/dist/loadBalancer/configure/common/SecurityGroups.d.ts +1 -1
  34. package/dist/loadBalancer/configure/network/CertificateSelectors.d.ts +2 -2
  35. package/dist/loadBalancer/configure/network/NLBListeners.d.ts +1 -1
  36. package/dist/loadBalancer/configure/network/TargetGroups.d.ts +1 -1
  37. package/dist/loadBalancer/details/LoadBalancerActions.d.ts +1 -1
  38. package/dist/pipeline/stages/AmazonStageConfig.d.ts +2 -2
  39. package/dist/pipeline/stages/bake/AwsBakeStageConfig.d.ts +2 -2
  40. package/dist/pipeline/stages/cloneServerGroup/AwsCloneServerGroupStageConfig.d.ts +2 -2
  41. package/dist/pipeline/stages/deleteLambda/DeleteLambdaFunctionStageForm.d.ts +2 -2
  42. package/dist/pipeline/stages/deleteLambda/LambdaDeleteStage.d.ts +2 -2
  43. package/dist/pipeline/stages/deleteLambda/constants/deleteVersion.picker.d.ts +1 -1
  44. package/dist/pipeline/stages/deployCloudFormation/CloudFormationChangeSetInfo.d.ts +2 -2
  45. package/dist/pipeline/stages/deployCloudFormation/DeployCloudFormationStackStageConfig.d.ts +2 -2
  46. package/dist/pipeline/stages/deployCloudFormation/deployCloudFormationExecutionDetails.d.ts +1 -1
  47. package/dist/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecutionApproval.d.ts +2 -2
  48. package/dist/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecutionDetails.d.ts +1 -1
  49. package/dist/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecutionLabel.d.ts +1 -1
  50. package/dist/pipeline/stages/deployCloudFormation/evaluateCloudFormationChangeSetExecutionMarkerIcon.d.ts +1 -1
  51. package/dist/pipeline/stages/deployLambda/components/AwsLambdaFunctionStageForm.d.ts +2 -2
  52. package/dist/pipeline/stages/deployLambda/components/BasicSettingsForm.d.ts +2 -2
  53. package/dist/pipeline/stages/deployLambda/components/EnvironmentForm.d.ts +2 -2
  54. package/dist/pipeline/stages/deployLambda/components/ExecutionRoleForm.d.ts +2 -2
  55. package/dist/pipeline/stages/deployLambda/components/LambdaAtEdgeForm.d.ts +2 -2
  56. package/dist/pipeline/stages/deployLambda/components/NetworkForm.d.ts +2 -2
  57. package/dist/pipeline/stages/deployLambda/components/TriggerEventsForm.d.ts +2 -2
  58. package/dist/pipeline/stages/deployLambda/config/LambdaDeploymentStageConfig.d.ts +2 -2
  59. package/dist/pipeline/stages/deployLambda/config/LambdaDeploymentStageExecutionDetails.d.ts +2 -2
  60. package/dist/pipeline/stages/disableAsg/AwsDisableAsgStageConfig.d.ts +2 -2
  61. package/dist/pipeline/stages/disableCluster/AwsDisableClusterStageConfig.d.ts +2 -2
  62. package/dist/pipeline/stages/enableAsg/AwsEnableAsgStageConfig.d.ts +2 -2
  63. package/dist/pipeline/stages/findImageFromTags/AwsFindImageFromTagsStageConfig.d.ts +2 -2
  64. package/dist/pipeline/stages/invokeLambda/InvokeLambdaFunctionStageForm.d.ts +2 -2
  65. package/dist/pipeline/stages/invokeLambda/LambdaInvokeStage.d.ts +2 -2
  66. package/dist/pipeline/stages/invokeLambda/components/InvokeLambdaOperation.d.ts +2 -2
  67. package/dist/pipeline/stages/modifyScalingProcess/ModifyScalingProcessStageConfig.d.ts +2 -2
  68. package/dist/pipeline/stages/modifyWarmPool/ModifyWarmPoolStageConfig.d.ts +2 -2
  69. package/dist/pipeline/stages/resizeAsg/AwsResizeAsgStageConfig.d.ts +2 -2
  70. package/dist/pipeline/stages/rollbackCluster/AwsRollbackClusterStageConfig.d.ts +2 -2
  71. package/dist/pipeline/stages/routeLambda/LambdaRouteStage.d.ts +2 -2
  72. package/dist/pipeline/stages/routeLambda/RouteLambdaFunctionStageForm.d.ts +2 -2
  73. package/dist/pipeline/stages/routeLambda/TriggerEventsForm.d.ts +2 -2
  74. package/dist/pipeline/stages/routeLambda/components/BlueGreenDeployment/BlueGreenDeploymentForm.d.ts +2 -2
  75. package/dist/pipeline/stages/routeLambda/components/BlueGreenDeployment/HealthCheckStrategy.d.ts +2 -2
  76. package/dist/pipeline/stages/routeLambda/components/BlueGreenDeployment/InvocationHealthCheck.d.ts +2 -2
  77. package/dist/pipeline/stages/routeLambda/components/DeploymentStrategyForm.d.ts +2 -2
  78. package/dist/pipeline/stages/routeLambda/components/RenderStrategy.d.ts +2 -2
  79. package/dist/pipeline/stages/routeLambda/components/SimpleDeploymentForm.d.ts +2 -2
  80. package/dist/pipeline/stages/routeLambda/components/VersionPicker.d.ts +1 -1
  81. package/dist/pipeline/stages/routeLambda/components/WeightedDeploymentForm.d.ts +2 -2
  82. package/dist/pipeline/stages/routeLambda/constants/strategy.picker.d.ts +1 -1
  83. package/dist/pipeline/stages/scaleDownCluster/AwsScaleDownClusterStageConfig.d.ts +2 -2
  84. package/dist/pipeline/stages/shrinkCluster/AwsShrinkClusterStageConfig.d.ts +2 -2
  85. package/dist/pipeline/stages/tagImage/awsTagImageStage.d.ts +2 -2
  86. package/dist/pipeline/stages/updateCodeLambda/LambdaUpdateCodeStageConfig.d.ts +2 -2
  87. package/dist/pipeline/stages/updateCodeLambda/LambdaUpdateCodeStageExecutionDetails.d.ts +2 -2
  88. package/dist/pipeline/stages/updateCodeLambda/components/UpdateCodeStageForm.d.ts +2 -2
  89. package/dist/securityGroup/details/IPRangeRules.d.ts +1 -1
  90. package/dist/serverGroup/configure/AmazonImageSelectInput.d.ts +1 -1
  91. package/dist/serverGroup/configure/wizard/AmazonCloneServerGroupModal.d.ts +1 -1
  92. package/dist/serverGroup/configure/wizard/ServerGroupTemplateSelection.d.ts +1 -1
  93. package/dist/serverGroup/configure/wizard/capacity/CapacitySelector.d.ts +1 -1
  94. package/dist/serverGroup/configure/wizard/capacity/MinMaxDesired.d.ts +1 -1
  95. package/dist/serverGroup/configure/wizard/instanceType/CpuCreditsToggle.d.ts +2 -2
  96. package/dist/serverGroup/configure/wizard/instanceType/InstanceTypeSelector.d.ts +2 -2
  97. package/dist/serverGroup/configure/wizard/instanceType/InstanceTypeWarning.d.ts +2 -2
  98. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/AdvancedModeSelector.d.ts +2 -2
  99. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/AmazonInstanceTypeInfoRenderer.d.ts +2 -2
  100. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceProfileSelector.d.ts +2 -2
  101. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeRow.d.ts +2 -2
  102. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeSelect.d.ts +2 -2
  103. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTable.d.ts +2 -2
  104. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTableBody.d.ts +2 -2
  105. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTableParts.d.ts +4 -4
  106. package/dist/serverGroup/configure/wizard/instanceType/advancedMode/InstancesDistribution.d.ts +2 -2
  107. package/dist/serverGroup/configure/wizard/instanceType/simpleMode/SimpleModeSelector.d.ts +2 -2
  108. package/dist/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.d.ts +1 -1
  109. package/dist/serverGroup/configure/wizard/pages/ServerGroupCapacity.d.ts +1 -1
  110. package/dist/serverGroup/configure/wizard/pages/ServerGroupInstanceType.d.ts +1 -1
  111. package/dist/serverGroup/configure/wizard/pages/ServerGroupLoadBalancers.d.ts +1 -1
  112. package/dist/serverGroup/configure/wizard/pages/ServerGroupSecurityGroups.d.ts +1 -1
  113. package/dist/serverGroup/configure/wizard/pages/ServerGroupZones.d.ts +1 -1
  114. package/dist/serverGroup/configure/wizard/pages/advancedSettings/ServerGroupAdvancedSettings.d.ts +1 -1
  115. package/dist/serverGroup/configure/wizard/pages/advancedSettings/ServerGroupAdvancedSettingsCommon.d.ts +1 -1
  116. package/dist/serverGroup/configure/wizard/pages/advancedSettings/ServerGroupAdvancedSettingsInner.d.ts +1 -1
  117. package/dist/serverGroup/configure/wizard/securityGroups/SecurityGroupSelector.d.ts +1 -1
  118. package/dist/serverGroup/configure/wizard/securityGroups/ServerGroupSecurityGroupsRemoved.d.ts +1 -1
  119. package/dist/serverGroup/details/advancedSettings/EditAsgAdvancedSettingsModal.d.ts +2 -1
  120. package/dist/serverGroup/details/resize/AmazonResizeServerGroupModal.d.ts +1 -1
  121. package/dist/serverGroup/details/scalingPolicy/CreateScalingPolicyButton.d.ts +1 -1
  122. package/dist/serverGroup/details/scalingPolicy/ScalingPolicySummary.d.ts +2 -2
  123. package/dist/serverGroup/details/scalingPolicy/StepPolicySummary.d.ts +2 -2
  124. package/dist/serverGroup/details/scalingPolicy/chart/DateLineChart.d.ts +2 -2
  125. package/dist/serverGroup/details/scalingPolicy/chart/MetricAlarmChart.d.ts +3 -3
  126. package/dist/serverGroup/details/scalingPolicy/popover/AlarmSummary.d.ts +2 -2
  127. package/dist/serverGroup/details/scalingPolicy/popover/StepPolicyPopoverContent.d.ts +2 -2
  128. package/dist/serverGroup/details/scalingPolicy/targetTracking/TargetMetricFields.d.ts +2 -2
  129. package/dist/serverGroup/details/scalingPolicy/targetTracking/TargetTrackingAdditionalSettings.d.ts +2 -3
  130. package/dist/serverGroup/details/scalingPolicy/targetTracking/TargetTrackingChart.d.ts +2 -2
  131. package/dist/serverGroup/details/scalingPolicy/targetTracking/TargetTrackingSummary.d.ts +2 -2
  132. package/dist/serverGroup/details/scalingPolicy/targetTracking/UpsertTargetTrackingModal.d.ts +2 -2
  133. package/dist/serverGroup/details/scalingPolicy/upsert/PolicyTypeSelectionModal.d.ts +2 -2
  134. package/dist/serverGroup/details/scalingPolicy/upsert/ScalingPolicyAdditionalSettings.d.ts +2 -2
  135. package/dist/serverGroup/details/scalingPolicy/upsert/UpsertScalingPolicyModal.d.ts +2 -2
  136. package/dist/serverGroup/details/scalingPolicy/upsert/alarm/AlarmConfigurer.d.ts +2 -2
  137. package/dist/serverGroup/details/scalingPolicy/upsert/alarm/DimensionsEditor.d.ts +2 -2
  138. package/dist/serverGroup/details/scalingPolicy/upsert/alarm/MetricSelector.d.ts +2 -2
  139. package/dist/serverGroup/details/scalingPolicy/upsert/simple/SimplePolicyAction.d.ts +2 -2
  140. package/dist/serverGroup/details/scalingPolicy/upsert/step/StepPolicyAction.d.ts +2 -2
  141. package/dist/serverGroup/details/scalingProcesses/ModifyScalingProcessesModal.d.ts +1 -1
  142. package/dist/serverGroup/details/scheduledAction/ScheduledAction.d.ts +1 -1
  143. package/dist/serverGroup/details/scheduledActions/EditScheduledActionsModal.d.ts +1 -1
  144. package/dist/serverGroup/details/sections/InstancesDistributionDetailsSection.d.ts +2 -2
  145. package/dist/serverGroup/details/sections/LaunchTemplateDetailsSection.d.ts +2 -2
  146. package/dist/serverGroup/details/sections/MultipleInstanceTypesSubSection.d.ts +2 -2
  147. package/dist/serverGroup/details/securityGroups/EditSecurityGroupsModal.d.ts +1 -1
  148. package/dist/serverGroup/details/warmPool/ModifyWarmPoolModal.d.ts +1 -1
  149. package/dist/subnet/SubnetSelectField.d.ts +1 -1
  150. package/dist/subnet/SubnetSelectInput.d.ts +1 -1
  151. package/dist/vpc/VpcTag.d.ts +2 -2
  152. package/package.json +5 -7
  153. package/src/aws.module.spec.ts +20 -21
  154. package/src/function/details/AmazonFunctionDetails.tsx +1 -1
  155. package/src/function/details/FunctionActions.spec.tsx +56 -36
  156. package/src/instance/awsInstanceType.service.spec.js +24 -22
  157. package/src/instance/details/AmazonInstanceDetails.spec.tsx +7 -7
  158. package/src/instance/details/InstanceInformation.spec.tsx +44 -24
  159. package/src/loadBalancer/AmazonLoadBalancersTag.spec.tsx +1 -1
  160. package/src/loadBalancer/TargetGroupDetails.spec.tsx +5 -5
  161. package/src/loadBalancer/configure/application/TargetGroups.tsx +1 -1
  162. package/src/loadBalancer/configure/common/SecurityGroups.spec.tsx +4 -4
  163. package/src/loadBalancer/configure/network/TargetGroups.tsx +1 -1
  164. package/src/loadBalancer/details/amazonLoadBalancerDetails.spec.tsx +31 -53
  165. package/src/pipeline/stages/AmazonStageConfig.spec.tsx +37 -46
  166. package/src/pipeline/stages/deployCloudFormation/DeployCloudFormationStackStageConfig.tsx +1 -0
  167. package/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackStage.spec.tsx +316 -279
  168. package/src/pipeline/stages/findImageFromTags/AwsFindImageFromTagsStageConfig.spec.tsx +70 -90
  169. package/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.spec.tsx +198 -130
  170. package/src/pipeline/stages/modifyWarmPool/modifyWarmPoolStage.spec.tsx +49 -40
  171. package/src/pipeline/stages/resizeAsg/AwsResizeAsgStageConfig.spec.tsx +341 -427
  172. package/src/pipeline/stages/resizeAsg/AwsResizeAsgStageConfig.tsx +7 -0
  173. package/src/pipeline/stages/tagImage/awsTagImageStage.spec.tsx +62 -107
  174. package/src/routerConsumers.spec.tsx +23 -23
  175. package/src/securityGroup/configure/AmazonSecurityGroupModal.spec.tsx +38 -47
  176. package/src/securityGroup/details/AmazonSecurityGroupDetails.spec.tsx +7 -6
  177. package/src/serverGroup/configure/AmazonImageSelectInput.spec.tsx +47 -65
  178. package/src/serverGroup/configure/AmazonImageSelectInput.tsx +1 -1
  179. package/src/serverGroup/configure/serverGroupCommandBuilder.aws.service.spec.js +18 -19
  180. package/src/serverGroup/configure/serverGroupCommandBuilder.spec.js +41 -26
  181. package/src/serverGroup/configure/wizard/instanceType/simpleMode/SimpleModeSelector.spec.tsx +52 -75
  182. package/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.spec.tsx +1 -1
  183. package/src/serverGroup/configure/wizard/pages/advancedSettings/ServerGroupAdvancedSettingsCommon.spec.tsx +36 -33
  184. package/src/serverGroup/configure/wizard/pages/advancedSettings/ServerGroupAdvancedSettingsCommon.tsx +7 -1
  185. package/src/serverGroup/configure/wizard/securityGroups/SecurityGroupSelector.spec.tsx +2 -2
  186. package/src/serverGroup/details/AmazonServerGroupActions.spec.tsx +79 -67
  187. package/src/serverGroup/details/advancedSettings/EditAsgAdvancedSettingsModal.spec.tsx +78 -66
  188. package/src/serverGroup/details/advancedSettings/EditAsgAdvancedSettingsModal.tsx +23 -6
  189. package/src/serverGroup/details/rollback/AmazonRollbackServerGroupModal.spec.tsx +86 -94
  190. package/src/serverGroup/details/rollback/AmazonRollbackServerGroupModal.tsx +3 -0
  191. package/src/serverGroup/details/scalingPolicy/targetTracking/TargetTrackingAdditionalSettings.tsx +1 -39
  192. package/src/serverGroup/details/scalingPolicy/targetTracking/UpsertTargetTrackingModal.tsx +0 -1
  193. package/src/serverGroup/details/scalingProcesses/ModifyScalingProcessesModal.spec.tsx +5 -5
  194. package/src/serverGroup/details/scheduledActions/EditScheduledActionsModal.spec.tsx +8 -8
  195. package/src/serverGroup/details/sections/AmazonServerGroupMaintenanceActions.spec.tsx +71 -60
  196. package/src/serverGroup/details/sections/InstancesDistributionDetailsSection.spec.tsx +21 -39
  197. package/src/serverGroup/details/sections/LaunchTemplateDetailsSection.spec.tsx +56 -97
  198. package/src/serverGroup/details/securityGroups/EditSecurityGroupsModal.spec.tsx +48 -77
  199. package/src/serverGroup/details/warmPool/ModifyWarmPoolModal.spec.tsx +5 -5
  200. package/src/vpc/VpcReader.spec.ts +1 -1
  201. package/src/vpc/VpcTag.spec.tsx +11 -15
  202. /package/dist/{amazon.logo352d4e042476837f.svg → amazon.logoBzC5E-3F.svg} +0 -0
@@ -2,7 +2,7 @@ import { ServerGroupBasicSettingsComponent } from './ServerGroupBasicSettings';
2
2
 
3
3
  describe('Amazon ServerGroupBasicSettings', () => {
4
4
  it('opens the latest server group through the injected state service', () => {
5
- const stateService = { go: jasmine.createSpy('go'), is: () => true };
5
+ const stateService = { go: vi.fn(), is: () => true };
6
6
  const component = new ServerGroupBasicSettingsComponent({
7
7
  app: {
8
8
  clusters: [],
@@ -1,53 +1,56 @@
1
- import { shallow } from 'enzyme';
2
- import { Field } from 'formik';
1
+ import { render, screen } from '@testing-library/react';
2
+ import { Form, Formik } from 'formik';
3
3
  import React from 'react';
4
4
 
5
5
  import { ServerGroupAdvancedSettingsCommon } from './ServerGroupAdvancedSettingsCommon';
6
6
 
7
7
  describe('ServerGroupAdvancedSettingsCommon', () => {
8
8
  it('uses the standard wizard label grid instead of centering the form controls', () => {
9
- const component = shallow(
10
- <ServerGroupAdvancedSettingsCommon app={buildApplication() as any} formik={buildFormik() as any} />,
9
+ render(
10
+ <Formik initialValues={buildValues() as any} onSubmit={vi.fn()}>
11
+ {(formik) => (
12
+ <Form>
13
+ <ServerGroupAdvancedSettingsCommon app={buildApplication() as any} formik={formik as any} />
14
+ </Form>
15
+ )}
16
+ </Formik>,
11
17
  );
12
18
 
13
- expect(component.find('.form-group').first().find('.sm-label-right').first().hasClass('col-md-3')).toBe(true);
14
- expect(component.find('.form-group').first().find(Field).parent().hasClass('col-md-2')).toBe(true);
19
+ const cooldown = screen.getByRole('textbox', { name: 'Cooldown' });
20
+ expect(screen.getByText('Cooldown').closest('.sm-label-right')).toHaveClass('col-md-3');
21
+ expect(cooldown.closest('.form-group')).toHaveClass('form-group');
22
+ expect(cooldown.parentElement).toHaveClass('col-md-2');
15
23
  });
16
24
  });
17
25
 
18
26
  function buildApplication() {
19
- return {
20
- attributes: {
21
- platformHealthOnlyShowOverride: false,
22
- },
23
- };
27
+ return { attributes: { platformHealthOnlyShowOverride: false } };
24
28
  }
25
29
 
26
- function buildFormik() {
30
+ function buildValues() {
27
31
  return {
28
- setFieldValue: jasmine.createSpy('setFieldValue'),
29
- values: {
30
- associatePublicIpAddress: null,
31
- backingData: {
32
- enabledMetrics: [],
33
- filtered: { keyPairs: [] },
34
- healthCheckTypes: [],
35
- scalingProcesses: [],
36
- terminationPolicies: [],
37
- },
38
- ebsOptimized: false,
32
+ associatePublicIpAddress: null,
33
+ backingData: {
39
34
  enabledMetrics: [],
40
- getBlockDeviceMappingsSource: jasmine.createSpy('getBlockDeviceMappingsSource').and.returnValue('default'),
41
- healthCheckType: 'EC2',
42
- instanceMonitoring: false,
43
- keyPair: '',
44
- requireIMDSv2: false,
45
- selectBlockDeviceMappingsSource: jasmine.createSpy('selectBlockDeviceMappingsSource'),
46
- suspendedProcesses: [],
47
- tags: {},
35
+ filtered: { keyPairs: [] },
36
+ healthCheckTypes: [],
37
+ scalingProcesses: [],
48
38
  terminationPolicies: [],
49
- toggleSuspendedProcess: jasmine.createSpy('toggleSuspendedProcess'),
50
- viewState: { useSimpleInstanceTypeSelector: true },
51
39
  },
40
+ cooldown: 0,
41
+ ebsOptimized: false,
42
+ enabledMetrics: [],
43
+ getBlockDeviceMappingsSource: vi.fn().mockReturnValue('default'),
44
+ healthCheckGracePeriod: 0,
45
+ healthCheckType: 'EC2',
46
+ instanceMonitoring: false,
47
+ keyPair: '',
48
+ requireIMDSv2: false,
49
+ selectBlockDeviceMappingsSource: vi.fn(),
50
+ suspendedProcesses: [],
51
+ tags: {},
52
+ terminationPolicies: [],
53
+ toggleSuspendedProcess: vi.fn(),
54
+ viewState: { useSimpleInstanceTypeSelector: true },
52
55
  };
53
56
  }
@@ -62,7 +62,13 @@ export class ServerGroupAdvancedSettingsCommon extends React.Component<IServerGr
62
62
  <b>Cooldown</b>
63
63
  </div>
64
64
  <div className="col-md-2">
65
- <Field type="text" required={true} name="cooldown" className="form-control input-sm no-spel" />
65
+ <Field
66
+ type="text"
67
+ required={true}
68
+ name="cooldown"
69
+ aria-label="Cooldown"
70
+ className="form-control input-sm no-spel"
71
+ />
66
72
  </div>{' '}
67
73
  seconds
68
74
  </div>
@@ -4,7 +4,7 @@ import { SecurityGroupSelector } from './SecurityGroupSelector';
4
4
 
5
5
  describe('SecurityGroupSelector', () => {
6
6
  it('renders when the security group cache has not been registered', () => {
7
- spyOn(InfrastructureCaches, 'get').and.returnValue(undefined);
7
+ vi.spyOn(InfrastructureCaches, 'get').mockReturnValue(undefined);
8
8
 
9
9
  expect(() => new SecurityGroupSelector(buildProps() as any)).not.toThrow();
10
10
  });
@@ -15,6 +15,6 @@ function buildProps() {
15
15
  command: { selectedProvider: 'aws' },
16
16
  availableGroups: [],
17
17
  groupsToEdit: [],
18
- onChange: jasmine.createSpy('onChange'),
18
+ onChange: vi.fn(),
19
19
  };
20
20
  }
@@ -1,8 +1,9 @@
1
- import { shallow } from 'enzyme';
1
+ import { act, render, screen } from '@testing-library/react';
2
+ import userEvent from '@testing-library/user-event';
2
3
  import React from 'react';
3
4
 
4
5
  import type { Application } from '@spinnaker/core';
5
- import { ConfirmationModalService, ManagedMenuItem, ServerGroupWarningMessageService } from '@spinnaker/core';
6
+ import { ConfirmationModalService, DeckRuntimeContext, ServerGroupWarningMessageService } from '@spinnaker/core';
6
7
 
7
8
  import type { IAmazonServerGroupView } from '../../domain';
8
9
  import { AWSProviderSettings } from '../../aws.settings';
@@ -11,13 +12,6 @@ import { AmazonRollbackServerGroupModal } from './rollback';
11
12
 
12
13
  describe('<AmazonServerGroupActions /> rollback integration', () => {
13
14
  const originalAdHocInfraWritesEnabled = AWSProviderSettings.adHocInfraWritesEnabled;
14
- const runtimeServices = {} as any;
15
-
16
- const shallowActions = (component: React.ReactElement) => {
17
- const wrapper = shallow(component);
18
- (wrapper.instance() as any).context = { services: runtimeServices };
19
- return wrapper;
20
- };
21
15
 
22
16
  const buildServerGroup = (overrides: Partial<IAmazonServerGroupView> = {}): IAmazonServerGroupView =>
23
17
  ({
@@ -41,11 +35,30 @@ describe('<AmazonServerGroupActions /> rollback integration', () => {
41
35
  getDataSource: (key: string) => (key === 'serverGroups' ? { data: serverGroups } : undefined),
42
36
  isManagementPaused: false,
43
37
  name: 'test-app',
44
- serverGroups: { refresh: jasmine.createSpy('refresh') },
38
+ serverGroups: { refresh: vi.fn() },
45
39
  } as any);
46
40
 
47
- const action = (wrapper: ReturnType<typeof shallow>, label: string) =>
48
- wrapper.find(ManagedMenuItem).filterWhere((item) => item.prop('children') === label);
41
+ const renderActions = (
42
+ app: Application,
43
+ serverGroup: IAmazonServerGroupView,
44
+ stateService: any = { go: vi.fn(), includes: vi.fn() },
45
+ runtimeServices: any = {},
46
+ ) => ({
47
+ runtimeServices,
48
+ ...render(
49
+ <DeckRuntimeContext.Provider value={{ services: runtimeServices } as any}>
50
+ <AmazonServerGroupActions
51
+ app={app}
52
+ router={{} as any}
53
+ serverGroup={serverGroup}
54
+ stateParams={{}}
55
+ stateService={stateService}
56
+ />
57
+ </DeckRuntimeContext.Provider>,
58
+ ),
59
+ });
60
+
61
+ const openActions = () => userEvent.click(screen.getByRole('button', { name: 'Server Group Actions' }));
49
62
 
50
63
  beforeEach(() => {
51
64
  AWSProviderSettings.adHocInfraWritesEnabled = true;
@@ -55,23 +68,18 @@ describe('<AmazonServerGroupActions /> rollback integration', () => {
55
68
  AWSProviderSettings.adHocInfraWritesEnabled = originalAdHocInfraWritesEnabled;
56
69
  });
57
70
 
58
- it('renders standalone Rollback as a managed action and opens the modal with exact enriched state', () => {
71
+ it('renders standalone Rollback as a managed action and opens the modal with exact enriched state', async () => {
59
72
  const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
60
73
  const rollbackSource = buildServerGroup();
61
74
  const unrelated = buildServerGroup({ app: 'other-app', cluster: 'other-app-main', name: 'other-app-main-v001' });
62
75
  const application = buildApplication([selected, rollbackSource, unrelated]);
63
- const show = spyOn(AmazonRollbackServerGroupModal, 'show').and.returnValue(Promise.resolve({} as any));
64
- const wrapper = shallowActions(<AmazonServerGroupActions app={application} serverGroup={selected} />);
76
+ const show = vi.spyOn(AmazonRollbackServerGroupModal, 'show').mockReturnValue(Promise.resolve({} as any));
77
+ const { runtimeServices } = renderActions(application, selected);
65
78
 
66
- const rollback = action(wrapper, 'Rollback');
67
- expect(rollback.length).toBe(1);
68
- expect(rollback.props()).toEqual(
69
- jasmine.objectContaining({ application, resource: selected, onClick: jasmine.any(Function) }),
70
- );
79
+ await openActions();
80
+ await userEvent.click(screen.getByText('Rollback'));
71
81
 
72
- rollback.prop('onClick')();
73
-
74
- expect(show).toHaveBeenCalledOnceWith(
82
+ expect(show).toHaveBeenCalledExactlyOnceWith(
75
83
  {
76
84
  allServerGroups: [selected],
77
85
  application,
@@ -82,26 +90,28 @@ describe('<AmazonServerGroupActions /> rollback integration', () => {
82
90
  );
83
91
  });
84
92
 
85
- it('does not render Rollback when a disabled server group has no enabled rollback source', () => {
93
+ it('does not render Rollback when a disabled server group has no enabled rollback source', async () => {
86
94
  const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
87
- const wrapper = shallow(<AmazonServerGroupActions app={buildApplication([selected])} serverGroup={selected} />);
95
+ renderActions(buildApplication([selected]), selected);
96
+ await openActions();
88
97
 
89
- expect(action(wrapper, 'Rollback').length).toBe(0);
98
+ expect(screen.queryByText('Rollback')).not.toBeInTheDocument();
90
99
  });
91
100
 
92
101
  it('opens rollback settings when orchestrated rollback is accepted from Enable', async () => {
93
102
  const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
94
103
  const rollbackSource = buildServerGroup();
95
104
  const application = buildApplication([selected, rollbackSource]);
96
- const confirm = spyOn(ConfirmationModalService, 'confirm').and.returnValue(Promise.resolve() as any);
97
- const show = spyOn(AmazonRollbackServerGroupModal, 'show').and.returnValue(Promise.resolve({} as any));
98
- const wrapper = shallowActions(<AmazonServerGroupActions app={application} serverGroup={selected} />);
105
+ const confirm = vi.spyOn(ConfirmationModalService, 'confirm').mockReturnValue(Promise.resolve() as any);
106
+ const show = vi.spyOn(AmazonRollbackServerGroupModal, 'show').mockReturnValue(Promise.resolve({} as any));
107
+ const { runtimeServices } = renderActions(application, selected);
99
108
 
100
- action(wrapper, 'Enable').prop('onClick')();
109
+ await openActions();
110
+ await userEvent.click(screen.getByText('Enable'));
101
111
  await settle();
102
112
 
103
113
  expect(confirm).toHaveBeenCalledTimes(1);
104
- expect(show).toHaveBeenCalledOnceWith(
114
+ expect(show).toHaveBeenCalledExactlyOnceWith(
105
115
  {
106
116
  allServerGroups: [selected],
107
117
  application,
@@ -116,21 +126,24 @@ describe('<AmazonServerGroupActions /> rollback integration', () => {
116
126
  const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
117
127
  const rollbackSource = buildServerGroup();
118
128
  const application = buildApplication([selected, rollbackSource]);
119
- const confirm = spyOn(ConfirmationModalService, 'confirm').and.callFake((params: any) =>
120
- params.header === 'Rolling back?' ? (Promise.reject({ source: 'footer' }) as any) : (Promise.resolve() as any),
121
- );
122
- const show = spyOn(AmazonRollbackServerGroupModal, 'show').and.returnValue(Promise.resolve({} as any));
123
- const wrapper = shallow(<AmazonServerGroupActions app={application} serverGroup={selected} />);
124
-
125
- action(wrapper, 'Enable').prop('onClick')();
129
+ const confirm = vi
130
+ .spyOn(ConfirmationModalService, 'confirm')
131
+ .mockImplementation((params: any) =>
132
+ params.header === 'Rolling back?' ? (Promise.reject({ source: 'footer' }) as any) : (Promise.resolve() as any),
133
+ );
134
+ const show = vi.spyOn(AmazonRollbackServerGroupModal, 'show').mockReturnValue(Promise.resolve({} as any));
135
+ renderActions(application, selected);
136
+
137
+ await openActions();
138
+ await userEvent.click(screen.getByText('Enable'));
126
139
  await settle();
127
140
 
128
141
  expect(show).not.toHaveBeenCalled();
129
142
  expect(confirm).toHaveBeenCalledTimes(2);
130
- expect(confirm.calls.mostRecent().args[0]).toEqual(
131
- jasmine.objectContaining({
143
+ expect(confirm.mock.lastCall[0]).toEqual(
144
+ expect.objectContaining({
132
145
  header: `Really enable ${selected.name}?`,
133
- submitMethod: jasmine.any(Function),
146
+ submitMethod: expect.any(Function),
134
147
  }),
135
148
  );
136
149
  });
@@ -139,40 +152,39 @@ describe('<AmazonServerGroupActions /> rollback integration', () => {
139
152
  const selected = buildServerGroup({ isDisabled: true, name: 'test-app-main-v001' });
140
153
  const rollbackSource = buildServerGroup();
141
154
  const application = buildApplication([selected, rollbackSource]);
142
- const confirm = spyOn(ConfirmationModalService, 'confirm').and.returnValue(
143
- Promise.reject({ source: 'header' }) as any,
144
- );
145
- const show = spyOn(AmazonRollbackServerGroupModal, 'show').and.returnValue(Promise.resolve({} as any));
146
- const writer = { enableServerGroup: jasmine.createSpy('enableServerGroup') };
155
+ let rejectConfirmation: (reason: any) => void;
156
+ const confirmation = new Promise((_, reject) => {
157
+ rejectConfirmation = reject;
158
+ });
159
+ const confirm = vi.spyOn(ConfirmationModalService, 'confirm').mockReturnValue(confirmation as any);
160
+ const show = vi.spyOn(AmazonRollbackServerGroupModal, 'show').mockReturnValue(Promise.resolve({} as any));
161
+ const writer = { enableServerGroup: vi.fn() };
147
162
  const enable = writer.enableServerGroup;
148
- const wrapper = shallow(<AmazonServerGroupActions app={application} serverGroup={selected} />);
149
- (wrapper.instance() as any).context = { services: { serverGroupWriter: writer } };
150
-
151
- action(wrapper, 'Enable').prop('onClick')();
152
- await settle();
163
+ const runtimeServices = { serverGroupWriter: writer } as any;
164
+ renderActions(application, selected, undefined, runtimeServices);
165
+
166
+ await openActions();
167
+ await userEvent.click(screen.getByText('Enable'));
168
+ await act(async () => {
169
+ rejectConfirmation({ source: 'header' });
170
+ await confirmation.catch(() => undefined);
171
+ });
153
172
 
154
173
  expect(confirm).toHaveBeenCalledTimes(1);
155
174
  expect(show).not.toHaveBeenCalled();
156
175
  expect(enable).not.toHaveBeenCalled();
157
176
  });
158
177
 
159
- it('closes destroyed server group details through the injected state service', () => {
178
+ it('closes destroyed server group details through the injected state service', async () => {
160
179
  const selected = buildServerGroup();
161
- const stateService = { go: jasmine.createSpy('go'), includes: jasmine.createSpy('includes').and.returnValue(true) };
162
- const confirm = spyOn(ConfirmationModalService, 'confirm');
163
- spyOn(ServerGroupWarningMessageService, 'addDestroyWarningMessage');
164
- const wrapper = shallow(
165
- <AmazonServerGroupActions
166
- app={buildApplication([selected])}
167
- router={{} as any}
168
- serverGroup={selected}
169
- stateParams={{}}
170
- stateService={stateService as any}
171
- />,
172
- );
180
+ const stateService = { go: vi.fn(), includes: vi.fn().mockReturnValue(true) };
181
+ const confirm = vi.spyOn(ConfirmationModalService, 'confirm').mockReturnValue(undefined);
182
+ vi.spyOn(ServerGroupWarningMessageService, 'addDestroyWarningMessage').mockReturnValue(undefined);
183
+ renderActions(buildApplication([selected]), selected, stateService);
173
184
 
174
- action(wrapper, 'Destroy').prop('onClick')();
175
- confirm.calls.mostRecent().args[0].taskMonitorConfig.onTaskComplete();
185
+ await openActions();
186
+ await userEvent.click(screen.getByText('Destroy'));
187
+ confirm.mock.lastCall[0].taskMonitorConfig.onTaskComplete();
176
188
 
177
189
  expect(stateService.includes).toHaveBeenCalledWith('**.serverGroup', {
178
190
  accountId: 'test-account',
@@ -183,4 +195,4 @@ describe('<AmazonServerGroupActions /> rollback integration', () => {
183
195
  });
184
196
  });
185
197
 
186
- const settle = () => new Promise((resolve) => setTimeout(resolve));
198
+ const settle = () => act(() => new Promise((resolve) => setTimeout(resolve)));
@@ -1,50 +1,37 @@
1
- import { mount, shallow } from 'enzyme';
1
+ import type { Mock } from 'vitest';
2
+ import { fireEvent, screen, waitFor } from '@testing-library/react';
2
3
  import React from 'react';
3
4
 
4
- import { DeckRuntimeContext, FormikFormField, ReactModal, TaskMonitorModal } from '@spinnaker/core';
5
+ import { DeckRuntimeContext, ReactModal, TaskExecutor } from '@spinnaker/core';
6
+ import { renderWithRouter } from '../../../../../core/src/utils/testUtils/rtl';
5
7
 
6
- import { EditAsgAdvancedSettingsModal } from './EditAsgAdvancedSettingsModal';
8
+ import { EditAsgAdvancedSettingsModal, validateRequiredNonNegativeNumber } from './EditAsgAdvancedSettingsModal';
7
9
 
8
10
  describe('EditAsgAdvancedSettingsModal', () => {
9
- const application = { name: 'deck', serverGroups: { refresh: jasmine.createSpy('refresh') } } as any;
11
+ const application = { name: 'deck', serverGroups: { refresh: vi.fn() } } as any;
10
12
  const serverGroup = { name: 'deck-main-v001', account: 'test', region: 'us-east-1' } as any;
11
- let buildUpdateServerGroupCommand: jasmine.Spy;
12
- const modalProps = {
13
- application,
14
- serverGroup,
15
- closeModal: jasmine.createSpy('closeModal'),
16
- dismissModal: jasmine.createSpy('dismissModal'),
17
- };
18
-
19
- function mountModal(command: any) {
20
- buildUpdateServerGroupCommand = jasmine.createSpy().and.returnValue(command);
21
- const commandBuilder = { buildUpdateServerGroupCommand };
13
+ const modalProps = { application, serverGroup, closeModal: vi.fn(), dismissModal: vi.fn() };
14
+ let buildUpdateServerGroupCommand: Mock;
15
+
16
+ function renderModal(command: any) {
17
+ buildUpdateServerGroupCommand = vi.fn().mockReturnValue(command);
22
18
  const runtime = {
23
- services: { providerServiceDelegate: { getDelegate: jasmine.createSpy().and.returnValue(commandBuilder) } },
19
+ services: {
20
+ providerServiceDelegate: {
21
+ getDelegate: vi.fn().mockReturnValue({ buildUpdateServerGroupCommand }),
22
+ },
23
+ },
24
24
  } as any;
25
- return mount(
25
+ const ui = (
26
26
  <DeckRuntimeContext.Provider value={runtime}>
27
27
  <EditAsgAdvancedSettingsModal {...modalProps} />
28
- </DeckRuntimeContext.Provider>,
29
- ).find(EditAsgAdvancedSettingsModal);
28
+ </DeckRuntimeContext.Provider>
29
+ );
30
+ return { ...renderWithRouter(ui), ui };
30
31
  }
31
32
 
32
- it('builds one update command and preserves it across rerenders', () => {
33
- const command = {
34
- backingData: { enabledMetrics: [], healthCheckTypes: [], terminationPolicies: [] },
35
- } as any;
36
- const wrapper = mountModal(command);
37
- const initialValues = wrapper.find(TaskMonitorModal).prop('initialValues');
38
-
39
- wrapper.instance().forceUpdate();
40
- wrapper.update();
41
-
42
- expect(buildUpdateServerGroupCommand).toHaveBeenCalledTimes(1);
43
- expect(wrapper.find(TaskMonitorModal).prop('initialValues')).toBe(initialValues);
44
- });
45
-
46
- it('uses the update command builder and exposes every advanced setting', () => {
47
- const command = {
33
+ function command() {
34
+ return {
48
35
  cooldown: 10,
49
36
  enabledMetrics: ['GroupDesiredCapacity'],
50
37
  healthCheckGracePeriod: 600,
@@ -57,45 +44,70 @@ describe('EditAsgAdvancedSettingsModal', () => {
57
44
  terminationPolicies: ['Default'],
58
45
  },
59
46
  } as any;
60
- const wrapper = mountModal(command);
61
- const taskModal = wrapper.find(TaskMonitorModal);
62
-
63
- expect(taskModal.prop('initialValues')).toBe(command);
64
- expect(taskModal.prop('mapValuesToTask')(command)).toEqual({ application, job: [command] });
65
-
66
- const fields = shallow(<div>{taskModal.prop('render')({ values: command } as any)}</div>).find(FormikFormField);
67
- expect(fields.map((field) => field.prop('name'))).toEqual([
68
- 'cooldown',
69
- 'enabledMetrics',
70
- 'healthCheckType',
71
- 'healthCheckGracePeriod',
72
- 'terminationPolicies',
73
- 'capacityRebalance',
74
- ]);
47
+ }
48
+
49
+ it('rejects empty and non-finite numeric values while accepting non-negative numbers', () => {
50
+ [undefined, null, '', Number.NaN, Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY, -1].forEach((value) =>
51
+ expect(validateRequiredNonNegativeNumber(value)).toBe('Enter a finite non-negative number'),
52
+ );
53
+ [0, 0.5, 1].forEach((value) => expect(validateRequiredNonNegativeNumber(value)).toBeUndefined());
75
54
  });
76
55
 
77
- it('requires finite non-negative cooldown and health check grace period values', () => {
78
- const command = {
79
- cooldown: 10,
80
- healthCheckGracePeriod: 600,
81
- backingData: { enabledMetrics: [], healthCheckTypes: [], terminationPolicies: [] },
82
- } as any;
83
- const wrapper = mountModal(command);
84
- const taskModal = wrapper.find(TaskMonitorModal);
85
- const fields = shallow(<div>{taskModal.prop('render')({ values: command } as any)}</div>).find(FormikFormField);
56
+ it('builds one update command and preserves its form values across rerenders', () => {
57
+ const rendered = renderModal(command());
86
58
 
87
- ['cooldown', 'healthCheckGracePeriod'].forEach((name) => {
88
- const field = fields.filterWhere((candidate) => candidate.prop('name') === name);
89
- const validate = field.prop('validate') as (value: unknown) => string | undefined;
59
+ expect(screen.getByRole('spinbutton', { name: 'Cooldown' })).toHaveValue(10);
60
+ rendered.rerender(rendered.ui);
90
61
 
91
- expect(field.prop('required')).toBe(true);
92
- [undefined, null, '', NaN, Infinity, -Infinity, -1].forEach((value) => expect(validate(value)).toBeDefined());
93
- [0, 0.5, 1].forEach((value) => expect(validate(value)).toBeUndefined());
62
+ expect(buildUpdateServerGroupCommand).toHaveBeenCalledTimes(1);
63
+ expect(screen.getByRole('spinbutton', { name: 'Health Check Grace Period' })).toHaveValue(600);
64
+ });
65
+
66
+ it('renders every advanced setting and submits the exact task envelope', async () => {
67
+ const values = command();
68
+ const executeTask = vi.spyOn(TaskExecutor, 'executeTask').mockResolvedValue({} as any);
69
+ renderModal(values);
70
+
71
+ const controls = [
72
+ screen.getByRole('spinbutton', { name: 'Cooldown' }),
73
+ screen.getByRole('combobox', { name: 'Enabled Metrics' }),
74
+ screen.getByRole('combobox', { name: 'Health Check Type' }),
75
+ screen.getByRole('spinbutton', { name: 'Health Check Grace Period' }),
76
+ screen.getByRole('combobox', { name: 'Termination Policies' }),
77
+ screen.getByRole('checkbox', { name: 'Enable capacity rebalance' }),
78
+ ];
79
+ controls.forEach((control) => {
80
+ expect(control.closest('.sp-formItem')).toHaveClass('sp-formItem');
81
+ expect(control.closest('.sp-formItem')?.querySelector('.sp-formItem__right')).toContainElement(control);
94
82
  });
83
+
84
+ fireEvent.click(screen.getByRole('button', { name: 'Submit' }));
85
+ await waitFor(() =>
86
+ expect(executeTask).toHaveBeenCalledWith({
87
+ application,
88
+ description: 'Update Advanced Settings for deck-main-v001',
89
+ job: [values],
90
+ }),
91
+ );
92
+ });
93
+
94
+ it('requires finite non-negative cooldown and health check grace period values', async () => {
95
+ renderModal(command());
96
+ const submit = screen.getByRole('button', { name: 'Submit' });
97
+
98
+ for (const name of ['Cooldown', 'Health Check Grace Period']) {
99
+ const input = screen.getByRole('spinbutton', { name });
100
+ for (const invalidValue of ['', '-1', 'Infinity']) {
101
+ fireEvent.change(input, { target: { value: invalidValue } });
102
+ await waitFor(() => expect(submit).toBeDisabled());
103
+ fireEvent.change(input, { target: { value: '0' } });
104
+ await waitFor(() => expect(submit).toBeEnabled());
105
+ }
106
+ }
95
107
  });
96
108
 
97
109
  it('opens only after managed-resource verification succeeds', async () => {
98
- const show = spyOn(ReactModal, 'show').and.returnValue(Promise.resolve() as any);
110
+ const show = vi.spyOn(ReactModal, 'show').mockResolvedValue(undefined as any);
99
111
  const runtimeServices = {} as any;
100
112
 
101
113
  await EditAsgAdvancedSettingsModal.show({ application, serverGroup }, runtimeServices);
@@ -23,7 +23,7 @@ export interface IEditAsgAdvancedSettingsModalProps extends IModalComponentProps
23
23
  serverGroup: IAmazonServerGroup;
24
24
  }
25
25
 
26
- function validateRequiredNonNegativeNumber(value: unknown): string | undefined {
26
+ export function validateRequiredNonNegativeNumber(value: unknown): string | undefined {
27
27
  return typeof value !== 'number' || !Number.isFinite(value) || value < 0
28
28
  ? 'Enter a finite non-negative number'
29
29
  : undefined;
@@ -57,7 +57,7 @@ export class EditAsgAdvancedSettingsModal extends React.Component<IEditAsgAdvanc
57
57
  label="Cooldown"
58
58
  name="cooldown"
59
59
  help="Seconds"
60
- input={(props) => <NumberInput {...props} min={0} />}
60
+ input={(props) => <NumberInput {...props} aria-label="Cooldown" min={0} />}
61
61
  required={true}
62
62
  validate={validateRequiredNonNegativeNumber}
63
63
  />
@@ -65,20 +65,32 @@ export class EditAsgAdvancedSettingsModal extends React.Component<IEditAsgAdvanc
65
65
  label="Enabled Metrics"
66
66
  name="enabledMetrics"
67
67
  help={<HelpField id="aws.serverGroup.enabledMetrics" />}
68
- input={(props) => <ReactSelectInput {...props} multi={true} stringOptions={backingData.enabledMetrics} />}
68
+ input={(props) => (
69
+ <ReactSelectInput
70
+ {...props}
71
+ aria-label="Enabled Metrics"
72
+ multi={true}
73
+ stringOptions={backingData.enabledMetrics}
74
+ />
75
+ )}
69
76
  />
70
77
  <FormikFormField
71
78
  label="Health Check Type"
72
79
  name="healthCheckType"
73
80
  input={(props) => (
74
- <ReactSelectInput {...props} clearable={false} stringOptions={backingData.healthCheckTypes} />
81
+ <ReactSelectInput
82
+ {...props}
83
+ aria-label="Health Check Type"
84
+ clearable={false}
85
+ stringOptions={backingData.healthCheckTypes}
86
+ />
75
87
  )}
76
88
  />
77
89
  <FormikFormField
78
90
  label="Health Check Grace Period"
79
91
  name="healthCheckGracePeriod"
80
92
  help="Seconds"
81
- input={(props) => <NumberInput {...props} min={0} />}
93
+ input={(props) => <NumberInput {...props} aria-label="Health Check Grace Period" min={0} />}
82
94
  required={true}
83
95
  validate={validateRequiredNonNegativeNumber}
84
96
  />
@@ -86,7 +98,12 @@ export class EditAsgAdvancedSettingsModal extends React.Component<IEditAsgAdvanc
86
98
  label="Termination Policies"
87
99
  name="terminationPolicies"
88
100
  input={(props) => (
89
- <ReactSelectInput {...props} multi={true} stringOptions={backingData.terminationPolicies} />
101
+ <ReactSelectInput
102
+ {...props}
103
+ aria-label="Termination Policies"
104
+ multi={true}
105
+ stringOptions={backingData.terminationPolicies}
106
+ />
90
107
  )}
91
108
  />
92
109
  <FormikFormField