diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 15:08:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 15:08:15 +0000 |
| commit | e18e22ce4c7a4ee0680adda25e4cfa9cf4bb1be4 (patch) | |
| tree | ad5cdd2a994e9ae4627330769eb5004f49d6f435 /spec/frontend/merge_conflicts | |
| parent | cdda3d117c99cadf295f26abc92cb2456033b762 (diff) | |
| download | gitlab-ce-e18e22ce4c7a4ee0680adda25e4cfa9cf4bb1be4.tar.gz | |
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 | 2 |
1 files changed, 1 insertions, 1 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 55e666609bd..4fdc4024e10 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 @@ -59,7 +59,7 @@ describe('Merge Conflict Resolver App', () => { const title = findConflictsCount(); expect(title.exists()).toBe(true); - expect(title.text().trim()).toBe('Showing 3 conflicts between test-conflicts and main'); + expect(title.text().trim()).toBe('Showing 3 conflicts'); }); it('shows a loading spinner while loading', () => { |