diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-25 15:14:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-25 15:14:14 +0300 |
commit | 868c8c35fbddd439f4df76a5954e2a1caa2af3cc (patch) | |
tree | b7bad2964729ba58b6f84ecf36bc72f939a4c900 /spec/frontend/merge_conflicts | |
parent | d2bb55891e78ae23506bee26a30165f3520b47e5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/merge_conflicts')
-rw-r--r-- | spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js b/spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js index fabf65742f5..750fff9b0aa 100644 --- a/spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js +++ b/spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js @@ -1,6 +1,6 @@ import { GlSprintf } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import Vue from 'vue'; +import Vue, { nextTick } from 'vue'; import Vuex from 'vuex'; import InlineConflictLines from '~/merge_conflicts/components/inline_conflict_lines.vue'; import ParallelConflictLines from '~/merge_conflicts/components/parallel_conflict_lines.vue'; @@ -93,7 +93,7 @@ describe('Merge Conflict Resolver App', () => { expect(inlineButton.props('selected')).toBe(false); inlineButton.vm.$emit('click'); - await wrapper.vm.$nextTick(); + await nextTick(); expect(inlineButton.props('selected')).toBe(true); }); @@ -111,7 +111,7 @@ describe('Merge Conflict Resolver App', () => { mountComponent(); findSideBySideButton().vm.$emit('click'); - await wrapper.vm.$nextTick(); + await nextTick(); const parallelConflictLinesComponent = findParallelConflictLines(findFiles().at(0)); |