Commit 1c9e3c40 authored by charlie ablett's avatar charlie ablett

Merge branch...

Merge branch '214277-incorrect-arguments-prevent-prometheus-createdefaultalertsworker-from-running' into 'master'

Resolve "Incorrect arguments prevent Prometheus::CreateDefaultAlertsWorker from running"

Closes #214277

See merge request gitlab-org/gitlab!29451
parents b294e2e0 efa246cd
...@@ -153,6 +153,6 @@ class PrometheusService < MonitoringService ...@@ -153,6 +153,6 @@ class PrometheusService < MonitoringService
def create_default_alerts def create_default_alerts
return unless project_id return unless project_id
Prometheus::CreateDefaultAlertsWorker.perform_async(project_id: project_id) Prometheus::CreateDefaultAlertsWorker.perform_async(project_id)
end end
end end
...@@ -133,7 +133,7 @@ describe PrometheusService, :use_clean_rails_memory_store_caching do ...@@ -133,7 +133,7 @@ describe PrometheusService, :use_clean_rails_memory_store_caching do
it 'creates default alerts' do it 'creates default alerts' do
expect(Prometheus::CreateDefaultAlertsWorker) expect(Prometheus::CreateDefaultAlertsWorker)
.to receive(:perform_async) .to receive(:perform_async)
.with(project_id: project.id) .with(project.id)
create_service create_service
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment