diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2018-08-24 09:35:27 +0200 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2019-01-31 13:49:49 +0100 |
commit | f66fec1d41cda8da604a5a92ed811f2b6b80a9dc (patch) | |
tree | c9ccbcc926d34964ebd6a673ef2c6508d5a9f3fc | |
parent | 3418697e90ad88abf7850bd7f6faf31dbf198658 (diff) | |
download | gitlab-ce-f66fec1d41cda8da604a5a92ed811f2b6b80a9dc.tar.gz |
Add specs
-rw-r--r-- | lib/api/entities.rb | 2 | ||||
-rw-r--r-- | lib/api/group_labels.rb | 16 | ||||
-rw-r--r-- | spec/requests/api/group_labels_spec.rb | 212 |
3 files changed, 222 insertions, 8 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 4edec631e8d..fe28cb256e6 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1024,7 +1024,7 @@ module API end expose :subscribed do |label, options| - label.subscribed?(options[:current_user], options[:project]) + label.subscribed?(options[:current_user], options[:parent]) end end diff --git a/lib/api/group_labels.rb b/lib/api/group_labels.rb index b9bd3d7448c..8b502b047d3 100644 --- a/lib/api/group_labels.rb +++ b/lib/api/group_labels.rb @@ -15,7 +15,9 @@ module API use :pagination end get ':id/labels' do - present paginate(available_labels_for(user_group)), with: Entities::Label, current_user: current_user, project: user_project + group_labels = available_labels_for(user_group) + + present paginate(group_labels), with: Entities::Label, current_user: current_user, parent: user_group end desc 'Create a new label' do @@ -27,15 +29,15 @@ module API optional :description, type: String, desc: 'The description of label to be created' end post ':id/labels' do - authorize! :admin_label, user_project + authorize! :admin_label, user_group label = available_labels_for(user_group).find_by(title: params[:name]) conflict!('Label already exists') if label - label = ::Labels::CreateService.new(declared_params(include_missing: false)).execute(project: user_group) + label = ::Labels::CreateService.new(declared_params(include_missing: false)).execute(group: user_group) if label.valid? - present label, with: Entities::Label, current_user: current_user, project: user_project + present label, with: Entities::Label, current_user: current_user, parent: user_group else render_validation_error!(label) end @@ -48,7 +50,7 @@ module API requires :name, type: String, desc: 'The name of the label to be deleted' end delete ':id/labels' do - authorize! :admin_label, user_project + authorize! :admin_label, user_group label = user_group.labels.find_by(title: params[:name]) not_found!('Label') unless label @@ -67,7 +69,7 @@ module API at_least_one_of :new_name, :color, :description end put ':id/labels' do - authorize! :admin_label, user_project + authorize! :admin_label, user_group label = user_group.labels.find_by(title: params[:name]) not_found!('Label not found') unless label @@ -79,7 +81,7 @@ module API label = ::Labels::UpdateService.new(label_params).execute(label) render_validation_error!(label) unless label.valid? - present label, with: Entities::Label, current_user: current_user, project: user_project + present label, with: Entities::Label, current_user: current_user, parent: user_group end end end diff --git a/spec/requests/api/group_labels_spec.rb b/spec/requests/api/group_labels_spec.rb new file mode 100644 index 00000000000..09563b1a204 --- /dev/null +++ b/spec/requests/api/group_labels_spec.rb @@ -0,0 +1,212 @@ +require 'spec_helper' + +describe API::GroupLabels do + let(:user) { create(:user) } + let(:group) { create(:group) } + let!(:group_member) { create(:group_member, group: group, user: user) } + let!(:label1) { create(:group_label, title: 'feature', group: group) } + let!(:label2) { create(:group_label, title: 'bug', group: group) } + + describe 'GET :id/labels' do + it 'returns all available labels for the group' do + get api("/groups/#{group.id}/labels", user) + + expect(response).to have_gitlab_http_status(200) + expect(response).to include_pagination_headers + expect(json_response).to be_an Array + expect(json_response.size).to eq(2) + end + end + + describe 'POST /groups/:id/labels' do + it 'returns created label when all params' do + post api("/groups/#{group.id}/labels", user), + name: 'Foo', + color: '#FFAABB', + description: 'test' + + expect(response).to have_gitlab_http_status(201) + expect(json_response['name']).to eq('Foo') + expect(json_response['color']).to eq('#FFAABB') + expect(json_response['description']).to eq('test') + end + + it 'returns created label when only required params' do + post api("/groups/#{group.id}/labels", user), + name: 'Foo & Bar', + color: '#FFAABB' + + expect(response.status).to eq(201) + expect(json_response['name']).to eq('Foo & Bar') + expect(json_response['color']).to eq('#FFAABB') + expect(json_response['description']).to be_nil + end + + it 'returns a 400 bad request if name not given' do + post api("/groups/#{group.id}/labels", user), color: '#FFAABB' + + expect(response).to have_gitlab_http_status(400) + end + + it 'returns a 400 bad request if color not given' do + post api("/groups/#{group.id}/labels", user), name: 'Foobar' + + expect(response).to have_gitlab_http_status(400) + end + + it 'returns 400 for invalid color' do + post api("/groups/#{group.id}/labels", user), + name: 'Foo', + color: '#FFAA' + + expect(response).to have_gitlab_http_status(400) + expect(json_response['message']['color']).to eq(['must be a valid color code']) + end + + it 'returns 400 for too long color code' do + post api("/groups/#{group.id}/labels", user), + name: 'Foo', + color: '#FFAAFFFF' + + expect(response).to have_gitlab_http_status(400) + expect(json_response['message']['color']).to eq(['must be a valid color code']) + end + + it 'returns 400 for invalid name' do + post api("/groups/#{group.id}/labels", user), + name: ',', + color: '#FFAABB' + + expect(response).to have_gitlab_http_status(400) + expect(json_response['message']['title']).to eq(['is invalid']) + end + + it 'returns 409 if label already exists' do + post api("/groups/#{group.id}/labels", user), + name: label1.name, + color: '#FFAABB' + + expect(response).to have_gitlab_http_status(409) + expect(json_response['message']).to eq('Label already exists') + end + end + + describe 'DELETE /groups/:id/labels' do + it 'returns 204 for existing label' do + delete api("/groups/#{group.id}/labels", user), name: label1.name + + expect(response).to have_gitlab_http_status(204) + end + + it 'returns 404 for non existing label' do + delete api("/groups/#{group.id}/labels", user), name: 'label2' + + expect(response).to have_gitlab_http_status(404) + expect(json_response['message']).to eq('404 Label Not Found') + end + + it 'returns 400 for wrong parameters' do + delete api("/groups/#{group.id}/labels", user) + + expect(response).to have_gitlab_http_status(400) + end + + it_behaves_like '412 response' do + let(:request) { api("/groups/#{group.id}/labels", user) } + let(:params) { { name: label1.name } } + end + end + + describe 'PUT /groups/:id/labels' do + it 'returns 200 if name and colors and description are changed' do + put api("/groups/#{group.id}/labels", user), + name: label1.name, + new_name: 'New Label', + color: '#FFFFFF', + description: 'test' + expect(response).to have_gitlab_http_status(200) + expect(json_response['name']).to eq('New Label') + expect(json_response['color']).to eq('#FFFFFF') + expect(json_response['description']).to eq('test') + end + + it 'returns 200 if name is changed' do + put api("/groups/#{group.id}/labels", user), + name: label1.name, + new_name: 'New Label' + expect(response).to have_gitlab_http_status(200) + expect(json_response['name']).to eq('New Label') + expect(json_response['color']).to eq(label1.color) + end + + it 'returns 200 if colors is changed' do + put api("/groups/#{group.id}/labels", user), + name: label1.name, + color: '#FFFFFF' + expect(response).to have_gitlab_http_status(200) + expect(json_response['name']).to eq(label1.name) + expect(json_response['color']).to eq('#FFFFFF') + end + + it 'returns 200 if description is changed' do + put api("/groups/#{group.id}/labels", user), + name: label2.name, + description: 'test' + + expect(response).to have_gitlab_http_status(200) + expect(json_response['name']).to eq(label2.name) + expect(json_response['description']).to eq('test') + end + + it 'returns 404 if label does not exist' do + put api("/groups/#{group.id}/labels", user), + name: 'label2', + new_name: 'label3' + + expect(response).to have_gitlab_http_status(404) + end + + it 'returns 400 if no label name given' do + put api("/groups/#{group.id}/labels", user), new_name: label1.name + + expect(response).to have_gitlab_http_status(400) + expect(json_response['error']).to eq('name is missing') + end + + it 'returns 400 if no new parameters given' do + put api("/groups/#{group.id}/labels", user), name: label1.name + + expect(response).to have_gitlab_http_status(400) + expect(json_response['error']).to eq('new_name, color, description are missing, '\ + 'at least one parameter must be provided') + end + + it 'returns 400 for invalid name' do + put api("/groups/#{group.id}/labels", user), + name: label1.name, + new_name: ',', + color: '#FFFFFF' + + expect(response).to have_gitlab_http_status(400) + expect(json_response['message']['title']).to eq(['is invalid']) + end + + it 'returns 400 when color code is too short' do + put api("/groups/#{group.id}/labels", user), + name: label1.name, + color: '#FF' + + expect(response).to have_gitlab_http_status(400) + expect(json_response['message']['color']).to eq(['must be a valid color code']) + end + + it 'returns 400 for too long color code' do + put api("/groups/#{group.id}/labels", user), + name: label1.name, + color: '#FFAAFFFF' + + expect(response).to have_gitlab_http_status(400) + expect(json_response['message']['color']).to eq(['must be a valid color code']) + end + end +end
\ No newline at end of file |