diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/lib/gitlab/sidekiq_middleware_spec.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/lib/gitlab/sidekiq_middleware_spec.rb')
-rw-r--r-- | spec/lib/gitlab/sidekiq_middleware_spec.rb | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/spec/lib/gitlab/sidekiq_middleware_spec.rb b/spec/lib/gitlab/sidekiq_middleware_spec.rb index 018821e6c5e..4ee9569a0cf 100644 --- a/spec/lib/gitlab/sidekiq_middleware_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware_spec.rb @@ -51,6 +51,7 @@ RSpec.describe Gitlab::SidekiqMiddleware do Gitlab::SidekiqMiddleware::BatchLoader, Labkit::Middleware::Sidekiq::Server, Gitlab::SidekiqMiddleware::InstrumentationLogger, + Gitlab::SidekiqVersioning::Middleware, Gitlab::SidekiqStatus::ServerMiddleware, Gitlab::SidekiqMiddleware::ServerMetrics, Gitlab::SidekiqMiddleware::ArgumentsLogger, @@ -62,6 +63,7 @@ RSpec.describe Gitlab::SidekiqMiddleware do Gitlab::SidekiqMiddleware::DuplicateJobs::Server ] end + let(:enabled_sidekiq_middlewares) { all_sidekiq_middlewares - disabled_sidekiq_middlewares } shared_examples "a server middleware chain" do @@ -78,6 +80,41 @@ RSpec.describe Gitlab::SidekiqMiddleware do end end + shared_examples "a server middleware chain for mailer" do + let(:worker_class) { ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper } + let(:job_args) do + [ + { + "job_class" => "ActionMailer::MailDeliveryJob", + "job_id" => "a180b47c-3fd6-41b8-81e9-34da61c3400e", + "provider_job_id" => nil, + "queue_name" => "mailers", + "priority" => nil, + "arguments" => [ + "Notify", + "test_email", + "deliver_now", + { + "args" => [ + "test@example.com", + "subject", + "body" + ], + "_aj_symbol_keys" => ["args"] + } + ], + "executions" => 0, + "exception_executions" => {}, + "locale" => "en", + "timezone" => "UTC", + "enqueued_at" => "2020-07-27T07:43:31Z" + } + ] + end + + it_behaves_like "a server middleware chain" + end + context "all optional middlewares off" do let(:metrics) { false } let(:arguments_logger) { false } @@ -91,6 +128,7 @@ RSpec.describe Gitlab::SidekiqMiddleware do end it_behaves_like "a server middleware chain" + it_behaves_like "a server middleware chain for mailer" end context "all optional middlewares on" do @@ -100,6 +138,7 @@ RSpec.describe Gitlab::SidekiqMiddleware do let(:disabled_sidekiq_middlewares) { [] } it_behaves_like "a server middleware chain" + it_behaves_like "a server middleware chain for mailer" context "server metrics" do let(:gitaly_histogram) { double(:gitaly_histogram) } |