From ee23ce5accfcdf61494d5cddfd10abd8fdd78f68 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 24 May 2017 18:34:10 +0800 Subject: [PATCH] FIX: Allow advanced tutorial to be started if badges are disabled. --- .../lib/discourse_narrative_bot/advanced_user_narrative.rb | 2 +- .../advanced_user_narrative_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb index 5842410ad76..35f83fc67d9 100644 --- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb +++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb @@ -96,7 +96,7 @@ module DiscourseNarrativeBot } def self.can_start?(user) - return true if user.staff? + return true if user.staff? || !SiteSetting.enable_badges user.badges.where(name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME).exists? end diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb index 2afb149bb00..63f2a031e4c 100644 --- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb +++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb @@ -33,6 +33,13 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do expect(described_class.can_start?(user)).to eq(true) end end + + describe 'when badges are disabled' do + it 'should return true' do + SiteSetting.enable_badges = false + expect(described_class.can_start?(user)).to eq(true) + end + end end describe '#notify_timeout' do