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
Boxiang Sun
gitlab-ce
Commits
ab8ef17f
Commit
ab8ef17f
authored
Oct 17, 2016
by
Grzegorz Bizon
Committed by
Annabel Dunstone Gray
Oct 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extend merge request tests for all commits method
parent
d5b1d0ea
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
20 deletions
+45
-20
app/models/merge_request.rb
app/models/merge_request.rb
+4
-3
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+41
-17
No files found.
app/models/merge_request.rb
View file @
ab8ef17f
...
@@ -798,7 +798,8 @@ class MergeRequest < ActiveRecord::Base
...
@@ -798,7 +798,8 @@ class MergeRequest < ActiveRecord::Base
if
persisted?
if
persisted?
merge_request_diffs
.
flat_map
(
&
:commits_sha
).
uniq
merge_request_diffs
.
flat_map
(
&
:commits_sha
).
uniq
else
else
compare_commits
.
reverse
.
map
(
&
:id
)
cached_commits
=
compare_commits
.
to_a
.
reverse
.
map
(
&
:id
)
cached_commits
.
any?
?
cached_commits
:
[
diff_head_sha
]
end
end
end
end
...
...
spec/models/merge_request_spec.rb
View file @
ab8ef17f
...
@@ -640,6 +640,7 @@ describe MergeRequest, models: true do
...
@@ -640,6 +640,7 @@ describe MergeRequest, models: true do
end
end
describe
'#all_commits_sha'
do
describe
'#all_commits_sha'
do
context
'when merge request is persisted'
do
let
(
:all_commits_sha
)
do
let
(
:all_commits_sha
)
do
subject
.
merge_request_diffs
.
flat_map
(
&
:commits
).
map
(
&
:sha
).
uniq
subject
.
merge_request_diffs
.
flat_map
(
&
:commits
).
map
(
&
:sha
).
uniq
end
end
...
@@ -669,6 +670,29 @@ describe MergeRequest, models: true do
...
@@ -669,6 +670,29 @@ describe MergeRequest, models: true do
end
end
end
end
context
'when merge request is not persisted'
do
context
'when compare commits are set in the service'
do
let
(
:commit
)
{
spy
(
'commit'
)
}
subject
do
build
(
:merge_request
,
compare_commits:
[
commit
,
commit
])
end
it
'returns commits from compare commits temporary data'
do
expect
(
subject
.
all_commits_sha
).
to
eq
[
commit
,
commit
]
end
end
context
'when compare commits are not set in the service'
do
subject
{
build
(
:merge_request
)
}
it
'returns array with diff head sha element only'
do
expect
(
subject
.
all_commits_sha
).
to
eq
[
subject
.
diff_head_sha
]
end
end
end
end
describe
'#participants'
do
describe
'#participants'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
...
...
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