diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-13 00:10:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-13 00:10:38 +0300 |
commit | 3b69a04945341516a2ed6a291769c50fe04336df (patch) | |
tree | 5910b5f0c80bf98aded05305bbaa7fd30d2742c4 /spec/frontend/merge_conflicts | |
parent | e4cfc16da343c2008053ee09bb6af7145a6924cb (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 | 4 |
1 files changed, 2 insertions, 2 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 4fdc4024e10..9b5641ef7b3 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 @@ -49,8 +49,8 @@ describe('Merge Conflict Resolver App', () => { extendedWrapper(w).findByTestId('interactive-button'); const findFileInlineButton = (w = wrapper) => extendedWrapper(w).findByTestId('inline-button'); const findSideBySideButton = () => wrapper.findByTestId('side-by-side'); - const findInlineConflictLines = (w = wrapper) => w.find(InlineConflictLines); - const findParallelConflictLines = (w = wrapper) => w.find(ParallelConflictLines); + const findInlineConflictLines = (w = wrapper) => w.findComponent(InlineConflictLines); + const findParallelConflictLines = (w = wrapper) => w.findComponent(ParallelConflictLines); const findCommitMessageTextarea = () => wrapper.findByTestId('commit-message'); it('shows the amount of conflicts', () => { |