summaryrefslogtreecommitdiff
path: root/spec/features/commits_spec.rb
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-07-25 09:40:23 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:46:03 +0200
commiteda001565c5afbf6e2eb9b8b5cf4fa9d6525ed71 (patch)
tree44eb6484077618fa444fb85d4e0e8e6a2914430f /spec/features/commits_spec.rb
parentc4c44c6a1bb892dc17989cef3cc9b6c23fecb2c8 (diff)
downloadgitlab-ce-eda001565c5afbf6e2eb9b8b5cf4fa9d6525ed71.tar.gz
fetch gpg signature badges by ajax
Diffstat (limited to 'spec/features/commits_spec.rb')
-rw-r--r--spec/features/commits_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 729d83968d3..87a0dc328a6 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -204,7 +204,7 @@ describe 'Commits' do
end
end
- describe 'GPG signed commits' do
+ describe 'GPG signed commits', :js do
it 'changes from unverified to verified when the user changes his email to match the gpg key' do
user = create :user, email: 'unrelated.user@example.org'
project.team << [user, :master]
@@ -262,7 +262,7 @@ describe 'Commits' do
end
end
- it 'shows popover badges', :js do
+ it 'shows popover badges' do
gpg_user = create :user, email: GpgHelpers::User1.emails.first, username: 'nannie.bernhard', name: 'Nannie Bernhard'
Sidekiq::Testing.inline! do
create :gpg_key, key: GpgHelpers::User1.public_key, user: gpg_user