diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-16 21:10:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-16 21:10:10 +0300 |
commit | d755061465c24de58568183df5e7b826e934ae5d (patch) | |
tree | b378078e37c3ae384ea7e3b7ca91398754fd7fac /spec/services/projects | |
parent | 6364c14cc1f445d471bca118dca5af5a85b2c5dc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/projects')
-rw-r--r-- | spec/services/projects/alerting/notify_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/projects/prometheus/alerts/notify_service_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/projects/alerting/notify_service_spec.rb b/spec/services/projects/alerting/notify_service_spec.rb index 3d7d928d744..4b7b7b0b200 100644 --- a/spec/services/projects/alerting/notify_service_spec.rb +++ b/spec/services/projects/alerting/notify_service_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Projects::Alerting::NotifyService do let(:token) { 'invalid-token' } let(:starts_at) { Time.current.change(usec: 0) } let(:fingerprint) { 'testing' } - let(:service) { described_class.new(project, nil, payload) } + let(:service) { described_class.new(project, payload) } let_it_be(:environment) { create(:environment, project: project) } let(:environment) { create(:environment, project: project) } let(:ended_at) { nil } diff --git a/spec/services/projects/prometheus/alerts/notify_service_spec.rb b/spec/services/projects/prometheus/alerts/notify_service_spec.rb index c8f7359ac38..8ae47ec266c 100644 --- a/spec/services/projects/prometheus/alerts/notify_service_spec.rb +++ b/spec/services/projects/prometheus/alerts/notify_service_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Projects::Prometheus::Alerts::NotifyService do let_it_be(:project, reload: true) { create(:project) } - let(:service) { described_class.new(project, nil, payload) } + let(:service) { described_class.new(project, payload) } let(:token_input) { 'token' } let!(:setting) do @@ -218,7 +218,7 @@ RSpec.describe Projects::Prometheus::Alerts::NotifyService do it 'processes Prometheus alerts' do expect(AlertManagement::ProcessPrometheusAlertService) .to receive(:new) - .with(project, nil, kind_of(Hash)) + .with(project, kind_of(Hash)) .exactly(3).times .and_return(process_service) expect(process_service).to receive(:execute).exactly(3).times |