diff options
Diffstat (limited to 'spec/features/merge_request/user_resolves_conflicts_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_resolves_conflicts_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb index 1b1152897fc..d9e3bfd6a9c 100644 --- a/spec/features/merge_request/user_resolves_conflicts_spec.rb +++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb @@ -173,7 +173,7 @@ RSpec.describe 'Merge request > User resolves conflicts', :js do end it "renders bad name without xss issues" do - expect(find('.resolve-conflicts-form .resolve-info')).to have_content(bad_branch_name) + expect(find('[data-testid="resolve-info"]')).to have_content(bad_branch_name) end end end |