From 7b52c7cb634ef7047d30b0337fe477bcdcedf41d Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 2 Mar 2020 18:07:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 qa/qa/page/project/operations/metrics.rb      | 46 ------------------------
 qa/qa/page/project/operations/metrics/show.rb | 50 +++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 46 deletions(-)
 delete mode 100644 qa/qa/page/project/operations/metrics.rb
 create mode 100644 qa/qa/page/project/operations/metrics/show.rb

(limited to 'qa/qa/page/project')

diff --git a/qa/qa/page/project/operations/metrics.rb b/qa/qa/page/project/operations/metrics.rb
deleted file mode 100644
index 710cb68ed41..00000000000
--- a/qa/qa/page/project/operations/metrics.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Project
-      module Operations
-        class Metrics < Page::Base
-          EXPECTED_TITLE = 'Memory Usage (Total)'
-          LOADING_MESSAGE = 'Waiting for performance data'
-
-          view 'app/assets/javascripts/monitoring/components/dashboard.vue' do
-            element :prometheus_graphs
-          end
-
-          view 'app/assets/javascripts/monitoring/components/panel_type.vue' do
-            element :prometheus_graph_widgets
-            element :prometheus_widgets_dropdown
-            element :alert_widget_menu_item
-          end
-
-          def wait_for_metrics
-            wait_for_data
-            return if has_metrics?
-
-            wait_until(max_duration: 180) do
-              wait_for_data
-              has_metrics?
-            end
-          end
-
-          def wait_for_data
-            wait_until(reload: false) { !has_text?(LOADING_MESSAGE) } if has_text?(LOADING_MESSAGE)
-          end
-
-          def has_metrics?
-            within_element :prometheus_graphs do
-              has_text?(EXPECTED_TITLE)
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-QA::Page::Project::Operations::Metrics.prepend_if_ee('QA::EE::Page::Project::Operations::Metrics')
diff --git a/qa/qa/page/project/operations/metrics/show.rb b/qa/qa/page/project/operations/metrics/show.rb
new file mode 100644
index 00000000000..c94c1f6590f
--- /dev/null
+++ b/qa/qa/page/project/operations/metrics/show.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Project
+      module Operations
+        module Metrics
+          class Show < Page::Base
+            EXPECTED_TITLE = 'Memory Usage (Total)'
+            LOADING_MESSAGE = 'Waiting for performance data'
+
+            view 'app/assets/javascripts/monitoring/components/dashboard.vue' do
+              element :prometheus_graphs
+            end
+
+            view 'app/assets/javascripts/monitoring/components/panel_type.vue' do
+              element :prometheus_graph_widgets
+              element :prometheus_widgets_dropdown
+              element :alert_widget_menu_item
+            end
+
+            def wait_for_metrics
+              wait_for_data
+              return if has_metrics?
+
+              wait_until(max_duration: 180) do
+                wait_for_data
+                has_metrics?
+              end
+            end
+
+            def has_metrics?
+              within_element :prometheus_graphs do
+                has_text?(EXPECTED_TITLE)
+              end
+            end
+
+            private
+
+            def wait_for_data
+              wait_until(reload: false) { !has_text?(LOADING_MESSAGE) } if has_text?(LOADING_MESSAGE)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+QA::Page::Project::Operations::Metrics::Show.prepend_if_ee('QA::EE::Page::Project::Operations::Metrics::Show')
-- 
cgit v1.2.1