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

6 files changed, 23 insertions, 0 deletions

diff --git a/app/assets/javascripts/pages/admin/cohorts/index.js b/app/assets/javascripts/pages/instance_statistics/cohorts/index.js
index 2d5020dbef4..2d5020dbef4 100644
--- a/app/assets/javascripts/pages/admin/cohorts/index.js
+++ b/app/assets/javascripts/pages/instance_statistics/cohorts/index.js
diff --git a/app/assets/javascripts/pages/admin/cohorts/usage_ping.js b/app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js
index 914a9661c27..914a9661c27 100644
--- a/app/assets/javascripts/pages/admin/cohorts/usage_ping.js
+++ b/app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js
diff --git a/app/assets/javascripts/pages/admin/conversational_development_index/show/index.js b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js
index c1056537f90..c1056537f90 100644
--- a/app/assets/javascripts/pages/admin/conversational_development_index/show/index.js
+++ b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js
diff --git a/changelogs/unreleased/50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable.yml b/changelogs/unreleased/50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable.yml
new file mode 100644
index 00000000000..50a3b9c9aff
--- /dev/null
+++ b/changelogs/unreleased/50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable.yml
@@ -0,0 +1,5 @@
+---
+title: Fix issue stopping Instance Statistics javascript to be executed
+merge_request: 21211
+author:
+type: fixed
diff --git a/spec/features/instance_statistics/cohorts_spec.rb b/spec/features/instance_statistics/cohorts_spec.rb
index 81fc5eff980..573f8600be1 100644
--- a/spec/features/instance_statistics/cohorts_spec.rb
+++ b/spec/features/instance_statistics/cohorts_spec.rb
@@ -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
diff --git a/spec/features/instance_statistics/conversational_development_index_spec.rb b/spec/features/instance_statistics/conversational_development_index_spec.rb
index d441a7a5af9..a6c16b6a2a3 100644
--- a/spec/features/instance_statistics/conversational_development_index_spec.rb
+++ b/spec/features/instance_statistics/conversational_development_index_spec.rb
@@ -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)