summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-11-19 07:00:49 +0000
committerMike Greiling <mike@pixelcog.com>2018-11-19 07:00:49 +0000
commit8dd89f03061aa646bcda5055fa96376fb9e30759 (patch)
treefbb2d8dd32bbfc6434087a4095518c74aac5ac6d /spec
parent4693cebbec08d35393784afbb292315fd4d4cbee (diff)
parent59e5bad1292e21b84da0687b261eb0d2de25b3f1 (diff)
downloadgitlab-ce-8dd89f03061aa646bcda5055fa96376fb9e30759.tar.gz
Merge branch 'fix-not-render-emoji' into 'master'
Fix not render emoji in filter dropdown See merge request gitlab-org/gitlab-ce!23112
Diffstat (limited to 'spec')
-rw-r--r--spec/features/issues/filtered_search/dropdown_emoji_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
index c42fcd92a36..97dd0afd002 100644
--- a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
@@ -20,7 +20,7 @@ describe 'Dropdown emoji', :js do
end
def dropdown_emoji_size
- page.all('#js-dropdown-my-reaction .filter-dropdown .filter-dropdown-item').size
+ all('gl-emoji[data-name]').size
end
def click_emoji(text)