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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d6dda952
Commit
d6dda952
authored
Mar 11, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests for emojione
parent
d2d709a2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
CHANGELOG
CHANGELOG
+2
-0
spec/helpers/gitlab_markdown_helper_spec.rb
spec/helpers/gitlab_markdown_helper_spec.rb
+3
-3
No files found.
CHANGELOG
View file @
d6dda952
...
@@ -52,6 +52,8 @@ v 7.9.0 (unreleased)
...
@@ -52,6 +52,8 @@ v 7.9.0 (unreleased)
- Starred projects page at dashboard
- Starred projects page at dashboard
- Make email display name configurable
- Make email display name configurable
- Improve json validation in hook data
- Improve json validation in hook data
- Use Emoji One
v 7.8.4
v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers
- Fix issue_tracker_id substitution in custom issue trackers
- Fix path and name duplication in namespaces
- Fix path and name duplication in namespaces
...
...
spec/helpers/gitlab_markdown_helper_spec.rb
View file @
d6dda952
...
@@ -664,19 +664,19 @@ describe GitlabMarkdownHelper do
...
@@ -664,19 +664,19 @@ describe GitlabMarkdownHelper do
it
"should generate absolute urls for emoji"
do
it
"should generate absolute urls for emoji"
do
expect
(
markdown
(
':smile:'
)).
to
(
expect
(
markdown
(
':smile:'
)).
to
(
include
(
%(src="#{Gitlab.config.gitlab.url}/assets/emoji/
smile
.png)
)
include
(
%(src="#{Gitlab.config.gitlab.url}/assets/emoji/
#{Emoji.emoji_filename('smile')}
.png)
)
)
)
end
end
it
"should generate absolute urls for emoji if relative url is present"
do
it
"should generate absolute urls for emoji if relative url is present"
do
allow
(
Gitlab
.
config
.
gitlab
).
to
receive
(
:url
).
and_return
(
'http://localhost/gitlab/root'
)
allow
(
Gitlab
.
config
.
gitlab
).
to
receive
(
:url
).
and_return
(
'http://localhost/gitlab/root'
)
expect
(
markdown
(
":smile:"
)).
to
include
(
"src=
\"
http://localhost/gitlab/root/assets/emoji/
smile
.png"
)
expect
(
markdown
(
":smile:"
)).
to
include
(
"src=
\"
http://localhost/gitlab/root/assets/emoji/
#{
Emoji
.
emoji_filename
(
'smile'
)
}
.png"
)
end
end
it
"should generate absolute urls for emoji if asset_host is present"
do
it
"should generate absolute urls for emoji if asset_host is present"
do
allow
(
Gitlab
::
Application
.
config
).
to
receive
(
:asset_host
).
and_return
(
"https://cdn.example.com"
)
allow
(
Gitlab
::
Application
.
config
).
to
receive
(
:asset_host
).
and_return
(
"https://cdn.example.com"
)
ActionView
::
Base
.
any_instance
.
stub_chain
(
:config
,
:asset_host
).
and_return
(
"https://cdn.example.com"
)
ActionView
::
Base
.
any_instance
.
stub_chain
(
:config
,
:asset_host
).
and_return
(
"https://cdn.example.com"
)
expect
(
markdown
(
":smile:"
)).
to
include
(
"src=
\"
https://cdn.example.com/assets/emoji/
smile
.png"
)
expect
(
markdown
(
":smile:"
)).
to
include
(
"src=
\"
https://cdn.example.com/assets/emoji/
#{
Emoji
.
emoji_filename
(
'smile'
)
}
.png"
)
end
end
...
...
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