Commit d4aab652 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-user-contributed-projects' into 'master'

Fix and test user contributed projects.

Fixes #2077.

See merge request !1606
parents 47c5a2ab 804a2488
Pipeline #3151 passed with stage
......@@ -629,5 +629,6 @@ class User < ActiveRecord::Base
reorder(project_id: :desc).
select(:project_id).
uniq
.map(&:project_id)
end
end
......@@ -505,4 +505,32 @@ describe User do
expect(User.sort(nil).first).to eq(@user)
end
end
describe "#contributed_projects_ids" do
subject { create(:user) }
let!(:project1) { create(:project) }
let!(:project2) { create(:project, forked_from_project: project3) }
let!(:project3) { create(:project) }
let!(:merge_request) { create(:merge_request, source_project: project2, target_project: project3, author: subject) }
let!(:push_event) { create(:event, action: Event::PUSHED, project: project1, target: project1, author: subject) }
let!(:merge_event) { create(:event, action: Event::CREATED, project: project3, target: merge_request, author: subject) }
before do
project1.team << [subject, :master]
project2.team << [subject, :master]
end
it "includes IDs for projects the user has pushed to" do
expect(subject.contributed_projects_ids).to include(project1.id)
end
it "includes IDs for projects the user has had merge requests merged into" do
expect(subject.contributed_projects_ids).to include(project3.id)
end
it "doesn't include IDs for unrelated projects" do
expect(subject.contributed_projects_ids).not_to include(project2.id)
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