diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-03-17 13:25:52 -0600 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
commit | 79889a6aa3dc878d196d0f2f445ab6b10ef10c74 (patch) | |
tree | 25367a69b4a529335e106d0d65c2d9a38e97f092 /app/models/discussion.rb | |
parent | 80b2e18fb62b8da7410f90b3e5340b9e63e765a3 (diff) | |
download | gitlab-ce-79889a6aa3dc878d196d0f2f445ab6b10ef10c74.tar.gz |
Add specs
Diffstat (limited to 'app/models/discussion.rb')
-rw-r--r-- | app/models/discussion.rb | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 8ab9031e42c..6e97a4862ed 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -1,7 +1,7 @@ class Discussion MEMOIZED_VALUES = [] # rubocop:disable Style/MutableConstant - attr_reader :notes + attr_reader :notes, :noteable delegate :created_at, :project, @@ -61,6 +61,13 @@ class Discussion @noteable = noteable end + def ==(other) + other.class == self.class && + other.noteable == self.noteable && + other.id == self.id && + other.notes == self.notes + end + def last_updated_at last_note.created_at end @@ -83,7 +90,7 @@ class Discussion false end - def render_as_individual_notes? + def individual_note? false end @@ -91,8 +98,9 @@ class Discussion notes.length == 1 end + # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? - first_note.for_merge_request? + for_merge_request? end def resolvable? @@ -162,12 +170,7 @@ class Discussion end def collapsed? - if resolvable? - # New diff discussions only disappear once they are marked resolved - resolved? - else - false - end + resolved? end def expanded? |