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
Jérome Perrin
gitlab-ce
Commits
e0ecfe5b
Commit
e0ecfe5b
authored
Jul 01, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tests for Position
parent
ebb5f591
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
341 additions
and
0 deletions
+341
-0
spec/lib/gitlab/diff/position_spec.rb
spec/lib/gitlab/diff/position_spec.rb
+341
-0
No files found.
spec/lib/gitlab/diff/position_spec.rb
0 → 100644
View file @
e0ecfe5b
require
'spec_helper'
describe
Gitlab
::
Diff
::
Position
,
lib:
true
do
include
RepoHelpers
let
(
:project
)
{
create
(
:project
)
}
describe
"position for an added file"
do
let
(
:commit
)
{
project
.
commit
(
"2ea1f3dec713d940208fb5ce4a38765ecb5d3f73"
)
}
subject
do
described_class
.
new
(
old_path:
"files/images/wm.svg"
,
new_path:
"files/images/wm.svg"
,
old_line:
nil
,
new_line:
5
,
diff_refs:
commit
.
diff_refs
)
end
describe
"#diff_file"
do
it
"returns the correct diff file"
do
diff_file
=
subject
.
diff_file
(
project
.
repository
)
expect
(
diff_file
.
new_file
).
to
be
true
expect
(
diff_file
.
new_path
).
to
eq
(
subject
.
new_path
)
expect
(
diff_file
.
diff_refs
).
to
eq
(
subject
.
diff_refs
)
end
end
describe
"#diff_line"
do
it
"returns the correct diff line"
do
diff_line
=
subject
.
diff_line
(
project
.
repository
)
expect
(
diff_line
.
added?
).
to
be
true
expect
(
diff_line
.
new_line
).
to
eq
(
subject
.
new_line
)
expect
(
diff_line
.
text
).
to
eq
(
"+ <desc>Created with Sketch.</desc>"
)
end
end
describe
"#line_code"
do
it
"returns the correct line code"
do
line_code
=
Gitlab
::
Diff
::
LineCode
.
generate
(
subject
.
file_path
,
subject
.
new_line
,
0
)
expect
(
subject
.
line_code
(
project
.
repository
)).
to
eq
(
line_code
)
end
end
end
describe
"position for a changed file"
do
let
(
:commit
)
{
project
.
commit
(
"570e7b2abdd848b95f2f578043fc23bd6f6fd24d"
)
}
describe
"position for an added line"
do
subject
do
described_class
.
new
(
old_path:
"files/ruby/popen.rb"
,
new_path:
"files/ruby/popen.rb"
,
old_line:
nil
,
new_line:
14
,
diff_refs:
commit
.
diff_refs
)
end
describe
"#diff_file"
do
it
"returns the correct diff file"
do
diff_file
=
subject
.
diff_file
(
project
.
repository
)
expect
(
diff_file
.
old_path
).
to
eq
(
subject
.
old_path
)
expect
(
diff_file
.
new_path
).
to
eq
(
subject
.
new_path
)
expect
(
diff_file
.
diff_refs
).
to
eq
(
subject
.
diff_refs
)
end
end
describe
"#diff_line"
do
it
"returns the correct diff line"
do
diff_line
=
subject
.
diff_line
(
project
.
repository
)
expect
(
diff_line
.
added?
).
to
be
true
expect
(
diff_line
.
new_line
).
to
eq
(
subject
.
new_line
)
expect
(
diff_line
.
text
).
to
eq
(
"+ vars = {"
)
end
end
describe
"#line_code"
do
it
"returns the correct line code"
do
line_code
=
Gitlab
::
Diff
::
LineCode
.
generate
(
subject
.
file_path
,
subject
.
new_line
,
15
)
expect
(
subject
.
line_code
(
project
.
repository
)).
to
eq
(
line_code
)
end
end
end
describe
"position for an unchanged line"
do
subject
do
described_class
.
new
(
old_path:
"files/ruby/popen.rb"
,
new_path:
"files/ruby/popen.rb"
,
old_line:
16
,
new_line:
22
,
diff_refs:
commit
.
diff_refs
)
end
describe
"#diff_file"
do
it
"returns the correct diff file"
do
diff_file
=
subject
.
diff_file
(
project
.
repository
)
expect
(
diff_file
.
old_path
).
to
eq
(
subject
.
old_path
)
expect
(
diff_file
.
new_path
).
to
eq
(
subject
.
new_path
)
expect
(
diff_file
.
diff_refs
).
to
eq
(
subject
.
diff_refs
)
end
end
describe
"#diff_line"
do
it
"returns the correct diff line"
do
diff_line
=
subject
.
diff_line
(
project
.
repository
)
expect
(
diff_line
.
unchanged?
).
to
be
true
expect
(
diff_line
.
old_line
).
to
eq
(
subject
.
old_line
)
expect
(
diff_line
.
new_line
).
to
eq
(
subject
.
new_line
)
expect
(
diff_line
.
text
).
to
eq
(
" unless File.directory?(path)"
)
end
end
describe
"#line_code"
do
it
"returns the correct line code"
do
line_code
=
Gitlab
::
Diff
::
LineCode
.
generate
(
subject
.
file_path
,
subject
.
new_line
,
subject
.
old_line
)
expect
(
subject
.
line_code
(
project
.
repository
)).
to
eq
(
line_code
)
end
end
end
describe
"position for a removed line"
do
subject
do
described_class
.
new
(
old_path:
"files/ruby/popen.rb"
,
new_path:
"files/ruby/popen.rb"
,
old_line:
14
,
new_line:
nil
,
diff_refs:
commit
.
diff_refs
)
end
describe
"#diff_file"
do
it
"returns the correct diff file"
do
diff_file
=
subject
.
diff_file
(
project
.
repository
)
expect
(
diff_file
.
old_path
).
to
eq
(
subject
.
old_path
)
expect
(
diff_file
.
new_path
).
to
eq
(
subject
.
new_path
)
expect
(
diff_file
.
diff_refs
).
to
eq
(
subject
.
diff_refs
)
end
end
describe
"#diff_line"
do
it
"returns the correct diff line"
do
diff_line
=
subject
.
diff_line
(
project
.
repository
)
expect
(
diff_line
.
removed?
).
to
be
true
expect
(
diff_line
.
old_line
).
to
eq
(
subject
.
old_line
)
expect
(
diff_line
.
text
).
to
eq
(
"- options = { chdir: path }"
)
end
end
describe
"#line_code"
do
it
"returns the correct line code"
do
line_code
=
Gitlab
::
Diff
::
LineCode
.
generate
(
subject
.
file_path
,
13
,
subject
.
old_line
)
expect
(
subject
.
line_code
(
project
.
repository
)).
to
eq
(
line_code
)
end
end
end
end
describe
"position for a renamed file"
do
let
(
:commit
)
{
project
.
commit
(
"6907208d755b60ebeacb2e9dfea74c92c3449a1f"
)
}
describe
"position for an added line"
do
subject
do
described_class
.
new
(
old_path:
"files/js/commit.js.coffee"
,
new_path:
"files/js/commit.coffee"
,
old_line:
nil
,
new_line:
4
,
diff_refs:
commit
.
diff_refs
)
end
describe
"#diff_file"
do
it
"returns the correct diff file"
do
diff_file
=
subject
.
diff_file
(
project
.
repository
)
expect
(
diff_file
.
old_path
).
to
eq
(
subject
.
old_path
)
expect
(
diff_file
.
new_path
).
to
eq
(
subject
.
new_path
)
expect
(
diff_file
.
diff_refs
).
to
eq
(
subject
.
diff_refs
)
end
end
describe
"#diff_line"
do
it
"returns the correct diff line"
do
diff_line
=
subject
.
diff_line
(
project
.
repository
)
expect
(
diff_line
.
added?
).
to
be
true
expect
(
diff_line
.
new_line
).
to
eq
(
subject
.
new_line
)
expect
(
diff_line
.
text
).
to
eq
(
"+ new CommitFile(@)"
)
end
end
describe
"#line_code"
do
it
"returns the correct line code"
do
line_code
=
Gitlab
::
Diff
::
LineCode
.
generate
(
subject
.
file_path
,
subject
.
new_line
,
5
)
expect
(
subject
.
line_code
(
project
.
repository
)).
to
eq
(
line_code
)
end
end
end
describe
"position for an unchanged line"
do
subject
do
described_class
.
new
(
old_path:
"files/js/commit.js.coffee"
,
new_path:
"files/js/commit.coffee"
,
old_line:
3
,
new_line:
3
,
diff_refs:
commit
.
diff_refs
)
end
describe
"#diff_file"
do
it
"returns the correct diff file"
do
diff_file
=
subject
.
diff_file
(
project
.
repository
)
expect
(
diff_file
.
old_path
).
to
eq
(
subject
.
old_path
)
expect
(
diff_file
.
new_path
).
to
eq
(
subject
.
new_path
)
expect
(
diff_file
.
diff_refs
).
to
eq
(
subject
.
diff_refs
)
end
end
describe
"#diff_line"
do
it
"returns the correct diff line"
do
diff_line
=
subject
.
diff_line
(
project
.
repository
)
expect
(
diff_line
.
unchanged?
).
to
be
true
expect
(
diff_line
.
old_line
).
to
eq
(
subject
.
old_line
)
expect
(
diff_line
.
new_line
).
to
eq
(
subject
.
new_line
)
expect
(
diff_line
.
text
).
to
eq
(
" $('.files .diff-file').each ->"
)
end
end
describe
"#line_code"
do
it
"returns the correct line code"
do
line_code
=
Gitlab
::
Diff
::
LineCode
.
generate
(
subject
.
file_path
,
subject
.
new_line
,
subject
.
old_line
)
expect
(
subject
.
line_code
(
project
.
repository
)).
to
eq
(
line_code
)
end
end
end
describe
"position for a removed line"
do
subject
do
described_class
.
new
(
old_path:
"files/js/commit.js.coffee"
,
new_path:
"files/js/commit.coffee"
,
old_line:
4
,
new_line:
nil
,
diff_refs:
commit
.
diff_refs
)
end
describe
"#diff_file"
do
it
"returns the correct diff file"
do
diff_file
=
subject
.
diff_file
(
project
.
repository
)
expect
(
diff_file
.
old_path
).
to
eq
(
subject
.
old_path
)
expect
(
diff_file
.
new_path
).
to
eq
(
subject
.
new_path
)
expect
(
diff_file
.
diff_refs
).
to
eq
(
subject
.
diff_refs
)
end
end
describe
"#diff_line"
do
it
"returns the correct diff line"
do
diff_line
=
subject
.
diff_line
(
project
.
repository
)
expect
(
diff_line
.
removed?
).
to
be
true
expect
(
diff_line
.
old_line
).
to
eq
(
subject
.
old_line
)
expect
(
diff_line
.
text
).
to
eq
(
"- new CommitFile(this)"
)
end
end
describe
"#line_code"
do
it
"returns the correct line code"
do
line_code
=
Gitlab
::
Diff
::
LineCode
.
generate
(
subject
.
file_path
,
4
,
subject
.
old_line
)
expect
(
subject
.
line_code
(
project
.
repository
)).
to
eq
(
line_code
)
end
end
end
end
describe
"position for a deleted file"
do
let
(
:commit
)
{
project
.
commit
(
"8634272bfad4cf321067c3e94d64d5a253f8321d"
)
}
subject
do
described_class
.
new
(
old_path:
"LICENSE"
,
new_path:
"LICENSE"
,
old_line:
3
,
new_line:
nil
,
diff_refs:
commit
.
diff_refs
)
end
describe
"#diff_file"
do
it
"returns the correct diff file"
do
diff_file
=
subject
.
diff_file
(
project
.
repository
)
expect
(
diff_file
.
deleted_file
).
to
be
true
expect
(
diff_file
.
old_path
).
to
eq
(
subject
.
old_path
)
expect
(
diff_file
.
diff_refs
).
to
eq
(
subject
.
diff_refs
)
end
end
describe
"#diff_line"
do
it
"returns the correct diff line"
do
diff_line
=
subject
.
diff_line
(
project
.
repository
)
expect
(
diff_line
.
removed?
).
to
be
true
expect
(
diff_line
.
old_line
).
to
eq
(
subject
.
old_line
)
expect
(
diff_line
.
text
).
to
eq
(
"-Copyright (c) 2014 gitlabhq"
)
end
end
describe
"#line_code"
do
it
"returns the correct line code"
do
line_code
=
Gitlab
::
Diff
::
LineCode
.
generate
(
subject
.
file_path
,
0
,
subject
.
old_line
)
expect
(
subject
.
line_code
(
project
.
repository
)).
to
eq
(
line_code
)
end
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