diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 15:09:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 15:09:15 +0300 |
commit | 0637ba1e6e9024f35b2cbf561d9002ec17350bb3 (patch) | |
tree | 960cebf0e892710c1b40f25e249d04aaf8f9b868 /spec/lib/gitlab/import_export/merge_request_parser_spec.rb | |
parent | 4720b569f0fcbb47e9f1a60e95172ae63b6f065a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/import_export/merge_request_parser_spec.rb')
-rw-r--r-- | spec/lib/gitlab/import_export/merge_request_parser_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/import_export/merge_request_parser_spec.rb b/spec/lib/gitlab/import_export/merge_request_parser_spec.rb index ab834ac3fa8..0cdb3c43992 100644 --- a/spec/lib/gitlab/import_export/merge_request_parser_spec.rb +++ b/spec/lib/gitlab/import_export/merge_request_parser_spec.rb @@ -52,10 +52,10 @@ describe Gitlab::ImportExport::MergeRequestParser do context 'when the diff is invalid' do let(:merge_request_diff) { build(:merge_request_diff, merge_request: merge_request, base_commit_sha: 'foobar') } - it 'sets the diff to nil' do + it 'sets the diff to empty diff' do expect(merge_request_diff).to be_invalid expect(merge_request_diff.merge_request).to eq merge_request - expect(parsed_merge_request.merge_request_diff).to be_nil + expect(parsed_merge_request.merge_request_diff).to be_empty end end end |