diff options
| author | James Lopez <james@jameslopez.es> | 2017-07-06 15:19:14 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-07-06 15:27:49 +0200 |
| commit | 2aa95aa0185c94aefd6e51a35c62650d75d3c8b6 (patch) | |
| tree | b1f7811bab8da709de2f5d6f26fb6c47e1840813 | |
| parent | 47e17fe12ad009656f0b20469f930d1aa0e742e6 (diff) | |
| download | gitlab-ce-2aa95aa0185c94aefd6e51a35c62650d75d3c8b6.tar.gz | |
refactor code based on feedback
| -rw-r--r-- | doc/api/issues.md | 2 | ||||
| -rw-r--r-- | doc/api/snippets.md | 2 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/api/issues.rb | 3 | ||||
| -rw-r--r-- | lib/api/snippets.rb | 3 | ||||
| -rw-r--r-- | spec/requests/api/issues_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/snippets_spec.rb | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/doc/api/issues.md b/doc/api/issues.md index 067934bd480..a00a63bad4b 100644 --- a/doc/api/issues.md +++ b/doc/api/issues.md @@ -988,6 +988,6 @@ Example response: { "user_agent": "AppleWebKit/537.36", "ip_address": "127.0.0.1", - "submitted": false + "akismet_submitted": false } ``` diff --git a/doc/api/snippets.md b/doc/api/snippets.md index 39d099f0470..ea66aa552a7 100644 --- a/doc/api/snippets.md +++ b/doc/api/snippets.md @@ -257,6 +257,6 @@ Example response: { "user_agent": "AppleWebKit/537.36", "ip_address": "127.0.0.1", - "submitted": false + "akismet_submitted": false } ``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 33620473175..44b8c6e010d 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -879,7 +879,7 @@ module API class UserAgentDetail < Grape::Entity expose :user_agent expose :ip_address - expose :submitted + expose :submitted, as: :akismet_submitted end end end diff --git a/lib/api/issues.rb b/lib/api/issues.rb index 88dd31739da..64be08094ed 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -253,10 +253,9 @@ module API issue = find_project_issue(params[:issue_iid]) - return not_found!('Issue') unless issue return not_found!('UserAgentDetail') unless issue.user_agent_detail - present issue.user_agent_detail, with: Entities::UserAgentDetail, current_user: current_user, project: user_project + present issue.user_agent_detail, with: Entities::UserAgentDetail end end end diff --git a/lib/api/snippets.rb b/lib/api/snippets.rb index db4e0b0b013..fd634037a77 100644 --- a/lib/api/snippets.rb +++ b/lib/api/snippets.rb @@ -150,9 +150,8 @@ module API get ":id/user_agent_detail" do authenticated_as_admin! - snippet = Snippet.find_by(id: params[:id]) + snippet = Snippet.find_by!(id: params[:id]) - return not_found!('Snippet') unless snippet return not_found!('UserAgentDetail') unless snippet.user_agent_detail present snippet.user_agent_detail, with: Entities::UserAgentDetail diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb index b60756741fc..7c8e9081081 100644 --- a/spec/requests/api/issues_spec.rb +++ b/spec/requests/api/issues_spec.rb @@ -1471,7 +1471,7 @@ describe API::Issues do expect(response).to have_http_status(200) expect(json_response['user_agent']).to eq(user_agent_detail.user_agent) expect(json_response['ip_address']).to eq(user_agent_detail.ip_address) - expect(json_response['submitted']).to be false + expect(json_response['akismet_submitted']).to eq(user_agent_detail.submitted) end it "returns unautorized for non-admin users" do diff --git a/spec/requests/api/snippets_spec.rb b/spec/requests/api/snippets_spec.rb index 8bf6dadd86e..373fab4d98a 100644 --- a/spec/requests/api/snippets_spec.rb +++ b/spec/requests/api/snippets_spec.rb @@ -283,7 +283,7 @@ describe API::Snippets do expect(response).to have_http_status(200) expect(json_response['user_agent']).to eq(user_agent_detail.user_agent) expect(json_response['ip_address']).to eq(user_agent_detail.ip_address) - expect(json_response['submitted']).to be false + expect(json_response['akismet_submitted']).to eq(user_agent_detail.submitted) end it "returns unautorized for non-admin users" do |