Commit 65bcd141 authored by micael.bergeron's avatar micael.bergeron

add controller spec

also fix some code styling issues
parent 4130552b
...@@ -338,7 +338,7 @@ module Issuable ...@@ -338,7 +338,7 @@ module Issuable
## ##
# Override in issuable specialization # Override in issuable specialization
# #
def first_contribution?(*) def first_contribution?
false false
end end
end end
...@@ -960,8 +960,9 @@ class MergeRequest < ActiveRecord::Base ...@@ -960,8 +960,9 @@ class MergeRequest < ActiveRecord::Base
Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache
end end
def first_contribution?(*) def first_contribution?
return false if project.team.max_member_access(author_id) > Gitlab::Access::GUEST return false if project.team.max_member_access(author_id) > Gitlab::Access::GUEST
project.merge_requests.merged.where(author_id: author_id).empty? project.merge_requests.merged.where(author_id: author_id).empty?
end end
......
...@@ -233,13 +233,10 @@ class Note < ActiveRecord::Base ...@@ -233,13 +233,10 @@ class Note < ActiveRecord::Base
self.class.has_special_role?(role, self) self.class.has_special_role?(role, self)
end end
def specialize!(role)
self.special_role = role if !block_given? || yield(self)
end
def specialize_for_first_contribution!(noteable) def specialize_for_first_contribution!(noteable)
return unless noteable.author_id == self.author_id return unless noteable.author_id == self.author_id
specialize!(Note::SpecialRole::FIRST_TIME_CONTRIBUTOR)
self.special_role = Note::SpecialRole::FIRST_TIME_CONTRIBUTOR
end end
def editable? def editable?
......
- if note.has_special_role?(Note::SpecialRole::FIRST_TIME_CONTRIBUTOR) - if note.has_special_role?(Note::SpecialRole::FIRST_TIME_CONTRIBUTOR)
%span.note-role.note-role-special.has-tooltip{ title: _("This user hasn't yet contributed code to this project. Handle with care.") } %span.note-role.note-role-special.has-tooltip{ title: _("This is the author's first Merge Request to this project. Handle with care.") }
= issuable_first_contribution_icon = issuable_first_contribution_icon
- if access = note_max_access_for_user(note) - if access = note_max_access_for_user(note)
%span.note-role.note-role-access= Gitlab::Access.human_access(access) %span.note-role.note-role-access= Gitlab::Access.human_access(access)
......
...@@ -56,6 +56,28 @@ describe Projects::MergeRequestsController do ...@@ -56,6 +56,28 @@ describe Projects::MergeRequestsController do
expect(response).to be_success expect(response).to be_success
end end
context "loads notes" do
let(:first_contributor) { create(:user) }
let(:contributor) { create(:user) }
let(:merge_request) { create(:merge_request, author: first_contributor, target_project: project, source_project: project) }
let(:contributor_merge_request) { create(:merge_request, :merged, author: contributor, target_project: project, source_project: project) }
# the order here is important
# as the controller reloads these from DB, references doesn't correspond after
let!(:first_contributor_note) { create(:note, author: first_contributor, noteable: merge_request, project: project) }
let!(:contributor_note) { create(:note, author: contributor, noteable: merge_request, project: project) }
let!(:owner_note) { create(:note, author: user, noteable: merge_request, project: project) }
it "with special_role FIRST_TIME_CONTRIBUTOR" do
go(format: :html)
notes = assigns(:notes)
expect(notes).to match(a_collection_containing_exactly(an_object_having_attributes(special_role: Note::SpecialRole::FIRST_TIME_CONTRIBUTOR),
an_object_having_attributes(special_role: nil),
an_object_having_attributes(special_role: nil)
))
end
end
end end
describe 'as json' do describe 'as json' do
......
...@@ -696,25 +696,4 @@ describe Note do ...@@ -696,25 +696,4 @@ describe Note do
note.destroy! note.destroy!
end end
end end
describe '#specialize!' do
let(:note) { build(:note) }
let(:role) { Note::SpecialRole::FIRST_TIME_CONTRIBUTOR }
it 'should set special role without a block' do
expect { note.specialize!(role) }.to change { note.special_role }.from(nil).to(role)
end
it 'should set special role with a truthy block' do
tautology = -> (*) { true }
expect { note.specialize!(role, &tautology) }.to change { note.special_role }.from(nil).to(role)
end
it 'should not set special role with a falsey block' do
contradiction = -> (*) { false }
expect { note.specialize!(role, &contradiction) }.not_to change { note.special_role }
end
end
end end
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