Skip to content
Snippets Groups Projects
Commit 2e08c928 authored by Thong Kuah's avatar Thong Kuah
Browse files

Merge branch '209027-ee-spec-lib-ee-gitlab-usage_data_spec-rb-failing' into 'master' 

Resolve "ee/spec/lib/ee/gitlab/usage_data_spec.rb failing"

Closes #209027

See merge request !26548
parents 4cf4e15a 1cc4f3f2
No related branches found
No related tags found
5 merge requests!158514Fix CodeReviewMetrics worker failure with kwargs,!27224Update stable branch yorick/test-release-tools for automatic RC 12.9.0-rc20200313145923.ee.0,!26962WIP: Allow GMA groups to specify their own PAT expiry setting (2/2),!26548Resolve "ee/spec/lib/ee/gitlab/usage_data_spec.rb failing",!24639WIP POC: Ss/realtime 2
Pipeline #123433062 passed with warnings
Stage: sync
Stage: prepare
Stage: fixtures
Stage: test
Stage: post-test
Stage: review-prepare
Stage: review
Stage: qa
Stage: pages
Stage: deploy
Hide whitespace changes
Inline Side-by-side
ee/spec/lib/ee/gitlab/usage_data_spec.rb
+ 13
− 6
View file @ 2e08c928
......@@ -345,11 +345,16 @@
context 'for secure' do
let_it_be(:user) { create(:user, group_view: :security_dashboard) }
let_it_be(:ci_build_container_scanning) { create(:ci_build, name: 'container_scanning', user: user) }
let_it_be(:ci_build_dast) { create(:ci_build, name: 'dast', user: user) }
let_it_be(:ci_build_dependency_scanning) { create(:ci_build, name: 'dependency_scanning', user: user) }
let_it_be(:ci_build_license_management) { create(:ci_build, name: 'license_management', user: user) }
let_it_be(:ci_build_sast) { create(:ci_build, name: 'sast', user: user) }
before do
Timecop.travel 2.days.ago do
create(:ci_build, name: 'container_scanning', user: user)
create(:ci_build, name: 'dast', user: user)
create(:ci_build, name: 'dependency_scanning', user: user)
create(:ci_build, name: 'license_management', user: user)
create(:ci_build, name: 'sast', user: user)
end
end
it 'includes accurate usage_activity_by_stage data' do
expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:secure]).to eq(
......@@ -363,7 +368,9 @@
end
it 'combines license_scanning into license_management' do
create(:ci_build, name: 'license_scanning', user: user)
Timecop.travel 2.days.ago do
create(:ci_build, name: 'license_scanning', user: user)
end
expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:secure]).to eq(
user_preferences_group_overview_security_dashboard: 1,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment