From ff0979553db7bac067beeb0d51b4543f9bdce53e Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 23 Aug 2018 14:58:07 +0800 Subject: [PATCH] Skip discobot mention tutorial if mentions are disabled. --- .../new_user_narrative.rb | 1 + .../new_user_narrative_spec.rb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb index 26ab1437d64..a814f1cd73f 100644 --- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb +++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb @@ -51,6 +51,7 @@ module DiscourseNarrativeBot }, tutorial_mention: { + prerequisite: Proc.new { SiteSetting.enable_mentions }, next_state: :tutorial_formatting, next_instructions: Proc.new { I18n.t("#{I18N_KEY}.formatting.instructions", base_uri: Discourse.base_uri) }, diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb index 2a5af3af7b5..1b1700c5f32 100644 --- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb +++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb @@ -690,6 +690,23 @@ describe DiscourseNarrativeBot::NewUserNarrative do end end + describe 'when user mentions is disabled' do + before do + SiteSetting.enable_mentions = false + end + + it 'should skip the mention tutorial step' do + post.update!( + raw: ':monkey: :fries:' + ) + + narrative.expects(:enqueue_timeout_job).with(user) + narrative.input(:reply, user, post: post) + + expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_formatting) + end + end + it 'should create the right reply' do post.update!( raw: ':monkey: :fries:'