Add latest changes from gitlab-org/gitlab@master

3 files changed, 47 insertions, 0 deletions

diff --git a/qa/qa/scenario/test/integration/service_ping_disabled.rb b/qa/qa/scenario/test/integration/service_ping_disabled.rb
new file mode 100644
index 00000000000..7b646ce17ae
--- /dev/null
+++ b/qa/qa/scenario/test/integration/service_ping_disabled.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module QA
+  module Scenario
+    module Test
+      module Integration
+        ##
+        # Run test suite against any GitLab instance where Service Ping is disabled from gitlab.yml
+        #
+        class ServicePingDisabled < Test::Instance::All
+          tags :service_ping_disabled
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/non_devops/service_ping_disabled_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/service_ping_disabled_spec.rb
new file mode 100644
index 00000000000..309369265c9
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/non_devops/service_ping_disabled_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Service ping disabled', :orchestrated, :service_ping_disabled, :requires_admin do
+    context 'when disabled from gitlab.yml config' do
+      before do
+        Flow::Login.sign_in_as_admin
+
+        Page::Main::Menu.perform(&:go_to_admin_area)
+        Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
+      end
+
+      it 'has service ping toggle is disabled' do
+        Page::Admin::Settings::MetricsAndProfiling.perform do |settings|
+          settings.expand_usage_statistics do |usage_statistics|
+            expect(usage_statistics).to have_disabled_usage_data_checkbox
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/spec/scenario/test/integration/service_ping_disabled_spec.rb b/qa/spec/scenario/test/integration/service_ping_disabled_spec.rb
new file mode 100644
index 00000000000..2db254908f0
--- /dev/null
+++ b/qa/spec/scenario/test/integration/service_ping_disabled_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.describe QA::Scenario::Test::Integration::ServicePingDisabled do
+  describe '#perform' do
+    it_behaves_like 'a QA scenario class' do
+      let(:tags) { [:service_ping_disabled] }
+    end
+  end
+end