@spinnaker/google 2026.3.2 → 2026.4.0

package/src/serverGroup/details/autoscalingPolicy/GceAutoscalingPolicyDetails.spec.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 
 import { ConfirmationModalService } from '@spinnaker/core';
 
@@ -30,7 +30,7 @@ describe('GceAutoscalingPolicyDetails', () => {
   };
 
   it('summarizes zero-valued metrics, scale-in controls, and schedules', () => {
-    const wrapper = shallow(
+    const { container } = render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={true}
@@ -39,16 +39,15 @@ describe('GceAutoscalingPolicyDetails', () => {
       />,
     );
 
-    expect(wrapper.text()).toContain('CPU Usage');
-    expect(wrapper.text()).toContain('0%');
-    expect(wrapper.text()).toContain('Max Scaled-in Replicas');
-    expect(wrapper.text()).toContain('overnight (disabled)');
+    expect(container).toHaveTextContent('CPU Usage: 0%');
+    expect(container).toHaveTextContent('Max Scaled-in Replicas');
+    expect(container).toHaveTextContent('overnight (disabled)');
   });
 
   it('opens edit after managed-resource confirmation proceeds', async () => {
-    const show = spyOn(GceUpsertAutoscalingPolicyModal, 'show');
-    const confirm = spyOn(ConfirmationModalService, 'confirm').and.returnValue(Promise.resolve() as any);
-    const wrapper = shallow(
+    const show = vi.spyOn(GceUpsertAutoscalingPolicyModal, 'show').mockReturnValue(undefined);
+    const confirm = vi.spyOn(ConfirmationModalService, 'confirm').mockReturnValue(Promise.resolve() as any);
+    render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={true}
@@ -57,19 +56,17 @@ describe('GceAutoscalingPolicyDetails', () => {
       />,
     );
 
-    wrapper.find('[data-testid="edit-autoscaling-policy"]').simulate('click');
+    fireEvent.click(screen.getByTestId('edit-autoscaling-policy'));
     expect(show).not.toHaveBeenCalled();
-    await Promise.resolve();
-    await Promise.resolve();
 
-    expect(confirm).toHaveBeenCalledWith(jasmine.objectContaining({ header: 'Pause Management?' }));
-    expect(show).toHaveBeenCalledWith({ application, serverGroup: managedServerGroup, policy });
+    expect(confirm).toHaveBeenCalledWith(expect.objectContaining({ header: 'Pause Management?' }));
+    await waitFor(() => expect(show).toHaveBeenCalledWith({ application, serverGroup: managedServerGroup, policy }));
   });
 
   it('does not open edit when managed-resource confirmation is cancelled', async () => {
-    const show = spyOn(GceUpsertAutoscalingPolicyModal, 'show');
-    spyOn(ConfirmationModalService, 'confirm').and.returnValue(Promise.reject() as any);
-    const wrapper = shallow(
+    const show = vi.spyOn(GceUpsertAutoscalingPolicyModal, 'show').mockReturnValue(undefined);
+    vi.spyOn(ConfirmationModalService, 'confirm').mockReturnValue(Promise.reject() as any);
+    render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={true}
@@ -78,17 +75,16 @@ describe('GceAutoscalingPolicyDetails', () => {
       />,
     );
 
-    wrapper.find('[data-testid="edit-autoscaling-policy"]').simulate('click');
-    await Promise.resolve();
-    await Promise.resolve();
+    fireEvent.click(screen.getByTestId('edit-autoscaling-policy'));
+    await waitFor(() => expect(ConfirmationModalService.confirm).toHaveBeenCalled());
 
     expect(show).not.toHaveBeenCalled();
   });
 
   it('opens add after managed-resource confirmation proceeds', async () => {
-    const show = spyOn(GceUpsertAutoscalingPolicyModal, 'show');
-    const confirm = spyOn(ConfirmationModalService, 'confirm').and.returnValue(Promise.resolve() as any);
-    const wrapper = shallow(
+    const show = vi.spyOn(GceUpsertAutoscalingPolicyModal, 'show').mockReturnValue(undefined);
+    const confirm = vi.spyOn(ConfirmationModalService, 'confirm').mockReturnValue(Promise.resolve() as any);
+    render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={true}
@@ -97,19 +93,17 @@ describe('GceAutoscalingPolicyDetails', () => {
       />,
     );
 
-    wrapper.find('[data-testid="add-autoscaling-policy"]').simulate('click');
+    fireEvent.click(screen.getByTestId('add-autoscaling-policy'));
     expect(show).not.toHaveBeenCalled();
-    await Promise.resolve();
-    await Promise.resolve();
 
-    expect(confirm).toHaveBeenCalledWith(jasmine.objectContaining({ header: 'Pause Management?' }));
-    expect(show).toHaveBeenCalledWith({ application, serverGroup: managedServerGroup });
+    expect(confirm).toHaveBeenCalledWith(expect.objectContaining({ header: 'Pause Management?' }));
+    await waitFor(() => expect(show).toHaveBeenCalledWith({ application, serverGroup: managedServerGroup }));
   });
 
   it('does not open add when managed-resource confirmation is cancelled', async () => {
-    const show = spyOn(GceUpsertAutoscalingPolicyModal, 'show');
-    spyOn(ConfirmationModalService, 'confirm').and.returnValue(Promise.reject() as any);
-    const wrapper = shallow(
+    const show = vi.spyOn(GceUpsertAutoscalingPolicyModal, 'show').mockReturnValue(undefined);
+    vi.spyOn(ConfirmationModalService, 'confirm').mockReturnValue(Promise.reject() as any);
+    render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={true}
@@ -118,20 +112,19 @@ describe('GceAutoscalingPolicyDetails', () => {
       />,
     );
 
-    wrapper.find('[data-testid="add-autoscaling-policy"]').simulate('click');
-    await Promise.resolve();
-    await Promise.resolve();
+    fireEvent.click(screen.getByTestId('add-autoscaling-policy'));
+    await waitFor(() => expect(ConfirmationModalService.confirm).toHaveBeenCalled());
 
     expect(show).not.toHaveBeenCalled();
   });
 
   it('offers delete confirmation after managed-resource confirmation proceeds', async () => {
-    const confirm = spyOn(ConfirmationModalService, 'confirm').and.returnValues(
-      Promise.resolve() as any,
-      Promise.resolve() as any,
-    );
-    const deletePolicy = spyOn(GceAutoscalingPolicyWriter, 'deleteAutoscalingPolicy');
-    const wrapper = shallow(
+    const confirm = vi
+      .spyOn(ConfirmationModalService, 'confirm')
+      .mockReturnValueOnce(Promise.resolve() as any)
+      .mockReturnValueOnce(Promise.resolve() as any);
+    const deletePolicy = vi.spyOn(GceAutoscalingPolicyWriter, 'deleteAutoscalingPolicy').mockReturnValue(undefined);
+    render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={true}
@@ -140,12 +133,10 @@ describe('GceAutoscalingPolicyDetails', () => {
       />,
     );
 
-    wrapper.find('[data-testid="delete-autoscaling-policy"]').simulate('click');
-    await Promise.resolve();
-    await Promise.resolve();
+    fireEvent.click(screen.getByTestId('delete-autoscaling-policy'));
+    await waitFor(() => expect(confirm.mock.calls.length).toBe(2));
 
-    expect(confirm.calls.count()).toBe(2);
-    const deleteConfirmation = confirm.calls.mostRecent().args[0];
+    const deleteConfirmation = confirm.mock.lastCall[0];
     deleteConfirmation.submitMethod();
 
     expect(deletePolicy).toHaveBeenCalledWith(application, managedServerGroup);
@@ -155,9 +146,9 @@ describe('GceAutoscalingPolicyDetails', () => {
     const cancelledConfirmation = {
       then: (_onProceed: () => void, onCancel: () => void) => Promise.resolve(onCancel()),
     } as any;
-    const confirm = spyOn(ConfirmationModalService, 'confirm').and.returnValue(cancelledConfirmation);
-    const deletePolicy = spyOn(GceAutoscalingPolicyWriter, 'deleteAutoscalingPolicy');
-    const wrapper = shallow(
+    const confirm = vi.spyOn(ConfirmationModalService, 'confirm').mockReturnValue(cancelledConfirmation);
+    const deletePolicy = vi.spyOn(GceAutoscalingPolicyWriter, 'deleteAutoscalingPolicy').mockReturnValue(undefined);
+    render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={true}
@@ -166,17 +157,16 @@ describe('GceAutoscalingPolicyDetails', () => {
       />,
     );
 
-    wrapper.find('[data-testid="delete-autoscaling-policy"]').simulate('click');
-    await Promise.resolve();
-    await Promise.resolve();
+    fireEvent.click(screen.getByTestId('delete-autoscaling-policy'));
+    await waitFor(() => expect(confirm).toHaveBeenCalled());
 
-    expect(confirm.calls.count()).toBe(1);
-    expect(confirm).toHaveBeenCalledWith(jasmine.objectContaining({ header: 'Pause Management?' }));
+    expect(confirm.mock.calls.length).toBe(1);
+    expect(confirm).toHaveBeenCalledWith(expect.objectContaining({ header: 'Pause Management?' }));
     expect(deletePolicy).not.toHaveBeenCalled();
   });
 
   it('hides all mutation actions when mutations are disabled', () => {
-    const details = shallow(
+    const details = render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={false}
@@ -184,7 +174,10 @@ describe('GceAutoscalingPolicyDetails', () => {
         policy={policy}
       />,
     );
-    const emptyDetails = shallow(
+    expect(details.queryByTestId('edit-autoscaling-policy')).not.toBeInTheDocument();
+    expect(details.queryByTestId('delete-autoscaling-policy')).not.toBeInTheDocument();
+    details.unmount();
+    const emptyDetails = render(
       <GceAutoscalingPolicyDetails
         application={application}
         mutationsEnabled={false}
@@ -193,8 +186,6 @@ describe('GceAutoscalingPolicyDetails', () => {
       />,
     );
 
-    expect(details.find('[data-testid="edit-autoscaling-policy"]').exists()).toBe(false);
-    expect(details.find('[data-testid="delete-autoscaling-policy"]').exists()).toBe(false);
-    expect(emptyDetails.isEmptyRender()).toBe(true);
+    expect(emptyDetails.container).toBeEmptyDOMElement();
   });
 });

package/src/serverGroup/details/autoscalingPolicy/modal/GceUpsertAutoscalingPolicyModal.spec.tsx

@@ -26,13 +26,13 @@ describe('GceUpsertAutoscalingPolicyModal', () => {
 
   it('retains edited policy state when task creation is rejected', async () => {
     const rejection = { failureMessage: 'No permission' };
-    spyOn(GceAutoscalingPolicyWriter, 'upsertAutoscalingPolicy').and.returnValue(Promise.reject(rejection));
+    vi.spyOn(GceAutoscalingPolicyWriter, 'upsertAutoscalingPolicy').mockReturnValue(Promise.reject(rejection));
     const modal = new GceUpsertAutoscalingPolicyModal({
       application: { name: 'my-app' },
       serverGroup: { account: 'my-account', name: 'my-app-main-v001', region: 'us-central1' },
       policy: { minNumReplicas: 0, cpuUtilization: { utilizationTarget: 0.5 } },
-      closeModal: jasmine.createSpy('closeModal'),
-      dismissModal: jasmine.createSpy('dismissModal'),
+      closeModal: vi.fn(),
+      dismissModal: vi.fn(),
     } as any);
     const editedPolicy = { minNumReplicas: 0, cpuUtilization: { utilizationTarget: 0 } };
     modal.state.policy = editedPolicy;