3d7194f011
The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
92 lines
3.1 KiB
Ruby
92 lines
3.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe API::API do
|
|
include ApiHelpers
|
|
before(:each) { enable_observers }
|
|
after(:each) {disable_observers}
|
|
|
|
let(:user) { create(:user) }
|
|
let!(:project) { create(:project, namespace: user.namespace ) }
|
|
let!(:milestone) { create(:milestone, project: project) }
|
|
|
|
before { project.team << [user, :developer] }
|
|
|
|
describe "GET /projects/:id/milestones" do
|
|
it "should return project milestones" do
|
|
get api("/projects/#{project.id}/milestones", user)
|
|
response.status.should == 200
|
|
json_response.should be_an Array
|
|
json_response.first['title'].should == milestone.title
|
|
end
|
|
|
|
it "should return a 401 error if user not authenticated" do
|
|
get api("/projects/#{project.id}/milestones")
|
|
response.status.should == 401
|
|
end
|
|
end
|
|
|
|
describe "GET /projects/:id/milestones/:milestone_id" do
|
|
it "should return a project milestone by id" do
|
|
get api("/projects/#{project.id}/milestones/#{milestone.id}", user)
|
|
response.status.should == 200
|
|
json_response['title'].should == milestone.title
|
|
end
|
|
|
|
it "should return 401 error if user not authenticated" do
|
|
get api("/projects/#{project.id}/milestones/#{milestone.id}")
|
|
response.status.should == 401
|
|
end
|
|
|
|
it "should return a 404 error if milestone id not found" do
|
|
get api("/projects/#{project.id}/milestones/1234", user)
|
|
response.status.should == 404
|
|
end
|
|
end
|
|
|
|
describe "POST /projects/:id/milestones" do
|
|
it "should create a new project milestone" do
|
|
post api("/projects/#{project.id}/milestones", user), title: 'new milestone'
|
|
response.status.should == 201
|
|
json_response['title'].should == 'new milestone'
|
|
json_response['description'].should be_nil
|
|
end
|
|
|
|
it "should create a new project milestone with description and due date" do
|
|
post api("/projects/#{project.id}/milestones", user),
|
|
title: 'new milestone', description: 'release', due_date: '2013-03-02'
|
|
response.status.should == 201
|
|
json_response['description'].should == 'release'
|
|
json_response['due_date'].should == '2013-03-02'
|
|
end
|
|
|
|
it "should return a 400 error if title is missing" do
|
|
post api("/projects/#{project.id}/milestones", user)
|
|
response.status.should == 400
|
|
end
|
|
end
|
|
|
|
describe "PUT /projects/:id/milestones/:milestone_id" do
|
|
it "should update a project milestone" do
|
|
put api("/projects/#{project.id}/milestones/#{milestone.id}", user),
|
|
title: 'updated title'
|
|
response.status.should == 200
|
|
json_response['title'].should == 'updated title'
|
|
end
|
|
|
|
it "should return a 404 error if milestone id not found" do
|
|
put api("/projects/#{project.id}/milestones/1234", user),
|
|
title: 'updated title'
|
|
response.status.should == 404
|
|
end
|
|
end
|
|
|
|
describe "PUT /projects/:id/milestones/:milestone_id to close milestone" do
|
|
it "should update a project milestone" do
|
|
put api("/projects/#{project.id}/milestones/#{milestone.id}", user),
|
|
state_event: 'close'
|
|
response.status.should == 200
|
|
|
|
json_response['state'].should == 'closed'
|
|
end
|
|
end
|
|
end
|