Skip to content

G
gitlab-ce
Commit cdb8d032 authored by Fabio Pitino's avatar Fabio Pitino
Browse files
Options

Remove redundant specs about CI minutes notifications 

Since all test cases are now covered by table syntax
we can remove the old specs.
parent 446c75a1
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 222 deletions
ee/spec/services/ci/minutes/email_notification_service_spec.rb
View file @ cdb8d032
......@@ -3,39 +3,6 @@
require 'spec_helper'
RSpec.describe Ci::Minutes::EmailNotificationService do
shared_examples 'namespace with available CI minutes' do
context 'when usage is below the quote' do
it 'does not send the email' do
expect(CiMinutesUsageMailer).not_to receive(:notify)
subject
end
end
end
shared_examples 'namespace with all CI minutes used' do
context 'when usage is over the quote' do
it 'sends the email to the owner' do
expect(CiMinutesUsageMailer).to receive(:notify).once.with(namespace, [user.email]).and_return(spy)
subject
end
end
end
let(:project) { create(:project, namespace: namespace) }
let(:user) { create(:user) }
let(:user_2) { create(:user) }
let(:ci_minutes_used) { 0 }
let!(:namespace_statistics) do
create(:namespace_statistics, namespace: namespace, shared_runners_seconds: ci_minutes_used * 60)
end
let(:namespace_usage) do
Ci::Minutes::NamespaceMonthlyUsage.find_or_create_current(namespace_id: namespace.id)
end
describe '#execute' do
using RSpec::Parameterized::TableSyntax
......@@ -44,7 +11,7 @@ RSpec.describe Ci::Minutes::EmailNotificationService do
def expect_warning_usage_notification(new_notification_level)
expect(CiMinutesUsageMailer)
.to receive(:notify_limit)
.with(namespace, match_array([user.email, user_2.email]), new_notification_level)
.with(namespace, match_array(recipients), new_notification_level)
.and_call_original
subject
......@@ -56,7 +23,7 @@ RSpec.describe Ci::Minutes::EmailNotificationService do
def expect_quota_exceeded_notification
expect(CiMinutesUsageMailer)
.to receive(:notify)
.with(namespace, match_array([user.email, user_2.email]))
.with(namespace, match_array(recipients))
.and_call_original
subject
......@@ -114,22 +81,20 @@ RSpec.describe Ci::Minutes::EmailNotificationService do
let_it_be(:user) { create(:user) }
let_it_be(:user_2) { create(:user) }
let_it_be_with_reload(:namespace) { create(:group) }
let_it_be_with_reload(:project) { create(:project, namespace: namespace) }
let!(:namespace_statistics) do
create(:namespace_statistics, namespace: namespace, shared_runners_seconds: minutes_used * 60)
end
let(:project) { create(:project, namespace: namespace) }
let(:namespace_usage) do
Ci::Minutes::NamespaceMonthlyUsage.find_or_create_current(namespace_id: namespace.id)
end
let!(:namespace_statistics) do
create(:namespace_statistics, namespace: namespace, shared_runners_seconds: minutes_used * 60)
end
before do
namespace_usage.update_column(:notification_level, current_notification_level)
namespace.update_column(:shared_runners_minutes_limit, monthly_minutes_limit)
namespace.add_owner(user)
namespace.add_owner(user_2)
if current_notification_level == 0
namespace.update_column(:last_ci_minutes_notification_at, Time.current)
......@@ -138,6 +103,10 @@ RSpec.describe Ci::Minutes::EmailNotificationService do
end
end
context 'when on personal namespace' do
let(:namespace) { create(:namespace, owner: user) }
let(:recipients) { [user.email] }
it_behaves_like 'matches the expectation'
context 'when feature flag ci_minutes_use_notification_level is disabled' do
......@@ -149,192 +118,24 @@ RSpec.describe Ci::Minutes::EmailNotificationService do
end
end
let(:extra_ci_minutes) { 0 }
let(:namespace) do
create(:namespace, shared_runners_minutes_limit: 2000, extra_shared_runners_minutes_limit: extra_ci_minutes)
end
context 'when on group' do
let(:namespace) { create(:group) }
let(:recipients) { [user.email, user_2.email] }
context 'with a personal namespace' do
before do
namespace.update!(owner_id: user.id)
end
it_behaves_like 'namespace with available CI minutes' do
let(:ci_minutes_used) { 1900 }
end
it_behaves_like 'namespace with all CI minutes used' do
let(:ci_minutes_used) { 2500 }
end
end
context 'with a Group' do
let!(:namespace) do
create(:group, shared_runners_minutes_limit: 2000, extra_shared_runners_minutes_limit: extra_ci_minutes)
end
context 'with a single owner' do
before do
namespace.add_owner(user)
end
it_behaves_like 'namespace with available CI minutes' do
let(:ci_minutes_used) { 1900 }
end
it_behaves_like 'namespace with all CI minutes used' do
let(:ci_minutes_used) { 2500 }
end
context 'with extra CI minutes' do
let(:extra_ci_minutes) { 1000 }
it_behaves_like 'namespace with available CI minutes' do
let(:ci_minutes_used) { 2500 }
end
it_behaves_like 'namespace with all CI minutes used' do
let(:ci_minutes_used) { 3100 }
end
end
end
context 'with multiple owners' do
before do
namespace.add_owner(user)
namespace.add_owner(user_2)
end
it_behaves_like 'namespace with available CI minutes' do
let(:ci_minutes_used) { 1900 }
end
context 'when usage is over the quote' do
let(:ci_minutes_used) { 2001 }
it 'sends the email to all the owners' do
expect(CiMinutesUsageMailer).to receive(:notify)
.with(namespace, match_array([user_2.email, user.email]))
.and_return(spy)
subject
end
context 'when we have already notified the user that their quota is used up' do
before do
namespace_usage.update_column(:notification_level, 0)
end
it 'does not notify owners' do
expect(CiMinutesUsageMailer).not_to receive(:notify)
subject
end
end
it_behaves_like 'matches the expectation'
context 'when ci_minutes_use_notification_level feature flag is disabled' do
context 'when feature flag ci_minutes_use_notification_level is disabled' do
before do
stub_feature_flags(ci_minutes_use_notification_level: false)
end
context 'when last_ci_minutes_notification_at has a value' do
before do
namespace.update_column(:last_ci_minutes_notification_at, Time.current)
end
it 'does not notify owners' do
expect(CiMinutesUsageMailer).not_to receive(:notify)
subject
end
end
end
end
end
end
end
describe 'CI usage limit approaching' do
let(:namespace) { create(:group, shared_runners_minutes_limit: 2000) }
def notify_owners
described_class.new(project).execute
end
shared_examples 'no notification is sent' do
it 'does not notify owners' do
expect(CiMinutesUsageMailer).not_to receive(:notify_limit)
notify_owners
end
end
shared_examples 'notification for custom level is sent' do |minutes_used, expected_level|
before do
namespace_statistics.update_column(:shared_runners_seconds, minutes_used * 60)
end
it 'notifies the the owners about it' do
expect(CiMinutesUsageMailer).to receive(:notify_limit)
.with(namespace, array_including(user_2.email, user.email), expected_level)
.and_call_original
notify_owners
end
end
before do
namespace.add_owner(user)
namespace.add_owner(user_2)
end
context 'when available minutes are above notification levels' do
let(:ci_minutes_used) { 1000 }
it_behaves_like 'no notification is sent'
end
context 'when available minutes have reached the first level of alert' do
context 'when quota is unlimited' do
let(:ci_minutes_used) { 1500 }
before do
namespace.update_column(:shared_runners_minutes_limit, 0)
end
it_behaves_like 'no notification is sent'
end
it_behaves_like 'notification for custom level is sent', 1500, 30
context 'when other Pipeline has finished but second level of alert has not been reached' do
before do
namespace_statistics.update_column(:shared_runners_seconds, 1500 * 60)
notify_owners
namespace_statistics.update_column(:shared_runners_seconds, 1600 * 60)
end
it_behaves_like 'no notification is sent'
end
end
context 'when available minutes have reached the second level of alert' do
it_behaves_like 'notification for custom level is sent', 1500, 30
it_behaves_like 'notification for custom level is sent', 1980, 5
it_behaves_like 'matches the expectation'
end
context 'when there are not available minutes to use' do
let(:ci_minutes_used) { 2001 }
it 'notifies owners' do
expect(CiMinutesUsageMailer)
.to receive(:notify)
.with(namespace, array_including(user_2.email, user.email))
.and_call_original
notify_owners
end
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7