diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 11:01:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 11:01:49 +0000 |
| commit | 37120872e6f627f083419fd553bc2af1ec8f469d (patch) | |
| tree | a1d5d4233be6e4ffd57ab27a43c158a8e164e9e2 /spec | |
| parent | e68ae9c6afd01efcaea228bd7f0b562ec695731a (diff) | |
| parent | 44d8714f38cd09c0a11837531c003b16a121bd0c (diff) | |
| download | gitlab-ce-37120872e6f627f083419fd553bc2af1ec8f469d.tar.gz | |
Merge branch 'improve_emoji_picker' into 'master'
Improve emoji picker
This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well.
Some categories are pretty poor, it can be extended in the future.
It's a first step on the way to improve picker.
The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution.
See merge request !2172
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/helpers/issues_helper_spec.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb index 1f2c4ee77b5..04e795025d2 100644 --- a/spec/helpers/issues_helper_spec.rb +++ b/spec/helpers/issues_helper_spec.rb @@ -127,18 +127,6 @@ describe IssuesHelper do it { is_expected.to eq("!1, !2, or !3") } end - describe "#url_to_emoji" do - it "returns url" do - expect(url_to_emoji("smile")).to include("emoji/1F604.png") - end - end - - describe "#emoji_list" do - it "returns url" do - expect(emoji_list).to be_kind_of(Array) - end - end - describe "#note_active_class" do before do @note = create :note |