diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/models/timelog_spec.rb | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
| download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/models/timelog_spec.rb')
| -rw-r--r-- | spec/models/timelog_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/models/timelog_spec.rb b/spec/models/timelog_spec.rb index ae1697fb7e6..e9019b55635 100644 --- a/spec/models/timelog_spec.rb +++ b/spec/models/timelog_spec.rb @@ -40,6 +40,14 @@ RSpec.describe Timelog do expect(subject).to be_valid end + + describe 'when importing' do + it 'is valid if issue_id and merge_request_id are missing' do + subject.attributes = { issue: nil, merge_request: nil, importing: true } + + expect(subject).to be_valid + end + end end describe 'scopes' do |