diff options
author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-10-03 13:11:16 +0100 |
---|---|---|
committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-10-11 16:33:06 +0100 |
commit | c90483406ecc2717076391737ff57167b5a03393 (patch) | |
tree | e63d729dc90a5b92f33df208c3aaa49058b7c780 /spec/services/merge_requests/refresh_service_spec.rb | |
parent | ff076d88df70a70f6534faefefdca92b059318bf (diff) | |
download | gitlab-ce-c90483406ecc2717076391737ff57167b5a03393.tar.gz |
refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-merged
Diffstat (limited to 'spec/services/merge_requests/refresh_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index 59d3912018a..5b4e4908add 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -118,7 +118,7 @@ describe MergeRequests::RefreshService, services: true do it { expect(@merge_request.notes).to be_empty } it { expect(@merge_request).to be_open } - it { expect(@fork_merge_request.notes.last.note).to include('Added 4 commits') } + it { expect(@fork_merge_request.notes.last.note).to include('Added 28 commits') } it { expect(@fork_merge_request).to be_open } it { expect(@build_failed_todo).to be_pending } it { expect(@fork_build_failed_todo).to be_pending } @@ -169,7 +169,7 @@ describe MergeRequests::RefreshService, services: true do notes = @fork_merge_request.notes.reorder(:created_at).map(&:note) expect(notes[0]).to include('Restored source branch `master`') - expect(notes[1]).to include('Added 4 commits') + expect(notes[1]).to include('Added 28 commits') expect(@fork_merge_request).to be_open end end |