Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
0ae08812
Commit
0ae08812
authored
Dec 22, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix specs
parent
e5eb700d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+4
-2
features/steps/project/issues/award_emoji.rb
features/steps/project/issues/award_emoji.rb
+2
-2
spec/helpers/issues_helper_spec.rb
spec/helpers/issues_helper_spec.rb
+0
-6
No files found.
app/helpers/issues_helper.rb
View file @
0ae08812
...
@@ -97,8 +97,10 @@ module IssuesHelper
...
@@ -97,8 +97,10 @@ module IssuesHelper
def
emoji_icon
(
name
,
unicode
=
nil
)
def
emoji_icon
(
name
,
unicode
=
nil
)
unicode
||=
Emoji
.
emoji_filename
(
name
)
unicode
||=
Emoji
.
emoji_filename
(
name
)
content_tag
:div
,
""
,
class:
"icon emoji-icon emoji-
#{
unicode
}
"
,
content_tag
:div
,
""
,
"data-emoji"
=>
name
,
"data-unicode-name"
=>
unicode
class:
"icon emoji-icon emoji-
#{
unicode
}
"
,
"data-emoji"
=>
name
,
"data-unicode-name"
=>
unicode
end
end
def
emoji_author_list
(
notes
,
current_user
)
def
emoji_author_list
(
notes
,
current_user
)
...
...
features/steps/project/issues/award_emoji.rb
View file @
0ae08812
...
@@ -15,8 +15,8 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
...
@@ -15,8 +15,8 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
end
end
step
'I click to emoji in the picker'
do
step
'I click to emoji in the picker'
do
page
.
within
'.
awards
-menu'
do
page
.
within
'.
emoji
-menu'
do
page
.
first
(
'
img
'
).
click
page
.
first
(
'
.emoji-icon
'
).
click
end
end
end
end
...
...
spec/helpers/issues_helper_spec.rb
View file @
0ae08812
...
@@ -127,12 +127,6 @@ describe IssuesHelper do
...
@@ -127,12 +127,6 @@ describe IssuesHelper do
it
{
is_expected
.
to
eq
(
"!1, !2, or !3"
)
}
it
{
is_expected
.
to
eq
(
"!1, !2, or !3"
)
}
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
describe
"#note_active_class"
do
before
do
before
do
@note
=
create
:note
@note
=
create
:note
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment