diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 18:09:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 18:09:44 +0000 |
| commit | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (patch) | |
| tree | 115fa8dbf6bc05037378b380311d31acb805f54c /spec/features/merge_request | |
| parent | 8e129497b2565b8c595ef4f806d9a9595ca654e5 (diff) | |
| download | gitlab-ce-2c156e3c7bbade01c36eee18327f1ced6eebea79.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb index c482d783bab..21599164ac3 100644 --- a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb +++ b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb @@ -190,7 +190,7 @@ describe 'Merge request > User sees avatars on diff notes', :js do def find_line(line_code) line = find("[id='#{line_code}']") - line = line.find(:xpath, 'preceding-sibling::*[1][self::td]') if line.tag_name == 'td' + line = line.find(:xpath, 'preceding-sibling::*[1][self::td]/preceding-sibling::*[1][self::td]') if line.tag_name == 'td' line end end |