Resolve "Remove usage ping payload from Cohorts, add to Settings"

3 files changed, 32 insertions, 9 deletions

diff --git a/spec/features/instance_statistics/cohorts_spec.rb b/spec/features/instance_statistics/cohorts_spec.rb
index 573f8600be1..81fc5eff980 100644
--- a/spec/features/instance_statistics/cohorts_spec.rb
+++ b/spec/features/instance_statistics/cohorts_spec.rb
@@ -12,12 +12,4 @@ 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 a6c16b6a2a3..d8be554d734 100644
--- a/spec/features/instance_statistics/conversational_development_index_spec.rb
+++ b/spec/features/instance_statistics/conversational_development_index_spec.rb
@@ -16,13 +16,21 @@ describe 'Conversational Development Index' do
   end
 
   context 'when usage ping is disabled' do
-    it 'shows empty state' do
+    before do
       stub_application_setting(usage_ping_enabled: false)
+    end
 
+    it 'shows empty state' do
       visit instance_statistics_conversational_development_index_index_path
 
       expect(page).to have_content('Usage ping is not enabled')
     end
+
+    it 'hides the intro callout' do
+      visit instance_statistics_conversational_development_index_index_path
+
+      expect(page).not_to have_content 'Introducing Your Conversational Development Index'
+    end
   end
 
   context 'when there is no data to display' do
diff --git a/spec/features/instance_statistics/instance_statistics.rb b/spec/features/instance_statistics/instance_statistics.rb
new file mode 100644
index 00000000000..d03e6e68075
--- /dev/null
+++ b/spec/features/instance_statistics/instance_statistics.rb
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+describe 'Cohorts page', :js do
+  before do
+    sign_in(create(:admin))
+  end
+
+  it 'hides cohorts nav button when usage ping is disabled' do
+    stub_application_setting(usage_ping_enabled: false)
+
+    visit instance_statistics_root_path
+
+    expect(find('.nav-sidebar')).not_to have_content('Cohorts')
+  end
+
+  it 'shows cohorts nav button when usage ping is enabled' do
+    stub_application_setting(usage_ping_enabled: true)
+
+    visit instance_statistics_root_path
+
+    expect(find('.nav-sidebar')).to have_content('Cohorts')
+  end
+end