Add latest changes from gitlab-org/gitlab@master

3 files changed, 50 insertions, 0 deletions

diff --git a/qa/qa/page/admin/settings/component/usage_statistics.rb b/qa/qa/page/admin/settings/component/usage_statistics.rb
new file mode 100644
index 00000000000..0275b7ae926
--- /dev/null
+++ b/qa/qa/page/admin/settings/component/usage_statistics.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Admin
+      module Settings
+        module Component
+          class UsageStatistics < Page::Base
+            view 'app/views/admin/application_settings/_usage.html.haml' do
+              element :enable_usage_data_checkbox
+            end
+
+            def has_disabled_usage_data_checkbox?
+              has_element?(:enable_usage_data_checkbox, disabled: true)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/admin/settings/metrics_and_profiling.rb b/qa/qa/page/admin/settings/metrics_and_profiling.rb
index 41fad942fc4..7224e51e110 100644
--- a/qa/qa/page/admin/settings/metrics_and_profiling.rb
+++ b/qa/qa/page/admin/settings/metrics_and_profiling.rb
@@ -9,6 +9,7 @@ module QA
 
           view 'app/views/admin/application_settings/metrics_and_profiling.html.haml' do
             element :performance_bar_settings_content
+            element :usage_statistics_settings_content
           end
 
           def expand_performance_bar(&block)
@@ -16,6 +17,12 @@ module QA
               Component::PerformanceBar.perform(&block)
             end
           end
+
+          def expand_usage_statistics(&block)
+            expand_content(:usage_statistics_settings_content) do
+              Component::UsageStatistics.perform(&block)
+            end
+          end
         end
       end
     end
diff --git a/qa/qa/specs/features/browser_ui/non_devops/service_ping_default_enabled_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/service_ping_default_enabled_spec.rb
new file mode 100644
index 00000000000..ecc59aa7cc8
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/non_devops/service_ping_default_enabled_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Service ping default enabled' do
+    context 'When using default enabled from gitlab.yml config', :requires_admin 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 enabled' do
+        Page::Admin::Settings::MetricsAndProfiling.perform do |setting|
+          setting.expand_usage_statistics do |page|
+            expect(page).not_to have_disabled_usage_data_checkbox
+          end
+        end
+      end
+    end
+  end
+end