diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-08-01 23:31:14 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-08-02 09:43:51 +0200 |
| commit | 0cfdb5be2e86e0f30669bed332c6d53be7baee13 (patch) | |
| tree | 0797ef8cbabff7a9c4818e7709c76c020222b1e2 | |
| parent | 9812e5dd7c52e67b22781a440ee04dbb2a086000 (diff) | |
| download | gitlab-ce-0cfdb5be2e86e0f30669bed332c6d53be7baee13.tar.gz | |
Add failing test for https://gitlab.com/gitlab-org/gitlab-ce/issues/49831
| -rw-r--r-- | spec/features/projects/blobs/blob_show_spec.rb | 9 | ||||
| -rw-r--r-- | spec/support/helpers/test_env.rb | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb index 27589428896..9a5b5f3340c 100644 --- a/spec/features/projects/blobs/blob_show_spec.rb +++ b/spec/features/projects/blobs/blob_show_spec.rb @@ -552,4 +552,13 @@ describe 'File blob', :js do end end end + + context 'on signed merge request' do + it 'displays a GPG badge' do + visit_blob('some-file.md', ref: 'winh-signed-merge-commit') + + expect(page).not_to have_selector '.gpg-status-box.js-loading-gpg-badge' + expect(page).to have_selector '.gpg-status-box.invalid' + end + end end diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index e531495d917..f60ee2a9abb 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -51,7 +51,8 @@ module TestEnv 'add-pdf-text-binary' => '79faa7b', 'add_images_and_changes' => '010d106', 'update-gitlab-shell-v-6-0-1' => '2f61d70', - 'update-gitlab-shell-v-6-0-3' => 'de78448' + 'update-gitlab-shell-v-6-0-3' => 'de78448', + 'winh-signed-merge-commit' => 'bd693b1' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |