Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/support/helpers/metrics_dashboard_url_helpers.rb b/spec/support/helpers/metrics_dashboard_url_helpers.rb
new file mode 100644
index 00000000000..5809f152e3e
--- /dev/null
+++ b/spec/support/helpers/metrics_dashboard_url_helpers.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module MetricsDashboardUrlHelpers
+  # Using the url_helpers available in the test suite uses
+  # the sample host, but the urls generated may need to
+  # point to the configured host in the :js trait
+  def urls
+    ::Gitlab::Routing.url_helpers
+  end
+
+  def clear_host_from_memoized_variables
+    [:metrics_regex, :grafana_regex, :cluster_metrics, :alerts_regex].each do |method_name|
+      Gitlab::Metrics::Dashboard::Url.clear_memoization(method_name)
+    end
+  end
+end