diff options
| author | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-16 14:18:07 +0300 |
|---|---|---|
| committer | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-16 14:18:07 +0300 |
| commit | 919c0c7ba7369970bf57e9388333af120b74203d (patch) | |
| tree | cb6eaa5abf89af56821682bfc7761cc82a614441 /spec/models/repository_spec.rb | |
| parent | ae5e806f128e8e737948f4286da92526c74c316e (diff) | |
Extended UTs for the new cherry-pick message format
Diffstat (limited to 'spec/models/repository_spec.rb')
| -rw-r--r-- | spec/models/repository_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 4926d5d6c49..c407799e47e 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1344,8 +1344,11 @@ describe Repository, models: true do it 'cherry-picks the changes' do expect(repository.blob_at_branch('improve/awesome', 'foo/bar/.gitkeep')).to be_nil - repository.cherry_pick(user, pickable_merge, 'improve/awesome') + cherry_pick_commit_sha = repository.cherry_pick(user, pickable_merge, 'improve/awesome') + cherry_pick_commit_message = project.commit(cherry_pick_commit_sha).message + expect(repository.blob_at_branch('improve/awesome', 'foo/bar/.gitkeep')).not_to be_nil + expect(cherry_pick_commit_message).to include('cherry picked from') end end end |