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
ee9849b7
Commit
ee9849b7
authored
Jan 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve mr refresh service tests
parent
7eeec5e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
spec/services/merge_requests/refresh_service_spec.rb
spec/services/merge_requests/refresh_service_spec.rb
+4
-4
No files found.
spec/services/merge_requests/refresh_service_spec.rb
View file @
ee9849b7
...
...
@@ -47,10 +47,10 @@ describe MergeRequests::RefreshService do
reload_mrs
end
it
{
@merge_request
.
notes
.
should
be_empty
}
it
{
@merge_request
.
notes
.
last
.
note
.
should
include
(
'changed to merged'
)
}
it
{
@merge_request
.
should
be_merged
}
it
{
@fork_merge_request
.
should
be_merged
}
it
{
@fork_merge_request
.
notes
.
should
be_empty
}
it
{
@fork_merge_request
.
notes
.
last
.
note
.
should
include
(
'changed to merged'
)
}
end
context
'push to fork repo source branch'
do
...
...
@@ -61,7 +61,7 @@ describe MergeRequests::RefreshService do
it
{
@merge_request
.
notes
.
should
be_empty
}
it
{
@merge_request
.
should
be_open
}
it
{
@fork_merge_request
.
notes
.
should_not
be_empty
}
it
{
@fork_merge_request
.
notes
.
last
.
note
.
should
include
(
'new commit'
)
}
it
{
@fork_merge_request
.
should
be_open
}
end
...
...
@@ -84,7 +84,7 @@ describe MergeRequests::RefreshService do
reload_mrs
end
it
{
@merge_request
.
notes
.
should
be_empty
}
it
{
@merge_request
.
notes
.
last
.
note
.
should
include
(
'changed to merged'
)
}
it
{
@merge_request
.
should
be_merged
}
it
{
@fork_merge_request
.
should
be_open
}
it
{
@fork_merge_request
.
notes
.
should
be_empty
}
...
...
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