diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-05-03 17:28:00 -0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-05-07 14:09:47 -0300 |
commit | 3063225ca289e87c3f590e1722451a1c674e2ac9 (patch) | |
tree | ec42bcdecce8c3064c61e606da059a019e2a95c2 /spec/models/merge_request_spec.rb | |
parent | e8b116ab94828b1354cf50934f49f37f3b012da2 (diff) | |
download | gitlab-ce-3063225ca289e87c3f590e1722451a1c674e2ac9.tar.gz |
Display merge commit SHA in merge widget after merge
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r-- | spec/models/merge_request_spec.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 5a9aa7c7d1b..04379e7d2c3 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1069,6 +1069,22 @@ describe MergeRequest do end end + describe '#short_merge_commit_sha' do + let(:merge_request) { build_stubbed(:merge_request) } + + it 'returns short id when there is a merge_commit_sha' do + merge_request.merge_commit_sha = 'f7ce827c314c9340b075657fd61c789fb01cf74d' + + expect(merge_request.short_merge_commit_sha).to eq('f7ce827c') + end + + it 'returns nil when there is no merge_commit_sha' do + merge_request.merge_commit_sha = nil + + expect(merge_request.short_merge_commit_sha).to be_nil + end + end + describe '#can_be_reverted?' do context 'when there is no merge_commit for the MR' do before do |