summaryrefslogtreecommitdiff
path: root/spec/models/concerns
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-24 10:10:10 -0500
committerDouwe Maan <douwe@selenight.nl>2017-05-24 10:10:10 -0500
commit0bf339f0ed2f91a805e99fc7483572ad7d22093a (patch)
treef536be0bb67775cabcc99b7540bcfd7a108bebcf /spec/models/concerns
parent6e698b254ecddf23a866d9e98a885912102ccbce (diff)
downloadgitlab-ce-0bf339f0ed2f91a805e99fc7483572ad7d22093a.tar.gz
Address review
Diffstat (limited to 'spec/models/concerns')
-rw-r--r--spec/models/concerns/discussion_on_diff_spec.rb26
1 files changed, 26 insertions, 0 deletions
diff --git a/spec/models/concerns/discussion_on_diff_spec.rb b/spec/models/concerns/discussion_on_diff_spec.rb
index 8571e85627c..f3e148f95f0 100644
--- a/spec/models/concerns/discussion_on_diff_spec.rb
+++ b/spec/models/concerns/discussion_on_diff_spec.rb
@@ -21,4 +21,30 @@ describe DiscussionOnDiff, model: true do
end
end
end
+
+ describe '#line_code_in_diffs' do
+ context 'when the discussion is active in the diff' do
+ let(:diff_refs) { subject.position.diff_refs }
+
+ it 'returns the current line code' do
+ expect(subject.line_code_in_diffs(diff_refs)).to eq(subject.line_code)
+ end
+ end
+
+ context 'when the discussion was created in the diff' do
+ let(:diff_refs) { subject.original_position.diff_refs }
+
+ it 'returns the original line code' do
+ expect(subject.line_code_in_diffs(diff_refs)).to eq(subject.original_line_code)
+ end
+ end
+
+ context 'when the discussion is unrelated to the diff' do
+ let(:diff_refs) { subject.project.commit(RepoHelpers.sample_commit.id).diff_refs }
+
+ it 'returns nil' do
+ expect(subject.line_code_in_diffs(diff_refs)).to be_nil
+ end
+ end
+ end
end