Commit 76cd1dd6 authored by Mike Greiling's avatar Mike Greiling

Merge branch...

Merge branch '50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable' into 'master'

Resolve "Instance Statistics: ConvDev index intro banner is not dismissable"

Closes #50312

See merge request gitlab-org/gitlab-ce!21211
parents 1a7ecf03 182f1eeb
---
title: Fix issue stopping Instance Statistics javascript to be executed
merge_request: 21211
author:
type: fixed
......@@ -12,4 +12,12 @@ describe 'Cohorts page' do
expect(page).to have_content("#{Time.now.strftime('%b %Y')} 3 0")
end
it 'shows usage data', :js do
visit instance_statistics_cohorts_path
wait_for_requests
expect(find('.js-syntax-highlight').text).not_to eq('')
end
end
......@@ -5,6 +5,16 @@ describe 'Conversational Development Index' do
sign_in(create(:admin))
end
it 'has dismissable intro callout', :js do
visit instance_statistics_conversational_development_index_index_path
expect(page).to have_content 'Introducing Your Conversational Development Index'
find('.js-close-callout').click
expect(page).not_to have_content 'Introducing Your Conversational Development Index'
end
context 'when usage ping is disabled' do
it 'shows empty state' do
stub_application_setting(usage_ping_enabled: false)
......
Markdown is supported
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