diff --git a/spec/factories/alert_management/alerts.rb b/spec/factories/alert_management/alerts.rb index e36e4c38013b41cf720a558280ec130b8298e7f0..ee1225b954241eb38cc2d992fa7dda4d8bc0cb8f 100644 --- a/spec/factories/alert_management/alerts.rb +++ b/spec/factories/alert_management/alerts.rb @@ -47,10 +47,6 @@ FactoryBot.define do hosts { [FFaker::Internet.ip_v4_address] } end - trait :with_ended_at do - ended_at { Time.current } - end - trait :without_ended_at do ended_at { nil } end @@ -67,7 +63,7 @@ FactoryBot.define do trait :resolved do status { AlertManagement::Alert.status_value(:resolved) } - with_ended_at + ended_at { Time.current } end trait :ignored do diff --git a/spec/factories/prometheus_alert_event.rb b/spec/factories/prometheus_alert_event.rb index 281fbacabe2b6e45171ae1ef4bb636e09d955755..7771a8d5cb7dbd49e9dfeed4a0ff97fe379c3e25 100644 --- a/spec/factories/prometheus_alert_event.rb +++ b/spec/factories/prometheus_alert_event.rb @@ -13,10 +13,5 @@ FactoryBot.define do ended_at { Time.now } payload_key { nil } end - - trait :none do - status { nil } - started_at { nil } - end end end diff --git a/spec/factories/self_managed_prometheus_alert_event.rb b/spec/factories/self_managed_prometheus_alert_event.rb index 238942e2c46c77e062ab9b4bc47d6c40705d2ed3..3a48aba5f5447161c2ac4d6db68ec3caf02e1ad7 100644 --- a/spec/factories/self_managed_prometheus_alert_event.rb +++ b/spec/factories/self_managed_prometheus_alert_event.rb @@ -8,16 +8,5 @@ FactoryBot.define do title { 'alert' } query_expression { 'vector(2)' } started_at { Time.now } - - trait :resolved do - status { SelfManagedPrometheusAlertEvent.status_value_for(:resolved) } - ended_at { Time.now } - payload_key { nil } - end - - trait :none do - status { nil } - started_at { nil } - end end end diff --git a/spec/factories_spec.rb b/spec/factories_spec.rb index c381fb82ba09e4acc196db2765305ee6dd27454f..a297b0b72f6e5e9611f339e5a06f84d612aaded3 100644 --- a/spec/factories_spec.rb +++ b/spec/factories_spec.rb @@ -7,7 +7,6 @@ RSpec.describe 'factories' do def skipped_traits [ - [:alert_management_alert, :with_ended_at], [:audit_event, :unauthenticated], [:ci_build_trace_chunk, :fog_with_data], [:ci_job_artifact, :remote_store], @@ -32,10 +31,7 @@ RSpec.describe 'factories' do [:pages_domain, :explicit_ecdsa], [:project_member, :blocked], [:project, :remote_mirror], - [:prometheus_alert_event, :none], [:remote_mirror, :ssh], - [:self_managed_prometheus_alert_event, :resolved], - [:self_managed_prometheus_alert_event, :none], [:user_preference, :only_comments] ] end diff --git a/spec/models/prometheus_alert_event_spec.rb b/spec/models/prometheus_alert_event_spec.rb index 913ca7db0bea500c6ed3729a4fb2f320b6878ad4..6bff549bc4bf1e17712dd8c07f379e4eab8ce823 100644 --- a/spec/models/prometheus_alert_event_spec.rb +++ b/spec/models/prometheus_alert_event_spec.rb @@ -52,7 +52,7 @@ RSpec.describe PrometheusAlertEvent do let(:started_at) { Time.current } context 'when status is none' do - subject { build(:prometheus_alert_event, :none) } + subject { build(:prometheus_alert_event, status: nil, started_at: nil) } it 'fires an event' do result = subject.fire(started_at)