mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-09 04:36:11 +10:00
Revert "Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'"
This reverts commit 550f9a740c.
This commit is contained in:
@@ -87,15 +87,7 @@ module API
|
||||
authorize! :read_milestone, user_project
|
||||
|
||||
@milestone = user_project.milestones.find(params[:milestone_id])
|
||||
|
||||
finder_params = {
|
||||
project_id: user_project.id,
|
||||
milestone_title: @milestone.title,
|
||||
state: 'all'
|
||||
}
|
||||
|
||||
issues = IssuesFinder.new(current_user, finder_params).execute
|
||||
present paginate(issues), with: Entities::Issue, current_user: current_user
|
||||
present paginate(@milestone.issues), with: Entities::Issue
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -106,7 +106,7 @@ describe API::API, api: true do
|
||||
|
||||
describe 'GET /projects/:id/milestones/:milestone_id/issues' do
|
||||
before do
|
||||
milestone.issues << create(:issue, project: project)
|
||||
milestone.issues << create(:issue)
|
||||
end
|
||||
it 'should return project issues for a particular milestone' do
|
||||
get api("/projects/#{project.id}/milestones/#{milestone.id}/issues", user)
|
||||
@@ -119,34 +119,5 @@ describe API::API, api: true do
|
||||
get api("/projects/#{project.id}/milestones/#{milestone.id}/issues")
|
||||
expect(response.status).to eq(401)
|
||||
end
|
||||
|
||||
describe 'confidential issues' do
|
||||
let(:public_project) { create(:project, :public) }
|
||||
let(:milestone) { create(:milestone, project: public_project) }
|
||||
let(:issue) { create(:issue, project: public_project) }
|
||||
let(:confidential_issue) { create(:issue, confidential: true, project: public_project) }
|
||||
before do
|
||||
public_project.team << [user, :developer]
|
||||
milestone.issues << issue << confidential_issue
|
||||
end
|
||||
|
||||
it 'returns confidential issues to team members' do
|
||||
get api("/projects/#{public_project.id}/milestones/#{milestone.id}/issues", user)
|
||||
|
||||
expect(response.status).to eq(200)
|
||||
expect(json_response).to be_an Array
|
||||
expect(json_response.size).to eq(2)
|
||||
expect(json_response.map { |issue| issue['id'] }).to include(issue.id, confidential_issue.id)
|
||||
end
|
||||
|
||||
it 'does not return confidential issues to regular users' do
|
||||
get api("/projects/#{public_project.id}/milestones/#{milestone.id}/issues", create(:user))
|
||||
|
||||
expect(response.status).to eq(200)
|
||||
expect(json_response).to be_an Array
|
||||
expect(json_response.size).to eq(1)
|
||||
expect(json_response.map { |issue| issue['id'] }).to include(issue.id)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user