Commit dde8ed44 authored by Robert Speicher's avatar Robert Speicher

Fix milestone API specs and moved to requests/api

Closes #1331
parent 8c44789e
...@@ -65,7 +65,7 @@ describe Gitlab::API do ...@@ -65,7 +65,7 @@ describe Gitlab::API do
describe "DELETE /projects/:id/issues/:issue_id" do describe "DELETE /projects/:id/issues/:issue_id" do
it "should delete a project issue" 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 response.status.should == 405
end end
end end
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::API do describe Gitlab::API do
include ApiHelpers
let(:user) { Factory :user } let(:user) { Factory :user }
let!(:project) { Factory :project, owner: user } let!(:project) { Factory :project, owner: user }
let!(:milestone) { Factory :milestone, project: project } let!(:milestone) { Factory :milestone, project: project }
before { project.add_access(user, :read) } before { project.add_access(user, :read) }
before { return pending }
describe "GET /projects/:id/milestones" do describe "GET /projects/:id/milestones" do
it "should return project milestones" do it "should return project milestones" do
get "#{api_prefix}/projects/#{project.code}/milestones?private_token=#{user.private_token}" get api("/projects/#{project.code}/milestones", user)
response.status.should == 200 response.status.should == 200
json_response.should be_an Array json_response.should be_an Array
json_response.first['title'].should == milestone.title json_response.first['title'].should == milestone.title
...@@ -19,7 +20,7 @@ describe Gitlab::API do ...@@ -19,7 +20,7 @@ describe Gitlab::API do
describe "GET /projects/:id/milestones/:milestone_id" do describe "GET /projects/:id/milestones/:milestone_id" do
it "should return a project milestone by 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}" get api("/projects/#{project.code}/milestones/#{milestone.id}", user)
response.status.should == 200 response.status.should == 200
json_response['title'].should == milestone.title json_response['title'].should == milestone.title
end end
...@@ -27,7 +28,7 @@ describe Gitlab::API do ...@@ -27,7 +28,7 @@ describe Gitlab::API do
describe "POST /projects/:id/milestones" do describe "POST /projects/:id/milestones" do
it "should create a new project milestone" do it "should create a new project milestone" do
post "#{api_prefix}/projects/#{project.code}/milestones?private_token=#{user.private_token}", post api("/projects/#{project.code}/milestones", user),
title: 'new milestone' title: 'new milestone'
response.status.should == 201 response.status.should == 201
json_response['title'].should == 'new milestone' json_response['title'].should == 'new milestone'
...@@ -37,7 +38,7 @@ describe Gitlab::API do ...@@ -37,7 +38,7 @@ describe Gitlab::API do
describe "PUT /projects/:id/milestones/:milestone_id" do describe "PUT /projects/:id/milestones/:milestone_id" do
it "should update a project milestone" do it "should update a project milestone" do
put "#{api_prefix}/projects/#{project.code}/milestones/#{milestone.id}?private_token=#{user.private_token}", put api("/projects/#{project.code}/milestones/#{milestone.id}", user),
title: 'updated title' title: 'updated title'
response.status.should == 200 response.status.should == 200
json_response['title'].should == 'updated title' json_response['title'].should == 'updated title'
......
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