summaryrefslogtreecommitdiff
path: root/spec/services
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-14 13:38:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-14 13:38:57 +0000
commit10e18de60f55811137871acefd331d2d5a41f237 (patch)
treeb227511752fb7021acec83fd3b2b5499434ae7f8 /spec/services
parent757327a59bcaecb986b0c07ae0cf09ed011e18ce (diff)
downloadgitlab-ce-10e18de60f55811137871acefd331d2d5a41f237.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/submit_usage_ping_service_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/services/submit_usage_ping_service_spec.rb b/spec/services/submit_usage_ping_service_spec.rb
index a9f1b2c2b2d..7133dc35fc3 100644
--- a/spec/services/submit_usage_ping_service_spec.rb
+++ b/spec/services/submit_usage_ping_service_spec.rb
@@ -90,6 +90,14 @@ RSpec.describe SubmitUsagePingService do
it_behaves_like 'does not run'
end
+ context 'when usage ping is disabled from GitLab config file' do
+ before do
+ stub_config_setting(usage_ping_enabled: false)
+ end
+
+ it_behaves_like 'does not run'
+ end
+
context 'when usage ping is enabled' do
before do
stub_usage_data_connections