summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2016-04-13 12:50:00 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2016-04-13 16:25:24 +0200
commit54231aa4e036179d035ddd3641bc15a5b31883f2 (patch)
tree29633c8be132cbf12ef163575770c0646316438f
parent3ab9ea8dae1edc6ab8c8563843342890736eb24c (diff)
downloadgitlab-ce-54231aa4e036179d035ddd3641bc15a5b31883f2.tar.gz
Styling changes to code and docs
-rw-r--r--doc/api/projects.md1
-rw-r--r--lib/api/helpers.rb2
-rw-r--r--lib/api/projects.rb4
-rw-r--r--spec/requests/api/projects_spec.rb10
4 files changed, 8 insertions, 9 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md
index b25c9080080..de1faadebf5 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -617,7 +617,6 @@ Example response:
}
```
-
### Archive a project
Archives the project if the user is either admin or the project owner of this project. This action is
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index aa0597564ed..54452f763a6 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -242,7 +242,7 @@ module API
end
def not_modified!
- render_api_error!('304 Not modified', 304)
+ render_api_error!('304 Not Modified', 304)
end
def render_validation_error!(model)
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index c7fdfbfe57b..cc2c7a0c503 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -284,6 +284,7 @@ module API
else
current_user.toggle_star(user_project)
user_project.reload
+
present user_project, with: Entities::Project
end
end
@@ -293,11 +294,12 @@ module API
# Parameters:
# id (required) - The ID of a project
# Example Request:
- # DELETE /projects/:id/unstar
+ # DELETE /projects/:id/star
delete ':id/star' do
if current_user.starred?(user_project)
current_user.toggle_star(user_project)
user_project.reload
+
present user_project, with: Entities::Project
else
not_modified!
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 2a7c55fe65e..fccd08bd6da 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -1023,7 +1023,7 @@ describe API::API, api: true do
describe 'POST /projects/:id/star' do
context 'on an unstarred project' do
it 'stars the project' do
- post api("/projects/#{project.id}/star", user)
+ expect { post api("/projects/#{project.id}/star", user) }.to change { project.reload.star_count }.by(1)
expect(response.status).to eq(201)
expect(json_response['star_count']).to eq(1)
@@ -1037,10 +1037,9 @@ describe API::API, api: true do
end
it 'does not modify the star count' do
- post api("/projects/#{project.id}/star", user)
+ expect { post api("/projects/#{project.id}/star", user) }.not_to change { project.reload.star_count }
expect(response.status).to eq(304)
- expect(project.star_count).to eq(1)
end
end
end
@@ -1053,7 +1052,7 @@ describe API::API, api: true do
end
it 'unstars the project' do
- delete api("/projects/#{project.id}/star", user)
+ expect { delete api("/projects/#{project.id}/star", user) }.to change { project.reload.star_count }.by(-1)
expect(response.status).to eq(200)
expect(json_response['star_count']).to eq(0)
@@ -1062,10 +1061,9 @@ describe API::API, api: true do
context 'on an unstarred project' do
it 'does not modify the star count' do
- delete api("/projects/#{project.id}/star", user)
+ expect { delete api("/projects/#{project.id}/star", user) }.not_to change { project.reload.star_count }
expect(response.status).to eq(304)
- expect(project.star_count).to eq(0)
end
end
end