diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-01 18:23:36 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-01 18:23:36 +0000 |
| commit | 9ba8685ea701a2f805d4bf6fb71ff52c49065c92 (patch) | |
| tree | 13daac9aae82d3f733dd4ce46f3a28a806b27982 /spec/features/commits_spec.rb | |
| parent | c4e7875d2909588e55c21a7cf19e31f60bce200f (diff) | |
| parent | 0edf2b0d421144686ee399f44c26a2c4e1b2df05 (diff) | |
| download | gitlab-ce-docs-specific-review-examples.tar.gz | |
Merge branch 'master' into 'docs-specific-review-examples'docs-specific-review-examples
# Conflicts:
# doc/development/code_review.md
Diffstat (limited to 'spec/features/commits_spec.rb')
| -rw-r--r-- | spec/features/commits_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb index 15ec6f20763..0c9fcc60d30 100644 --- a/spec/features/commits_spec.rb +++ b/spec/features/commits_spec.rb @@ -282,7 +282,7 @@ describe 'Commits' do end # verified and the gpg user has a gitlab profile - click_on 'Verified' + click_on 'Verified', match: :first within '.popover' do expect(page).to have_content 'This commit was signed with a verified signature.' expect(page).to have_content 'Nannie Bernhard' @@ -295,7 +295,7 @@ describe 'Commits' do visit project_commits_path(project, :'signed-commits') - click_on 'Verified' + click_on 'Verified', match: :first within '.popover' do expect(page).to have_content 'This commit was signed with a verified signature.' expect(page).to have_content 'Nannie Bernhard' |