Merge branch 'xanf-vtu-30-sync' into 'master'

Fix tests failing in async mode

Closes #193491

See merge request gitlab-org/gitlab!22361

ee/spec/frontend/design_management/router_spec.js

@@ -70,10 +70,11 @@ describe('Design management router', () => {
     it('pushes designs detail component', () => {
       router.push('/designs/1');
 
-      const detail = vm.find(DesignDetail);
-
-      expect(detail.exists()).toBe(true);
-      expect(detail.props('id')).toEqual('1');
+      return vm.vm.$nextTick().then(() => {
+        const detail = vm.find(DesignDetail);
+        expect(detail.exists()).toBe(true);
+        expect(detail.props('id')).toEqual('1');
+      });
     });
   });
 });

ee/spec/frontend/environments_dashboard/components/dashboard_spec.js

@@ -144,7 +144,10 @@ describe('dashboard', () => {
 
       it('should get the page info from the state', () => {
         store.state.pageInfo = { totalResults: 100 };
-        expect(wrapper.find(ProjectSelector).props('totalResults')).toBe(100);
+
+        return wrapper.vm.$nextTick().then(() => {
+          expect(wrapper.find(ProjectSelector).props('totalResults')).toBe(100);
+        });
       });
     });
   });

ee/spec/frontend/packages/details/components/maven_installation_spec.js

@@ -95,8 +95,10 @@ describe('MavenInstallation', () => {
     it('should track when the setup tab is clicked', () => {
       setupTab().trigger('click');
 
-      expect(eventSpy).toHaveBeenCalledWith(undefined, TrackingActions.REGISTRY_SETUP, {
-        label,
+      return wrapper.vm.$nextTick(() => {
+        expect(eventSpy).toHaveBeenCalledWith(undefined, TrackingActions.REGISTRY_SETUP, {
+          label,
+        });
       });
     });
 

ee/spec/frontend/packages/details/components/npm_installation_spec.js

@@ -90,8 +90,10 @@ describe('NpmInstallation', () => {
     it('should track when the setup tab is clicked', () => {
       setupTab().trigger('click');
 
-      expect(eventSpy).toHaveBeenCalledWith(undefined, TrackingActions.REGISTRY_SETUP, {
-        label,
+      return wrapper.vm.$nextTick().then(() => {
+        expect(eventSpy).toHaveBeenCalledWith(undefined, TrackingActions.REGISTRY_SETUP, {
+          label,
+        });
       });
     });
 

ee/spec/frontend/projects/merge_requests/blocking_mr_input_root_spec.js

@@ -90,14 +90,18 @@ describe('blocking mr input root', () => {
         createComponent({ existingRefs: ['!1'] });
         removeRef(0);
 
-        expectShouldUpdateRefsToBe(true);
+        return wrapper.vm.$nextTick().then(() => {
+          expectShouldUpdateRefsToBe(true);
+        });
       });
 
       it('is true after a ref is added', () => {
         createComponent();
         addTokenizedInput('foo');
 
-        expectShouldUpdateRefsToBe(true);
+        return wrapper.vm.$nextTick(() => {
+          expectShouldUpdateRefsToBe(true);
+        });
       });
     });
 
@@ -129,7 +133,9 @@ describe('blocking mr input root', () => {
         makeComponentWithHiddenMrs();
         removeRef(2);
 
-        expectRemoveHiddenBlockingMergeRequestsToBe(true);
+        return wrapper.vm.$nextTick().then(() => {
+          expectRemoveHiddenBlockingMergeRequestsToBe(true);
+        });
       });
     });
   });

ee/spec/frontend/vue_shared/components/sidebar/epics_select/base_spec.js

@@ -56,7 +56,9 @@ describe('EpicsSelect', () => {
             issueId: 123,
           });
 
-          expect(wrapper.vm.$store.state.issueId).toBe(123);
+          return wrapper.vm.$nextTick().then(() => {
+            expect(wrapper.vm.$store.state.issueId).toBe(123);
+          });
         });
       });
 
@@ -66,7 +68,9 @@ describe('EpicsSelect', () => {
             initialEpic: mockEpic2,
           });
 
-          expect(wrapper.vm.$store.state.selectedEpic).toBe(mockEpic2);
+          return wrapper.vm.$nextTick().then(() => {
+            expect(wrapper.vm.$store.state.selectedEpic).toBe(mockEpic2);
+          });
         });
       });
 

spec/frontend/create_cluster/eks_cluster/components/cluster_form_dropdown_spec.js

@@ -216,6 +216,8 @@ describe('ClusterFormDropdown', () => {
 
     $(dropdownEl).trigger('shown.bs.dropdown');
 
-    expect(vm.find(DropdownSearchInput).props('focused')).toBe(true);
+    return vm.vm.$nextTick(() => {
+      expect(vm.find(DropdownSearchInput).props('focused')).toBe(true);
+    });
   });
 });

spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js

@@ -197,7 +197,9 @@ describe('EksClusterConfigurationForm', () => {
   it('sets RoleDropdown hasErrors to true when loading roles failed', () => {
     rolesState.loadingItemsError = new Error();
 
-    expect(findRoleDropdown().props('hasErrors')).toEqual(true);
+    return Vue.nextTick().then(() => {
+      expect(findRoleDropdown().props('hasErrors')).toEqual(true);
+    });
   });
 
   it('sets isLoadingRegions to RegionDropdown loading property', () => {
@@ -215,7 +217,9 @@ describe('EksClusterConfigurationForm', () => {
   it('sets loadingRegionsError to RegionDropdown error property', () => {
     regionsState.loadingItemsError = new Error();
 
-    expect(findRegionDropdown().props('hasErrors')).toEqual(true);
+    return Vue.nextTick().then(() => {
+      expect(findRegionDropdown().props('hasErrors')).toEqual(true);
+    });
   });
 
   it('disables KeyPairDropdown when no region is selected', () => {
@@ -245,7 +249,9 @@ describe('EksClusterConfigurationForm', () => {
   it('sets KeyPairDropdown hasErrors to true when loading key pairs fails', () => {
     keyPairsState.loadingItemsError = new Error();
 
-    expect(findKeyPairDropdown().props('hasErrors')).toEqual(true);
+    return Vue.nextTick().then(() => {
+      expect(findKeyPairDropdown().props('hasErrors')).toEqual(true);
+    });
   });
 
   it('disables VpcDropdown when no region is selected', () => {
@@ -275,7 +281,9 @@ describe('EksClusterConfigurationForm', () => {
   it('sets VpcDropdown hasErrors to true when loading vpcs fails', () => {
     vpcsState.loadingItemsError = new Error();
 
-    expect(findVpcDropdown().props('hasErrors')).toEqual(true);
+    return Vue.nextTick().then(() => {
+      expect(findVpcDropdown().props('hasErrors')).toEqual(true);
+    });
   });
 
   it('disables SubnetDropdown when no vpc is selected', () => {
@@ -305,7 +313,9 @@ describe('EksClusterConfigurationForm', () => {
   it('sets SubnetDropdown hasErrors to true when loading subnets fails', () => {
     subnetsState.loadingItemsError = new Error();
 
-    expect(findSubnetDropdown().props('hasErrors')).toEqual(true);
+    return Vue.nextTick().then(() => {
+      expect(findSubnetDropdown().props('hasErrors')).toEqual(true);
+    });
   });
 
   it('disables SecurityGroupDropdown when no vpc is selected', () => {
@@ -335,7 +345,9 @@ describe('EksClusterConfigurationForm', () => {
   it('sets SecurityGroupDropdown hasErrors to true when loading security groups fails', () => {
     securityGroupsState.loadingItemsError = new Error();
 
-    expect(findSecurityGroupDropdown().props('hasErrors')).toEqual(true);
+    return Vue.nextTick().then(() => {
+      expect(findSecurityGroupDropdown().props('hasErrors')).toEqual(true);
+    });
   });
 
   describe('when region is selected', () => {

spec/frontend/error_tracking_settings/components/app_spec.js

@@ -57,7 +57,9 @@ describe('error tracking settings app', () => {
     it('disables the button when saving', () => {
       store.state.settingsLoading = true;
 
-      expect(wrapper.find('.js-error-tracking-button').attributes('disabled')).toBeTruthy();
+      return wrapper.vm.$nextTick(() => {
+        expect(wrapper.find('.js-error-tracking-button').attributes('disabled')).toBeTruthy();
+      });
     });
   });
 });

spec/frontend/mr_popover/mr_popover_spec.js

@@ -24,7 +24,9 @@ describe('MR Popover', () => {
   it('shows skeleton-loader while apollo is loading', () => {
     wrapper.vm.$apollo.loading = true;
 
-    expect(wrapper.element).toMatchSnapshot();
+    return wrapper.vm.$nextTick().then(() => {
+      expect(wrapper.element).toMatchSnapshot();
+    });
   });
 
   describe('loaded state', () => {

spec/frontend/repository/components/last_commit_spec.js

@@ -66,39 +66,51 @@ describe('Repository last commit component', () => {
   it('renders commit widget', () => {
     factory();
 
-    expect(vm.element).toMatchSnapshot();
+    return vm.vm.$nextTick(() => {
+      expect(vm.element).toMatchSnapshot();
+    });
   });
 
   it('renders short commit ID', () => {
     factory();
 
-    expect(vm.find('.label-monospace').text()).toEqual('12345678');
+    return vm.vm.$nextTick(() => {
+      expect(vm.find('.label-monospace').text()).toEqual('12345678');
+    });
   });
 
   it('hides pipeline components when pipeline does not exist', () => {
     factory(createCommitData({ pipeline: null }));
 
-    expect(vm.find('.js-commit-pipeline').exists()).toBe(false);
+    return vm.vm.$nextTick(() => {
+      expect(vm.find('.js-commit-pipeline').exists()).toBe(false);
+    });
   });
 
   it('renders pipeline components', () => {
     factory();
 
-    expect(vm.find('.js-commit-pipeline').exists()).toBe(true);
+    return vm.vm.$nextTick(() => {
+      expect(vm.find('.js-commit-pipeline').exists()).toBe(true);
+    });
   });
 
   it('hides author component when author does not exist', () => {
     factory(createCommitData({ author: null }));
 
-    expect(vm.find('.js-user-link').exists()).toBe(false);
-    expect(vm.find(UserAvatarLink).exists()).toBe(false);
+    return vm.vm.$nextTick(() => {
+      expect(vm.find('.js-user-link').exists()).toBe(false);
+      expect(vm.find(UserAvatarLink).exists()).toBe(false);
+    });
   });
 
   it('does not render description expander when description is null', () => {
     factory(createCommitData({ description: null }));
 
-    expect(vm.find('.text-expander').exists()).toBe(false);
-    expect(vm.find('.commit-row-description').exists()).toBe(false);
+    return vm.vm.$nextTick(() => {
+      expect(vm.find('.text-expander').exists()).toBe(false);
+      expect(vm.find('.commit-row-description').exists()).toBe(false);
+    });
   });
 
   it('expands commit description when clicking expander', () => {
@@ -113,6 +125,8 @@ describe('Repository last commit component', () => {
   it('renders the signature HTML as returned by the backend', () => {
     factory(createCommitData({ signatureHtml: '<button>Verified</button>' }));
 
-    expect(vm.element).toMatchSnapshot();
+    return vm.vm.$nextTick().then(() => {
+      expect(vm.element).toMatchSnapshot();
+    });
   });
 });

spec/frontend/vue_shared/components/dropdown/dropdown_search_input_spec.js

@@ -49,7 +49,9 @@ describe('DropdownSearchInputComponent', () => {
 
       wrapper.setProps({ focused: true });
 
-      expect(inputEl.focus).toHaveBeenCalled();
+      return wrapper.vm.$nextTick().then(() => {
+        expect(inputEl.focus).toHaveBeenCalled();
+      });
     });
   });
 });

spec/frontend/vue_shared/components/user_avatar/user_avatar_list_spec.js

@@ -147,9 +147,12 @@ describe('UserAvatarList', () => {
 
       it('with collapse clicked, it renders avatars up to breakpoint', () => {
         clickButton();
-        const links = wrapper.findAll(UserAvatarLink);
 
-        expect(links.length).toEqual(TEST_BREAKPOINT);
+        return wrapper.vm.$nextTick(() => {
+          const links = wrapper.findAll(UserAvatarLink);
+
+          expect(links.length).toEqual(TEST_BREAKPOINT);
+        });
       });
     });
   });