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
fa0cbb13
Commit
fa0cbb13
authored
Jan 30, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs and add a new one
parent
677b4db9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
spec/helpers/diff_helper_spec.rb
spec/helpers/diff_helper_spec.rb
+13
-4
No files found.
spec/helpers/diff_helper_spec.rb
View file @
fa0cbb13
...
...
@@ -104,8 +104,7 @@ describe DiffHelper do
end
end
describe
'diff_line_content'
do
describe
'#diff_line_content'
do
it
'should return non breaking space when line is empty'
do
expect
(
diff_line_content
(
nil
)).
to
eq
(
' '
)
end
...
...
@@ -116,9 +115,19 @@ describe DiffHelper do
expect
(
diff_line_content
(
diff_file
.
diff_lines
.
first
.
type
)).
to
eq
(
'match'
)
expect
(
diff_file
.
diff_lines
.
first
.
new_pos
).
to
eq
(
6
)
end
end
describe
"#mark_inline_diffs"
do
let
(
:old_line
)
{
%{abc 'def'}
}
let
(
:new_line
)
{
%{abc "def"}
}
it
"returns strings with marked inline diffs"
do
marked_old_line
,
marked_new_line
=
mark_inline_diffs
(
old_line
,
new_line
)
it
'should return safe HTML'
do
expect
(
diff_line_content
(
diff_file
.
diff_lines
.
first
.
text
)).
to
be_html_safe
expect
(
marked_old_line
).
to
eq
(
"abc <span class='idiff left right'>'def'</span>"
)
expect
(
marked_old_line
).
to
be_html_safe
expect
(
marked_new_line
).
to
eq
(
"abc <span class='idiff left right'>"def"</span>"
)
expect
(
marked_new_line
).
to
be_html_safe
end
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