Refactor `Todo#target`

parent 2a8858ca
...@@ -61,14 +61,10 @@ class Todo < ActiveRecord::Base ...@@ -61,14 +61,10 @@ class Todo < ActiveRecord::Base
# override to return commits, which are not active record # override to return commits, which are not active record
def target def target
if for_commit? if for_commit?
project.commit(commit_id) project.commit(commit_id) rescue nil
else else
super super
end end
# Temp fix to prevent app crash
# if note commit id doesn't exist
rescue
nil
end end
def target_reference def target_reference
......
...@@ -99,13 +99,23 @@ describe Todo, models: true do ...@@ -99,13 +99,23 @@ describe Todo, models: true do
end end
describe '#target' do describe '#target' do
it 'returns an instance of Commit for commits' do context 'for commits' do
subject.project = project it 'returns an instance of Commit when exists' do
subject.target_type = 'Commit' subject.project = project
subject.commit_id = commit.id subject.target_type = 'Commit'
subject.commit_id = commit.id
expect(subject.target).to be_a(Commit)
expect(subject.target).to eq commit expect(subject.target).to be_a(Commit)
expect(subject.target).to eq commit
end
it 'returns nil when does not exists' do
subject.project = project
subject.target_type = 'Commit'
subject.commit_id = 'xxxx'
expect(subject.target).to be_nil
end
end end
it 'returns the issuable for issuables' do it 'returns the issuable for issuables' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment