test

Author: logonoff

frontend/jest-resolver.js

@@ -1,4 +1,4 @@
-const defaultResolver = require('jest-resolve/build/defaultResolver').default;
+const defaultResolver = require('jest-resolve').default;
 
 // eslint-disable-next-line no-undef
 module.exports = (request, options) => {

frontend/packages/console-shared/src/hooks/__tests__/useUserSettings.spec.ts

@@ -23,7 +23,6 @@ jest.mock('@console/internal/components/utils/k8s-watch-hook', () => ({
 }));
 
 jest.mock('../../utils/user-settings', () => {
-  // requireActual exist in used jest 21 and still in latest version, but was not defined well in old TS definition
   const originalModule = jest.requireActual('../../utils/user-settings');
   return {
     ...originalModule,
@@ -664,11 +663,8 @@ describe('useUserSettings', () => {
     );
 
     let storageListenerInvoked = false;
-    const storageListener = (event: StorageEvent) => {
+    const storageListener = () => {
       storageListenerInvoked = true;
-      expect(event.storageArea).toBe(sessionStorage);
-      expect(event.key).toBe('user-settings-imposter');
-      expect(event.newValue).toBe(JSON.stringify({ 'impersonate.key': 'newValue' }));
     };
     window.addEventListener('storage', storageListener);
 

frontend/packages/helm-plugin/src/providers/__tests__/helm-detection-provider.spec.ts

@@ -183,7 +183,7 @@ describe('useDetectHelmChartRepositories', () => {
     );
     testHook(() => useDetectHelmChartRepositories(setFeatureFlag));
     expect(fetchK8sSpy).toHaveBeenCalledTimes(2);
-    jest.runTimersToTime(20 * 1000);
+    jest.advanceTimersByTime(20 * 1000);
     expect(fetchK8sSpy).toHaveBeenCalledTimes(6);
   });
 
@@ -201,7 +201,7 @@ describe('useDetectHelmChartRepositories', () => {
       rerender();
     });
     expect(fetchK8sSpy).toHaveBeenCalledTimes(4);
-    jest.runTimersToTime(20 * 1000);
+    jest.advanceTimersByTime(20 * 1000);
     expect(fetchK8sSpy).toHaveBeenCalledTimes(4);
   });
 });

frontend/packages/vsphere-plugin/__tests__/__snapshots__/utils.spec.ts.snap

@@ -36,6 +36,42 @@ datacenters=my-datacenter
 "
 `;
 
+exports[`mergeCloudProviderConfig deletes old Virtual Center: [Global]
+secret-name=vsphere-creds
+secret-namespace=kube-system
+insecure-flag=1
+
+[Workspace]
+foo=bar
+foofoo=barbar
+server=https://1.2.3.4/something
+datacenter=my-datacenter
+default-datastore=my-default-ds
+folder="/CLUSTER/vm/SomeGeo/Infra\\ \\(Dev\\ Env\\)/OpenShift"
+resourcepool-path=/my-datacenter/host/foo-cluster/Resources
+
+[VirtualCenter "https://1.2.3.4/something"]
+datacenters=my-datacenter
+ 1`] = `
+"[Global]
+secret-name=vsphere-creds
+secret-namespace=kube-system
+insecure-flag=1
+
+[Workspace]
+foo=bar
+foofoo=barbar
+server=https://1.2.3.4/something
+datacenter=my-datacenter
+default-datastore=my-default-ds
+folder=\\"/CLUSTER/vm/SomeGeo/Infra\\\\ \\\\(Dev\\\\ Env\\\\)/OpenShift\\"
+resourcepool-path=/my-datacenter/host/foo-cluster/Resources
+
+[VirtualCenter \\"https://1.2.3.4/something\\"]
+datacenters=my-datacenter
+"
+`;
+
 exports[`mergeCloudProviderConfig handles empty input 1`] = `
 "[Global]
 secret-name=vsphere-creds