diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/support/helpers/usage_data_helpers.rb | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
| download | gitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/support/helpers/usage_data_helpers.rb')
| -rw-r--r-- | spec/support/helpers/usage_data_helpers.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/spec/support/helpers/usage_data_helpers.rb b/spec/support/helpers/usage_data_helpers.rb index f6c415a75bc..a4f40a4af0a 100644 --- a/spec/support/helpers/usage_data_helpers.rb +++ b/spec/support/helpers/usage_data_helpers.rb @@ -78,7 +78,6 @@ module UsageDataHelpers labels lfs_objects merge_requests - merge_requests_users milestone_lists milestones notes @@ -89,8 +88,6 @@ module UsageDataHelpers projects_jira_active projects_jira_server_active projects_jira_cloud_active - projects_slack_notifications_active - projects_slack_slash_active projects_slack_active projects_slack_slash_commands_active projects_custom_issue_tracker_active @@ -231,6 +228,15 @@ module UsageDataHelpers def allow_prometheus_queries allow_next_instance_of(Gitlab::PrometheusClient) do |client| allow(client).to receive(:aggregate).and_return({}) + allow(client).to receive(:query).and_return({}) + end + end + + def for_defined_days_back(days: [29, 2]) + days.each do |n| + Timecop.travel(n.days.ago) do + yield + end end end end |