Commit 071ad636 authored by Sean McGivern's avatar Sean McGivern Committed by Alfredo Sumaran

Spec label add / delete in UpdateService

parent 165d799f
...@@ -72,19 +72,18 @@ class IssuableBaseService < BaseService ...@@ -72,19 +72,18 @@ class IssuableBaseService < BaseService
if params[:add_label_ids].present? || params[:remove_label_ids].present? if params[:add_label_ids].present? || params[:remove_label_ids].present?
params.delete(:label_ids) params.delete(:label_ids)
filter_labels_by_name([:add_label_ids, :remove_label_ids]) filter_labels_in_param(:add_label_ids)
filter_labels_in_param(:remove_label_ids)
else else
filter_labels_by_name([:label_ids]) filter_labels_in_param(:label_ids)
end end
end end
def filter_labels_by_name(keys) def filter_labels_in_param(key)
keys.each do |key| return if params[key].to_a.empty?
next if params[key].to_a.empty?
params[key] = project.labels.where(id: params[key]).pluck(:id) params[key] = project.labels.where(id: params[key]).pluck(:id)
end end
end
def update_issuable(issuable, attributes) def update_issuable(issuable, attributes)
issuable.with_transaction_returning_status do issuable.with_transaction_returning_status do
...@@ -94,7 +93,7 @@ class IssuableBaseService < BaseService ...@@ -94,7 +93,7 @@ class IssuableBaseService < BaseService
issuable.label_ids |= add_label_ids if add_label_ids issuable.label_ids |= add_label_ids if add_label_ids
issuable.label_ids -= remove_label_ids if remove_label_ids issuable.label_ids -= remove_label_ids if remove_label_ids
issuable.assign_attributes(attributes) issuable.assign_attributes(attributes.merge(updated_by: current_user))
issuable.save issuable.save
end end
...@@ -105,7 +104,7 @@ class IssuableBaseService < BaseService ...@@ -105,7 +104,7 @@ class IssuableBaseService < BaseService
filter_params filter_params
old_labels = issuable.labels.to_a old_labels = issuable.labels.to_a
if params.present? && update_issuable(issuable, params.merge(updated_by: current_user)) if params.present? && update_issuable(issuable, params)
issuable.reset_events_cache issuable.reset_events_cache
handle_common_system_notes(issuable, old_labels: old_labels) handle_common_system_notes(issuable, old_labels: old_labels)
handle_changes(issuable, old_labels: old_labels) handle_changes(issuable, old_labels: old_labels)
......
# coding: utf-8
require 'spec_helper' require 'spec_helper'
describe Issues::UpdateService, services: true do describe Issues::UpdateService, services: true do
...@@ -273,5 +274,50 @@ describe Issues::UpdateService, services: true do ...@@ -273,5 +274,50 @@ describe Issues::UpdateService, services: true do
end end
end end
end end
context 'updating labels' do
let(:label3) { create(:label, project: project) }
let(:result) { Issues::UpdateService.new(project, user, params).execute(issue).reload }
context 'when add_label_ids and label_ids are passed' do
let(:params) { { label_ids: [label.id], add_label_ids: [label3.id] } }
it 'ignores the label_ids parameter' do
expect(result.label_ids).not_to include(label.id)
end
it 'adds the passed labels' do
expect(result.label_ids).to include(label3.id)
end
end
context 'when remove_label_ids and label_ids are passed' do
let(:params) { { label_ids: [], remove_label_ids: [label.id] } }
before { issue.update_attributes(labels: [label, label3]) }
it 'ignores the label_ids parameter' do
expect(result.label_ids).not_to be_empty
end
it 'removes the passed labels' do
expect(result.label_ids).not_to include(label.id)
end
end
context 'when add_label_ids and remove_label_ids are passed' do
let(:params) { { add_label_ids: [label3.id], remove_label_ids: [label.id] } }
before { issue.update_attributes(labels: [label]) }
it 'adds the passed labels' do
expect(result.label_ids).to include(label3.id)
end
it 'removes the passed labels' do
expect(result.label_ids).not_to include(label.id)
end
end
end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment