diff options
Diffstat (limited to 'spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js')
| -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', () => { |