diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 12:09:15 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 12:09:15 +0000 |
commit | 0637ba1e6e9024f35b2cbf561d9002ec17350bb3 (patch) | |
tree | 960cebf0e892710c1b40f25e249d04aaf8f9b868 /spec/models | |
parent | 4720b569f0fcbb47e9f1a60e95172ae63b6f065a (diff) | |
download | gitlab-ce-0637ba1e6e9024f35b2cbf561d9002ec17350bb3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/merge_request_spec.rb | 7 | ||||
-rw-r--r-- | spec/models/project_services/youtrack_service_spec.rb | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 36fd5d21e73..14f50ffd689 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -662,13 +662,12 @@ describe MergeRequest do end describe '#raw_diffs' do - let(:merge_request) { build(:merge_request) } let(:options) { { paths: ['a/b', 'b/a', 'c/*'] } } context 'when there are MR diffs' do - it 'delegates to the MR diffs' do - merge_request.merge_request_diff = MergeRequestDiff.new + let(:merge_request) { create(:merge_request, :with_diffs) } + it 'delegates to the MR diffs' do expect(merge_request.merge_request_diff).to receive(:raw_diffs).with(options) merge_request.raw_diffs(options) @@ -676,6 +675,8 @@ describe MergeRequest do end context 'when there are no MR diffs' do + let(:merge_request) { build(:merge_request) } + it 'delegates to the compare object' do merge_request.compare = double(:compare) diff --git a/spec/models/project_services/youtrack_service_spec.rb b/spec/models/project_services/youtrack_service_spec.rb index 0067793f8d8..b8fff635e99 100644 --- a/spec/models/project_services/youtrack_service_spec.rb +++ b/spec/models/project_services/youtrack_service_spec.rb @@ -38,8 +38,8 @@ describe YoutrackService do expect(described_class.reference_pattern.match('YT-123')[:issue]).to eq('YT-123') end - it 'does not allow issue number to be followed by a letter' do - expect(described_class.reference_pattern.match('YT-123A')).to eq(nil) + it 'allows lowercase project key on the reference' do + expect(described_class.reference_pattern.match('yt-123')[:issue]).to eq('yt-123') end end |