DEV: Use proper wording for contexts in specs

plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb

@@ -133,12 +133,11 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
         expect(Topic.last.title).to eq(I18n.t('discourse_narrative_bot.advanced_user_narrative.title'))
       end
-
     end
   end
 
   describe "#input" do
-    context 'edit tutorial' do
+    context 'when editing tutorial' do
       before do
         narrative.set_data(user,
           state: :tutorial_edit,
@@ -150,7 +149,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         )
       end
 
-      describe 'when post is not in the right topic' do
+      context 'when post is not in the right topic' do
         it 'should not do anything' do
           other_post
           narrative.expects(:enqueue_timeout_job).with(user).never
@@ -160,7 +159,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user replies to the post' do
+      context 'when user replies to the post' do
         it 'should create the right reply' do
           post
           narrative.expects(:enqueue_timeout_job).with(user).once
@@ -174,7 +173,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           ))
         end
 
-        describe 'when reply contains the skip trigger' do
+        context 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             post.update!(raw: "@#{discobot_username} #{skip_trigger.upcase}")
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
@@ -192,7 +191,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user edits the right post' do
+      context 'when user edits the right post' do
         let(:post_2) { Fabricate(:post, user: post.user, topic: post.topic) }
 
         it 'should create the right reply' do
@@ -214,7 +213,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       end
     end
 
-    context 'delete tutorial' do
+    context 'when deleting tutorial' do
       before do
         narrative.set_data(user,
           state: :tutorial_delete,
@@ -223,7 +222,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         )
       end
 
-      describe 'when user replies to the topic' do
+      context 'when user replies to the topic' do
         it 'should create the right reply' do
           narrative.expects(:enqueue_timeout_job).with(user).once
 
@@ -237,7 +236,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_delete)
         end
 
-        describe 'when reply contains the skip trigger' do
+        context 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             post.update!(raw: skip_trigger.upcase)
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
@@ -255,7 +254,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user destroys a post in a different topic' do
+      context 'when user destroys a post in a different topic' do
         it 'should not do anything' do
           other_post
           narrative.expects(:enqueue_timeout_job).with(user).never
@@ -266,7 +265,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user deletes a post in the right topic' do
+      context 'when user deletes a post in the right topic' do
         it 'should create the right reply' do
           post
 
@@ -304,7 +303,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       end
     end
 
-    context 'undelete post tutorial' do
+    context 'when undeleting post tutorial' do
       before do
         narrative.set_data(user,
           state: :tutorial_recover,
@@ -313,7 +312,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         )
       end
 
-      describe 'when posts are configured to be deleted immediately' do
+      context 'when posts are configured to be deleted immediately' do
         before do
           SiteSetting.delete_removed_posts_after = 0
         end
@@ -337,7 +336,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user replies to the topic' do
+      context 'when user replies to the topic' do
         it 'should create the right reply' do
           narrative.set_data(user, narrative.get_data(user).merge(
             tutorial_recover: { post_id: '1' }
@@ -355,7 +354,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_recover)
         end
 
-        describe 'when reply contains the skip trigger' do
+        context 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             parent_category = Fabricate(:category, name: 'a')
             _category = Fabricate(:category, parent_category: parent_category, name: 'b')
@@ -377,7 +376,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user recovers a post in a different topic' do
+      context 'when user recovers a post in a different topic' do
         it 'should not do anything' do
           other_post
           narrative.expects(:enqueue_timeout_job).with(user).never
@@ -389,7 +388,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user recovers a post in the right topic' do
+      context 'when user recovers a post in the right topic' do
         it 'should create the right reply' do
           parent_category = Fabricate(:category, name: 'a')
           _category = Fabricate(:category, parent_category: parent_category, name: 'b')
@@ -412,7 +411,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       end
     end
 
-    context 'category hashtag tutorial' do
+    context 'with category hashtag tutorial' do
       before do
         narrative.set_data(user,
           state: :tutorial_category_hashtag,
@@ -421,7 +420,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         )
       end
 
-      describe 'when post is not in the right topic' do
+      context 'when post is not in the right topic' do
         it 'should not do anything' do
           other_post
           narrative.expects(:enqueue_timeout_job).with(user).never
@@ -434,7 +433,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user replies to the topic' do
+      context 'when user replies to the topic' do
         it 'should create the right reply' do
           narrative.input(:reply, user, post: post)
           new_post = Post.last
@@ -446,7 +445,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_category_hashtag)
         end
 
-        describe 'when reply contains the skip trigger' do
+        context 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             post.update!(raw: skip_trigger)
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
@@ -481,7 +480,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       end
     end
 
-    context 'topic notification level tutorial' do
+    context 'with topic notification level tutorial' do
       before do
         narrative.set_data(user,
           state: :tutorial_change_topic_notification_level,
@@ -490,7 +489,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         )
       end
 
-      describe 'when notification level is changed for another topic' do
+      context 'when notification level is changed for another topic' do
         it 'should not do anything' do
           other_topic
           user
@@ -508,7 +507,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user replies to the topic' do
+      context 'when user replies to the topic' do
         it 'should create the right reply' do
           narrative.input(:reply, user, post: post)
           new_post = Post.last
@@ -520,7 +519,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_change_topic_notification_level)
         end
 
-        describe 'when reply contains the skip trigger' do
+        context 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             post.update!(raw: skip_trigger)
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
@@ -538,7 +537,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user changed the topic notification level' do
+      context 'when user changed the topic notification level' do
         it 'should create the right reply' do
           TopicUser.change(
             user.id,
@@ -557,7 +556,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user cannot create polls' do
+      context 'when user cannot create polls' do
         it 'should create the right reply (polls disabled)' do
           SiteSetting.poll_enabled = false
 
@@ -598,7 +597,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       end
     end
 
-    context 'poll tutorial' do
+    context 'with poll tutorial' do
       before do
         narrative.set_data(user,
           state: :tutorial_poll,
@@ -620,7 +619,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         expect(post.errors[:base].size).to eq(0)
       end
 
-      describe 'when post is not in the right topic' do
+      context 'when post is not in the right topic' do
         it 'should not do anything' do
           other_post
           narrative.expects(:enqueue_timeout_job).with(user).never
@@ -630,7 +629,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user replies to the topic' do
+      context 'when user replies to the topic' do
         it 'should create the right reply' do
           narrative.input(:reply, user, post: post)
           new_post = Post.last
@@ -639,7 +638,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_poll)
         end
 
-        describe 'when reply contains the skip trigger' do
+        context 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             post.update!(raw: skip_trigger)
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
@@ -672,7 +671,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       end
     end
 
-    context "details tutorial" do
+    context "with details tutorial" do
       before do
         narrative.set_data(user,
           state: :tutorial_details,
@@ -681,7 +680,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         )
       end
 
-      describe 'when post is not in the right topic' do
+      context 'when post is not in the right topic' do
         it 'should not do anything' do
           other_post
           narrative.expects(:enqueue_timeout_job).with(user).never
@@ -691,7 +690,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         end
       end
 
-      describe 'when user replies to the topic' do
+      context 'when user replies to the topic' do
         it 'should create the right reply' do
           narrative.input(:reply, user, post: post)
 
@@ -699,7 +698,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_details)
         end
 
-        describe 'when reply contains the skip trigger' do
+        context 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             post.update!(raw: skip_trigger)
 

plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
   end
 
   describe '#select' do
-    context 'in a PM with discobot' do
+    context 'when in a PM with discobot' do
       let(:first_post) { Fabricate(:post, user: discobot_user) }
 
       let(:topic) do
@@ -63,7 +63,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
 
       let(:post) { Fabricate(:post, topic: topic, user: user) }
 
-      context 'during a tutorial track' do
+      context 'while in a tutorial track' do
         before do
           narrative.set_data(user,
             state: :tutorial_formatting,
@@ -146,7 +146,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           end
         end
 
-        describe 'when user thank the bot' do
+        context 'when user thank the bot' do
           it 'should like the post' do
             post.update!(raw: 'thanks!')
 
@@ -176,7 +176,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
               .to eq("tutorial_bookmark")
           end
 
-          describe 'reset trigger in surrounded by quotes' do
+          context 'when reset trigger in surrounded by quotes' do
             it 'should reset the track' do
               post.update!(
                 raw: "'#{described_class.reset_trigger} #{DiscourseNarrativeBot::NewUserNarrative.reset_trigger}'"
@@ -189,8 +189,8 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             end
           end
 
-          describe 'reset trigger in a middle of a sentence' do
-            describe 'when post is less than reset trigger exact match limit' do
+          context 'when reset trigger in a middle of a sentence' do
+            context 'when post is less than reset trigger exact match limit' do
               it 'should reset the track' do
                 post.update!(
                   raw: "I would like to #{described_class.reset_trigger} #{DiscourseNarrativeBot::NewUserNarrative.reset_trigger} now"
@@ -203,7 +203,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
               end
             end
 
-            describe 'when post exceeds reset trigger exact match limit' do
+            context 'when post exceeds reset trigger exact match limit' do
               it 'should not reset the track' do
                 post.update!(
                   raw: "I would like to #{described_class.reset_trigger} #{DiscourseNarrativeBot::NewUserNarrative.reset_trigger} now #{'a' * described_class::RESET_TRIGGER_EXACT_MATCH_LENGTH}"
@@ -233,7 +233,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
         end
       end
 
-      context 'at the end of a tutorial track' do
+      context 'when at the end of a tutorial track' do
         before do
           narrative.set_data(user,
             state: :end,
@@ -242,7 +242,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           )
         end
 
-        context 'generic replies' do
+        context 'with generic replies' do
           after do
             Discourse.redis.del("#{described_class::GENERIC_REPLIES_COUNT_PREFIX}#{user.id}")
           end
@@ -290,7 +290,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             expect(new_post.raw).to eq(random_mention_reply)
           end
 
-          describe 'when asking discobot for help' do
+          context 'when asking discobot for help' do
             it 'should create the right reply' do
               post.update!(raw: 'show me what you can do @discobot display help')
               described_class.new(:reply, user, post_id: post.id).select
@@ -298,7 +298,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
               expect(Post.last.raw).to include(help_message)
             end
 
-            describe 'as an admin or moderator' do
+            context 'as an admin or moderator' do
               it 'should include the commands to start the advanced user track' do
                 user.update!(moderator: true)
                 post.update!(raw: 'Show me what you can do @discobot display help')
@@ -311,7 +311,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
               end
             end
 
-            describe 'as a user that has completed the new user track' do
+            context 'as a user that has completed the new user track' do
               it 'should include the commands to start the advanced user track' do
                 narrative.set_data(user,
                   state: :end,
@@ -335,7 +335,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             end
           end
 
-          describe 'when discobot is asked to roll dice' do
+          context 'when discobot is asked to roll dice' do
             before do
               narrative.set_data(user,
                 state: :end,
@@ -353,7 +353,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
               ))
             end
 
-            describe 'when range of dice request is too high' do
+            context 'when range of dice request is too high' do
               before do
                 srand(1)
               end
@@ -376,7 +376,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
               end
             end
 
-            describe 'when number of dice to roll is too high' do
+            context 'when number of dice to roll is too high' do
               it 'should create the right reply' do
                 post.update!(raw: "roll #{DiscourseNarrativeBot::Dice::MAXIMUM_NUM_OF_DICE + 1}d1")
                 described_class.new(:reply, user, post_id: post.id).select
@@ -392,7 +392,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
               end
             end
 
-            describe 'when dice combination is invalid' do
+            context 'when dice combination is invalid' do
               it 'should create the right reply' do
                 post.update!(raw: "roll 0d1")
                 described_class.new(:reply, user, post_id: post.id).select
@@ -407,7 +407,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
       end
 
       context 'when in a normal PM with discobot' do
-        describe 'when discobot is replied to' do
+        context 'when discobot is replied to' do
           it 'should create the right reply' do
             SiteSetting.discourse_narrative_bot_disable_public_replies = true
             post.update!(raw: 'Show me what you can do @discobot')
@@ -439,16 +439,16 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
       end
     end
 
-    context 'random discobot mentions' do
+    context 'with random discobot mentions' do
       let(:topic) { Fabricate(:topic) }
       let(:post) { Fabricate(:post, topic: topic, user: user) }
 
-      describe 'when discobot public replies are disabled' do
+      context 'when discobot public replies are disabled' do
         before do
           SiteSetting.discourse_narrative_bot_disable_public_replies = true
         end
 
-        describe 'when discobot is mentioned' do
+        context 'when discobot is mentioned' do
           it 'should not reply' do
             post.update!(raw: 'Show me what you can do @discobot')
 
@@ -459,7 +459,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
         end
       end
 
-      describe 'when discobot is mentioned' do
+      context 'when discobot is mentioned' do
         it 'should create the right reply' do
           post.update!(raw: 'Show me what you can do @discobot')
           described_class.new(:reply, user, post_id: post.id).select
@@ -496,7 +496,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           expect(new_post.raw).to eq(random_mention_reply)
         end
 
-        describe 'rate limiting random reply message in public topic' do
+        context 'with rate limiting random reply message in public topic' do
           let(:topic) { Fabricate(:topic) }
           let(:other_post) { Fabricate(:post, raw: '@discobot show me something', topic: topic) }
           let(:post) { Fabricate(:post, topic: topic) }
@@ -505,7 +505,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             Discourse.redis.flushdb
           end
 
-          describe 'when random reply massage has been displayed in the last 6 hours' do
+          context 'when random reply massage has been displayed in the last 6 hours' do
             it 'should not do anything' do
               Discourse.redis.set(
                 "#{described_class::PUBLIC_DISPLAY_BOT_HELP_KEY}:#{other_post.topic_id}",
@@ -522,7 +522,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             end
           end
 
-          describe 'when random reply message has not been displayed in the last 6 hours' do
+          context 'when random reply message has not been displayed in the last 6 hours' do
             it 'should create the right reply' do
               Discourse.redis.set(
                 "#{described_class::PUBLIC_DISPLAY_BOT_HELP_KEY}:#{other_post.topic_id}",
@@ -540,7 +540,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             end
           end
 
-          describe 'when random reply message has been displayed in the last 10 replies' do
+          context 'when random reply message has been displayed in the last 10 replies' do
             it 'should not do anything' do
               described_class.new(:reply, user, post_id: other_post.id).select
               expect(Post.last.raw).to eq(random_mention_reply)
@@ -559,7 +559,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           end
         end
 
-        describe 'when asking discobot for help' do
+        context 'when asking discobot for help' do
           it 'should create the right reply' do
             post.update!(raw: '@discobot display help')
             described_class.new(:reply, user, post_id: post.id).select
@@ -568,8 +568,8 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           end
         end
 
-        describe 'when asking discobot to start new user track' do
-          describe 'invalid text' do
+        context 'when asking discobot to start new user track' do
+          context 'with invalid text' do
             it 'should not trigger the bot' do
               post.update!(raw: "`@discobot #{I18n.t('discourse_narrative_bot.track_selector.reset_trigger')} #{I18n.t(DiscourseNarrativeBot::NewUserNarrative.reset_trigger)}`")
 
@@ -579,7 +579,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           end
         end
 
-        describe 'when discobot is asked to roll dice' do
+        context 'when discobot is asked to roll dice' do
           it 'should create the right reply' do
             post.update!(raw: '@discobot roll 2d1')
             described_class.new(:reply, user, post_id: post.id).select
@@ -591,7 +591,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             ))
           end
 
-          describe 'when dice roll is requested incorrectly' do
+          context 'when dice roll is requested incorrectly' do
             it 'should create the right reply' do
               post.update!(raw: 'roll 2d1 @discobot')
               described_class.new(:reply, user, post_id: post.id).select
@@ -600,7 +600,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             end
           end
 
-          describe 'when roll dice command is present inside a quote' do
+          context 'when roll dice command is present inside a quote' do
             it 'should ignore the command' do
               user
               post.update!(raw: "[quote=\"Donkey, post:6, topic:1\"]\n@discobot roll 2d1\n[/quote]")
@@ -611,7 +611,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           end
         end
 
-        describe 'when a quote is requested' do
+        context 'when a quote is requested' do
           it 'should create the right reply' do
 
             post.update!(raw: "@discobot quote")
@@ -624,7 +624,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             ))
           end
 
-          describe 'when quote is requested incorrectly' do
+          context 'when quote is requested incorrectly' do
             it 'should create the right reply' do
               post.update!(raw: 'quote @discobot')
               described_class.new(:reply, user, post_id: post.id).select
@@ -633,7 +633,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             end
           end
 
-          describe 'when quote command is present inside a onebox or quote' do
+          context 'when quote command is present inside a onebox or quote' do
             it 'should ignore the command' do
               user
               post.update!(raw: "[quote=\"Donkey, post:6, topic:1\"]\n@discobot quote\n[/quote]")
@@ -643,7 +643,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             end
           end
 
-          describe 'when user requesting quote has a preferred locale' do
+          context 'when user requesting quote has a preferred locale' do
             before do
               SiteSetting.allow_user_locale = true
               user.update!(locale: 'it')
@@ -662,7 +662,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           end
         end
 
-        describe 'when magic 8 ball is requested' do
+        context 'when magic 8 ball is requested' do
           before do
             srand(1)
           end
@@ -677,8 +677,8 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
           end
         end
 
-        describe 'when bot is asked to reset/start a track' do
-          describe 'when user likes a post containing a reset trigger' do
+        context 'when bot is asked to reset/start a track' do
+          context 'when user likes a post containing a reset trigger' do
             it 'should not start the track' do
               another_post = Fabricate(:post,
                 user: Fabricate(:user),
@@ -694,7 +694,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
             end
           end
 
-          describe "when new and advanced user triggers overlap" do
+          context "when new and advanced user triggers overlap" do
             before do
               @overrides = []
 
@@ -723,7 +723,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
       end
     end
 
-    context 'pm to self' do
+    context 'when sending pm to self' do
       let(:other_topic) do
         topic_allowed_user = Fabricate.build(:topic_allowed_user, user: user)
         Fabricate(:private_message_topic, topic_allowed_users: [topic_allowed_user])
@@ -731,7 +731,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
 
       let(:other_post) { Fabricate(:post, topic: other_topic) }
 
-      describe 'when a new message is made' do
+      context 'when a new message is made' do
         it 'should not do anything' do
           other_post
 
@@ -741,7 +741,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
       end
     end
 
-    context 'pms to bot' do
+    context 'when sending pms to bot' do
       let(:other_topic) do
         topic_allowed_user = Fabricate.build(:topic_allowed_user, user: user)
         bot = Fabricate.build(:topic_allowed_user, user: discobot_user)
@@ -750,7 +750,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
 
       let(:other_post) { Fabricate(:post, topic: other_topic) }
 
-      describe 'when a new like is made' do
+      context 'when a new like is made' do
         it 'should not do anything' do
           other_post
           expect { described_class.new(:like, user, post_id: other_post.id).select }
@@ -758,7 +758,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
         end
       end
 
-      describe 'when a new message is made' do
+      context 'when a new message is made' do
         it 'should create the right reply' do
           described_class.new(:reply, user, post_id: other_post.id).select
 
@@ -766,7 +766,7 @@ RSpec.describe DiscourseNarrativeBot::TrackSelector do
         end
       end
 
-      describe 'when user thanks the bot' do
+      context 'when user thanks the bot' do
         it 'should like the post' do
           other_post.update!(raw: 'thanks!')
 

plugins/discourse-narrative-bot/spec/jobs/onceoff/remap_old_bot_images_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Jobs::DiscourseNarrativeBot::RemapOldBotImages do
     end
   end
 
-  context 'subfolder' do
+  context 'with subfolder' do
     let!(:post) do
       Fabricate(:post,
         user: ::DiscourseNarrativeBot::Base.new.discobot_user,

plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe "Discobot welcome post" do
     end
   end
 
-  context 'When discourse_narrative_bot_welcome_post_delay is greater than 0' do
+  context 'when discourse_narrative_bot_welcome_post_delay is greater than 0' do
     before do
       SiteSetting.discourse_narrative_bot_welcome_post_delay = 5
     end

plugins/discourse-narrative-bot/spec/user_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe User do
     end
 
     describe 'welcome post' do
-      context 'disabled' do
+      context 'when disabled' do
         before do
           SiteSetting.disable_discourse_narrative_bot_welcome_post = true
         end
@@ -57,7 +57,7 @@ RSpec.describe User do
         end
       end
 
-      context 'enabled' do
+      context 'when enabled' do
         before do
           SiteSetting.disable_discourse_narrative_bot_welcome_post = false
         end