Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/mentor/discussion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ def finished_for_mentor? = %i[mentor_finished finished student_timed_out mentor_
def timed_out? = %i[student_timed_out mentor_timed_out].include?(status)

def viewable_by?(user)
return true if user.admin?
return true if user&.admin?

[mentor, student].include?(user)
end

def viewable_by_mentor?(user)
return true if user.admin?
return true if user&.admin?

user == mentor
end
Expand Down
6 changes: 6 additions & 0 deletions test/models/mentor/discussion_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ class Mentor::DiscussionTest < ActiveSupport::TestCase
refute discussion.viewable_by?(user)
end

test "#viewable_by? returns false if user is nil" do
discussion = create :mentor_discussion

refute discussion.viewable_by?(nil)
end

test "finished?" do
skip # TODO: Can this be deleted?
discussion = create :mentor_discussion
Expand Down
Loading