Merged r22445, r22449 and r22450 from trunk to 5.0-stable (#39553).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22455 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/acts/mentionable.rb b/lib/redmine/acts/mentionable.rb
index c7b0c065545ea0aa59d75ced5355029b6d4b426b..24adf04b3f5a0c296f53c8e24e0ce5b859ed8af8 100644 (file)
--- a/lib/redmine/acts/mentionable.rb
+++ b/lib/redmine/acts/mentionable.rb
@@ -98,12 +98,10 @@ module Redmine
           @([A-Za-z0-9_\-@\.]*?)
           (?=
             (?=[[:punct:]][^A-Za-z0-9_\/])|
-            ,|
-            \.+$|
             \s|
-            \]|
-            <|
-            $)
+            [[:punct:]]?
+            $
+          )
         /ix
       end
     end

diff --git a/test/unit/lib/redmine/acts/mentionable_test.rb b/test/unit/lib/redmine/acts/mentionable_test.rb
index 91fef8eb2da895f8ae712630d5a4a7cc991c885f..baf505d986c98229fd3ce833cc67b8b5bf0f7376 100644 (file)
--- a/test/unit/lib/redmine/acts/mentionable_test.rb
+++ b/test/unit/lib/redmine/acts/mentionable_test.rb
@@ -29,9 +29,12 @@ class Redmine::Acts::MentionableTest < ActiveSupport::TestCase
          :issues
 
   def test_mentioned_users_with_user_mention
-    issue = Issue.generate!(project_id: 1, description: '@dlopper')
+    to_test = %w(@dlopper @dlopper! @dlopper? @dlopper. @dlopper,)
 
-    assert_equal [User.find(3)], issue.mentioned_users
+    to_test.each do |item|
+      issue = Issue.generate!(project_id: 1, description: item)
+      assert_equal [User.find(3)], issue.mentioned_users
+    end
   end
 
   def test_mentioned_users_with_user_mention_having_mail_as_login