summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-08-16 17:45:15 +0000
committerMike Greiling <mike@pixelcog.com>2018-08-16 17:45:15 +0000
commit76cd1dd68198bb464b12de7525ab067c6d4dc025 (patch)
tree3712e63de04a074d70280f1dd5420a35c77a649c /spec
parent1a7ecf03944050b9f0126bde9767481d7e8d3ec2 (diff)
parent182f1eeb27d63541141f339b54501cc821b8e0e9 (diff)
downloadgitlab-ce-76cd1dd68198bb464b12de7525ab067c6d4dc025.tar.gz
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
Diffstat (limited to 'spec')
-rw-r--r--spec/features/instance_statistics/cohorts_spec.rb8
-rw-r--r--spec/features/instance_statistics/conversational_development_index_spec.rb10
2 files changed, 18 insertions, 0 deletions
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)