diff options
| author | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-19 17:50:45 +0000 |
|---|---|---|
| committer | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-19 17:50:45 +0000 |
| commit | cfc88c92653f5d7cae1dfd1e2491c3a6820cde76 (patch) | |
| tree | 0eb017bfe622f1402b6967424de3276a2b3e484c /spec/features | |
| parent | 0d79fe7ed94a41132d63b6ae42e96417368b6ce0 (diff) | |
| parent | 5088e316d25fc2a7d61a253e467d551e4888628e (diff) | |
| download | gitlab-ce-cfc88c92653f5d7cae1dfd1e2491c3a6820cde76.tar.gz | |
Merge branch 'add-js-prevent-default-on-click' into 'master'
Replace inline scripts in links to prevent default
See merge request gitlab-org/gitlab-ce!31838
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/signed_commits_spec.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb index e2b3444272e..70e6978a7b6 100644 --- a/spec/features/signed_commits_spec.rb +++ b/spec/features/signed_commits_spec.rb @@ -15,8 +15,8 @@ describe 'GPG signed commits' do visit project_commit_path(project, ref) - expect(page).to have_link 'Unverified' - expect(page).not_to have_link 'Verified' + expect(page).to have_button 'Unverified' + expect(page).not_to have_button 'Verified' # user changes his email which makes the gpg key verified perform_enqueued_jobs do @@ -26,8 +26,8 @@ describe 'GPG signed commits' do visit project_commit_path(project, ref) - expect(page).not_to have_link 'Unverified' - expect(page).to have_link 'Verified' + expect(page).not_to have_button 'Unverified' + expect(page).to have_button 'Verified' end it 'changes from unverified to verified when the user adds the missing gpg key' do @@ -36,8 +36,8 @@ describe 'GPG signed commits' do visit project_commit_path(project, ref) - expect(page).to have_link 'Unverified' - expect(page).not_to have_link 'Verified' + expect(page).to have_button 'Unverified' + expect(page).not_to have_button 'Verified' # user adds the gpg key which makes the signature valid perform_enqueued_jobs do @@ -46,8 +46,8 @@ describe 'GPG signed commits' do visit project_commit_path(project, ref) - expect(page).not_to have_link 'Unverified' - expect(page).to have_link 'Verified' + expect(page).not_to have_button 'Unverified' + expect(page).to have_button 'Verified' end context 'shows popover badges', :js do @@ -136,7 +136,7 @@ describe 'GPG signed commits' do visit project_commit_path(project, GpgHelpers::SIGNED_AND_AUTHORED_SHA) # wait for the signature to get generated - expect(page).to have_link 'Verified' + expect(page).to have_button 'Verified' user_1.destroy! |