Merge pull request #4931 from jjaffeux/fixes-woman-shrugging-conversion

Fixes woman_shrugging name conversion
discourse · Jun 15, 2017 · 8f48c20 · 8f48c20
2 parents b70d4da + f1750be
commit 8f48c20
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 1 deletion.
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
@@ -829,7 +829,7 @@
       "name": "woman_facepalming"
     },
     {
-      "code": "1f937",
+      "code": "1f937-200d-2640-fe0f",
       "name": "woman_shrugging"
     },
     {

diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
@@ -1753,6 +1753,7 @@ EMOJI_KEYWORDS_PATCH ||= {
   "walking_woman" => { "fitzpatrick_scale" => true },
   "woman_facepalming" => { "fitzpatrick_scale" => true },
   "bowing_woman" => { "fitzpatrick_scale" => true },
+  "woman_shrugging" => { "char" => "🤷‍♀️" },
   "man_shrugging" => { "fitzpatrick_scale" => true },
   "tipping_hand_man" => { "fitzpatrick_scale" => true },
   "no_good_man" => { "fitzpatrick_scale" => true },

diff --git a/public/images/emoji/twitter/woman_shrugging/2.png b/public/images/emoji/twitter/woman_shrugging/2.png
diff --git a/public/images/emoji/twitter/woman_shrugging/3.png b/public/images/emoji/twitter/woman_shrugging/3.png
diff --git a/public/images/emoji/twitter/woman_shrugging/4.png b/public/images/emoji/twitter/woman_shrugging/4.png
diff --git a/public/images/emoji/twitter/woman_shrugging/5.png b/public/images/emoji/twitter/woman_shrugging/5.png
diff --git a/public/images/emoji/twitter/woman_shrugging/6.png b/public/images/emoji/twitter/woman_shrugging/6.png
diff --git a/public/images/emoji/win10/woman_shrugging.png b/public/images/emoji/win10/woman_shrugging.png
diff --git a/public/images/emoji/win10/woman_shrugging/2.png b/public/images/emoji/win10/woman_shrugging/2.png
diff --git a/public/images/emoji/win10/woman_shrugging/3.png b/public/images/emoji/win10/woman_shrugging/3.png
diff --git a/public/images/emoji/win10/woman_shrugging/4.png b/public/images/emoji/win10/woman_shrugging/4.png
diff --git a/public/images/emoji/win10/woman_shrugging/5.png b/public/images/emoji/win10/woman_shrugging/5.png
diff --git a/public/images/emoji/win10/woman_shrugging/6.png b/public/images/emoji/win10/woman_shrugging/6.png
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
@@ -458,6 +458,7 @@ def strip_image_wrapping(html)
       expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/emoji_one/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
       expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/emoji_one/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
       expect(PrettyText.cook("hello 👩🏾‍🎓")).to eq("<p>hello <img src=\"/images/emoji/emoji_one/woman_student/5.png?v=5\" title=\":woman_student:t5:\" class=\"emoji\" alt=\":woman_student:t5:\"></p>")
+      expect(PrettyText.cook("hello 🤷‍♀️")).to eq("<p>hello <img src=\"/images/emoji/emoji_one/woman_shrugging.png?v=5\" title=\":woman_shrugging:\" class=\"emoji\" alt=\":woman_shrugging:\"></p>")
     end
   end