diff options
author | Rémy Coutable <remy@rymai.me> | 2018-07-23 19:09:29 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-07-23 19:09:29 +0300 |
commit | 92802e51075f485ce2aa80d19f40688f1dd95fb7 (patch) | |
tree | 6bdadc4cce2d20feb28a9c3f4e2cf1336c3b4d74 /spec/features | |
parent | 771e93747e619c295c35e217afae4c10c012c4a0 (diff) | |
parent | 4691fd020807bfc0693e07a811d1c3f3e50b6390 (diff) |
Merge branch 'blackst0ne-replace-sidekiq-inline-with-perform-enqueued-jobs' into 'master'
Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs'
Closes #22991
See merge request gitlab-org/gitlab-ce!20768
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/signed_commits_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb index 3d05474dca2..5003eb508c2 100644 --- a/spec/features/signed_commits_spec.rb +++ b/spec/features/signed_commits_spec.rb @@ -7,7 +7,7 @@ describe 'GPG signed commits', :js do user = create :user, email: 'unrelated.user@example.org' project.add_maintainer(user) - Sidekiq::Testing.inline! do + perform_enqueued_jobs do create :gpg_key, key: GpgHelpers::User1.public_key, user: user end @@ -21,7 +21,7 @@ describe 'GPG signed commits', :js do end # user changes his email which makes the gpg key verified - Sidekiq::Testing.inline! do + perform_enqueued_jobs do user.skip_reconfirmation! user.update!(email: GpgHelpers::User1.emails.first) end @@ -48,7 +48,7 @@ describe 'GPG signed commits', :js do end # user adds the gpg key which makes the signature valid - Sidekiq::Testing.inline! do + perform_enqueued_jobs do create :gpg_key, key: GpgHelpers::User1.public_key, user: user end @@ -66,7 +66,7 @@ describe 'GPG signed commits', :js do end let(:user_1_key) do - Sidekiq::Testing.inline! do + perform_enqueued_jobs do create :gpg_key, key: GpgHelpers::User1.public_key, user: user_1 end end @@ -79,7 +79,7 @@ describe 'GPG signed commits', :js do end let(:user_2_key) do - Sidekiq::Testing.inline! do + perform_enqueued_jobs do create :gpg_key, key: GpgHelpers::User2.public_key, user: user_2 end end |