Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-22 15:18:01 +0300
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 16:43:36 +0300
commit9816856d055b33de9c47d9e3b73c4acb99c5b5e6 (patch)
treeae3b0c3b89c008830eb42e2d89713247c6e4a7be /spec/features/commits_spec.rb
parent9d30a80d24a583aad267a8a11f685058eab2c864 (diff)
perform signature update in sidekiq worker
Diffstat (limited to 'spec/features/commits_spec.rb')
-rw-r--r--spec/features/commits_spec.rb14
1 files changed, 10 insertions, 4 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 8f89b465160..7635e87e838 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -223,7 +223,9 @@ describe 'Commits' do
user = create :user, email: 'unrelated.user@example.org'
project.team << [user, :master]
- create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+ Sidekiq::Testing.inline! do
+ create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+ end
login_with(user)
@@ -235,8 +237,10 @@ describe 'Commits' do
end
# user changes his email which makes the gpg key verified
- user.skip_reconfirmation!
- user.update_attributes!(email: GpgHelpers::User1.emails.first)
+ Sidekiq::Testing.inline! do
+ user.skip_reconfirmation!
+ user.update_attributes!(email: GpgHelpers::User1.emails.first)
+ end
visit namespace_project_commits_path(project.namespace, project, :master)
@@ -260,7 +264,9 @@ describe 'Commits' do
end
# user adds the gpg key which makes the signature valid
- create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+ Sidekiq::Testing.inline! do
+ create :gpg_key, key: GpgHelpers::User1.public_key, user: user
+ end
visit namespace_project_commits_path(project.namespace, project, :master)