diff options
| -rw-r--r-- | spec/requests/api/issues_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/milestones_spec.rb (renamed from spec/api/milestones_spec.rb) | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb index 2917980b64e..293ea83ae6c 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/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb index ce602367dcc..cf5f65f068c 100644 --- a/spec/api/milestones_spec.rb +++ b/spec/requests/api/milestones_spec.rb @@ -1,16 +1,17 @@ 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) } - 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}" + get api("/projects/#{project.code}/milestones", user) response.status.should == 200 json_response.should be_an Array json_response.first['title'].should == milestone.title @@ -19,7 +20,7 @@ describe Gitlab::API do 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}" + get api("/projects/#{project.code}/milestones/#{milestone.id}", user) response.status.should == 200 json_response['title'].should == milestone.title end @@ -27,7 +28,7 @@ describe Gitlab::API do 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}", + post api("/projects/#{project.code}/milestones", user), title: 'new milestone' response.status.should == 201 json_response['title'].should == 'new milestone' @@ -37,7 +38,7 @@ describe Gitlab::API do 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}", + put api("/projects/#{project.code}/milestones/#{milestone.id}", user), title: 'updated title' response.status.should == 200 json_response['title'].should == 'updated title' |