From e021604454f1093b7d762b28eae36e30083f0053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 9 Aug 2016 22:47:29 +0200 Subject: Don't extract slash commands inside blockcode, blockquote or HTML tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Improve slash command descriptions, support /due tomorrow Signed-off-by: Rémy Coutable --- spec/lib/gitlab/slash_commands/extractor_spec.rb | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'spec/lib/gitlab/slash_commands') diff --git a/spec/lib/gitlab/slash_commands/extractor_spec.rb b/spec/lib/gitlab/slash_commands/extractor_spec.rb index fd1b30052ed..11836b10204 100644 --- a/spec/lib/gitlab/slash_commands/extractor_spec.rb +++ b/spec/lib/gitlab/slash_commands/extractor_spec.rb @@ -173,5 +173,32 @@ describe Gitlab::SlashCommands::Extractor do expect(commands).to be_empty expect(msg).to eq 'Fixes #123' end + + it 'does not extract commands inside a blockcode' do + msg = msg = "Hello\r\n```\r\nThis is some text\r\n/close\r\n/assign @user\r\n```\r\n\r\nWorld" + expected = msg.delete("\r") + commands = extractor.extract_commands!(msg) + + expect(commands).to be_empty + expect(msg).to eq expected + end + + it 'does not extract commands inside a blockquote' do + msg = "Hello\r\n>>>\r\nThis is some text\r\n/close\r\n/assign @user\r\n>>>\r\n\r\nWorld" + expected = msg.delete("\r") + commands = extractor.extract_commands!(msg) + + expect(commands).to be_empty + expect(msg).to eq expected + end + + it 'does not extract commands inside a HTML tag' do + msg = msg = "Hello\r\n
\r\nThis is some text\r\n/close\r\n/assign @user\r\n
\r\n\r\nWorld" + expected = msg.delete("\r") + commands = extractor.extract_commands!(msg) + + expect(commands).to be_empty + expect(msg).to eq expected + end end end -- cgit v1.2.3