Commit ee9849b7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve mr refresh service tests

parent 7eeec5e4
...@@ -47,10 +47,10 @@ describe MergeRequests::RefreshService do ...@@ -47,10 +47,10 @@ describe MergeRequests::RefreshService do
reload_mrs reload_mrs
end 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 { @merge_request.should be_merged }
it { @fork_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 end
context 'push to fork repo source branch' do context 'push to fork repo source branch' do
...@@ -61,7 +61,7 @@ describe MergeRequests::RefreshService do ...@@ -61,7 +61,7 @@ describe MergeRequests::RefreshService do
it { @merge_request.notes.should be_empty } it { @merge_request.notes.should be_empty }
it { @merge_request.should be_open } 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 } it { @fork_merge_request.should be_open }
end end
...@@ -84,7 +84,7 @@ describe MergeRequests::RefreshService do ...@@ -84,7 +84,7 @@ describe MergeRequests::RefreshService do
reload_mrs reload_mrs
end 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 { @merge_request.should be_merged }
it { @fork_merge_request.should be_open } it { @fork_merge_request.should be_open }
it { @fork_merge_request.notes.should be_empty } it { @fork_merge_request.notes.should be_empty }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment