diff --git a/spec/api/milestones_spec.rb b/spec/api/milestones_spec.rb deleted file mode 100644 index ce60236..0000000 --- a/spec/api/milestones_spec.rb +++ /dev/null @@ -1,46 +0,0 @@ -require 'spec_helper' - -describe Gitlab::API do - let(:user) { Factory :user } - let!(:project) { Factory :project, owner: user } - let!(:milestone) { Factory :milestone, project: project } - - before { project.add_access(user, :read) } - before { return pending } - - describe "GET /projects/:id/milestones" do - it "should return project milestones" do - get "#{api_prefix}/projects/#{project.code}/milestones?private_token=#{user.private_token}" - response.status.should == 200 - json_response.should be_an Array - json_response.first['title'].should == milestone.title - end - end - - describe "GET /projects/:id/milestones/:milestone_id" do - it "should return a project milestone by id" do - get "#{api_prefix}/projects/#{project.code}/milestones/#{milestone.id}?private_token=#{user.private_token}" - response.status.should == 200 - json_response['title'].should == milestone.title - end - end - - describe "POST /projects/:id/milestones" do - it "should create a new project milestone" do - post "#{api_prefix}/projects/#{project.code}/milestones?private_token=#{user.private_token}", - title: 'new milestone' - response.status.should == 201 - json_response['title'].should == 'new milestone' - json_response['description'].should be_nil - end - end - - describe "PUT /projects/:id/milestones/:milestone_id" do - it "should update a project milestone" do - put "#{api_prefix}/projects/#{project.code}/milestones/#{milestone.id}?private_token=#{user.private_token}", - title: 'updated title' - response.status.should == 200 - json_response['title'].should == 'updated title' - end - end -end diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb index 2917980..293ea83 100644 --- a/spec/requests/api/issues_spec.rb +++ b/spec/requests/api/issues_spec.rb @@ -65,7 +65,7 @@ describe Gitlab::API do describe "DELETE /projects/:id/issues/:issue_id" do it "should delete a project issue" do - delete api("/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}") + delete api("/projects/#{project.code}/issues/#{issue.id}", user) response.status.should == 405 end end diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb new file mode 100644 index 0000000..cf5f65f --- /dev/null +++ b/spec/requests/api/milestones_spec.rb @@ -0,0 +1,47 @@ +require 'spec_helper' + +describe Gitlab::API do + include ApiHelpers + + let(:user) { Factory :user } + let!(:project) { Factory :project, owner: user } + let!(:milestone) { Factory :milestone, project: project } + + before { project.add_access(user, :read) } + + describe "GET /projects/:id/milestones" do + it "should return project milestones" do + get api("/projects/#{project.code}/milestones", user) + response.status.should == 200 + json_response.should be_an Array + json_response.first['title'].should == milestone.title + end + end + + describe "GET /projects/:id/milestones/:milestone_id" do + it "should return a project milestone by id" do + get api("/projects/#{project.code}/milestones/#{milestone.id}", user) + response.status.should == 200 + json_response['title'].should == milestone.title + end + end + + describe "POST /projects/:id/milestones" do + it "should create a new project milestone" do + post api("/projects/#{project.code}/milestones", user), + title: 'new milestone' + response.status.should == 201 + json_response['title'].should == 'new milestone' + json_response['description'].should be_nil + end + end + + describe "PUT /projects/:id/milestones/:milestone_id" do + it "should update a project milestone" do + put api("/projects/#{project.code}/milestones/#{milestone.id}", user), + title: 'updated title' + response.status.should == 200 + json_response['title'].should == 'updated title' + end + end +end -- libgit2 0.21.2