Download as
Browse Code »

Commit 12800e544527c08e3423ecabe4dffd5bef90e9d5

Authored by Dmitriy Zaporozhets
1 parent ace9ff4a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Extend API Issues, MergeRequets, Milestones with iid field

Showing 4 changed files with 16 additions and 12 deletions   Show diff stats
lib/api/entities.rb
  Diff comments   View file @12800e5
... ... @@ -91,15 +91,16 @@ module API
91 91 expose :expires_at, :updated_at, :created_at
92 92 end
93 93  
94   - class Milestone < Grape::Entity
95   - expose :id
96   - expose (:project_id) {|milestone| milestone.project.id}
  94 + class ProjectEntity < Grape::Entity
  95 + expose :id, :iid
  96 + expose (:project_id) { |entity| entity.project.id }
  97 + end
  98 +
  99 + class Milestone < ProjectEntity
97 100 expose :title, :description, :due_date, :state, :updated_at, :created_at
98 101 end
99 102  
100   - class Issue < Grape::Entity
101   - expose :id
102   - expose (:project_id) {|issue| issue.project.id}
  103 + class Issue < ProjectEntity
103 104 expose :title, :description
104 105 expose :label_list, as: :labels
105 106 expose :milestone, using: Entities::Milestone
... ... @@ -107,14 +108,14 @@ module API
107 108 expose :state, :updated_at, :created_at
108 109 end
109 110  
110   - class SSHKey < Grape::Entity
111   - expose :id, :title, :key, :created_at
  111 + class MergeRequest < ProjectEntity
  112 + expose :target_branch, :source_branch, :title, :state, :upvotes, :downvotes
  113 + expose :author, :assignee, using: Entities::UserBasic
  114 + expose :source_project_id, :target_project_id
112 115 end
113 116  
114   - class MergeRequest < Grape::Entity
115   - expose :id, :target_branch, :source_branch, :title, :state, :upvotes, :downvotes
116   - expose :target_project_id, as: :project_id
117   - expose :author, :assignee, using: Entities::UserBasic
  117 + class SSHKey < Grape::Entity
  118 + expose :id, :title, :key, :created_at
118 119 end
119 120  
120 121 class Note < Grape::Entity
... ...
spec/requests/api/issues_spec.rb
  Diff comments   View file @12800e5
... ... @@ -42,6 +42,7 @@ describe API::API do
42 42 get api("/projects/#{project.id}/issues/#{issue.id}", user)
43 43 response.status.should == 200
44 44 json_response['title'].should == issue.title
  45 + json_response['iid'].should == issue.iid
45 46 end
46 47  
47 48 it "should return 404 if issue id not found" do
... ...
spec/requests/api/merge_requests_spec.rb
  Diff comments   View file @12800e5
... ... @@ -34,6 +34,7 @@ describe API::API do
34 34 get api("/projects/#{project.id}/merge_request/#{merge_request.id}", user)
35 35 response.status.should == 200
36 36 json_response['title'].should == merge_request.title
  37 + json_response['iid'].should == merge_request.iid
37 38 end
38 39  
39 40 it "should return a 404 error if merge_request_id not found" do
... ...
spec/requests/api/milestones_spec.rb
  Diff comments   View file @12800e5
... ... @@ -30,6 +30,7 @@ describe API::API do
30 30 get api("/projects/#{project.id}/milestones/#{milestone.id}", user)
31 31 response.status.should == 200
32 32 json_response['title'].should == milestone.title
  33 + json_response['iid'].should == milestone.iid
33 34 end
34 35  
35 36 it "should return 401 error if user not authenticated" do
... ...