1 files changed, 9 insertions, 80 deletions

diff --git a/spec/services/issuable/bulk_update_service_spec.rb b/spec/services/issuable/bulk_update_service_spec.rb
index f82a3cee1d9..c791c454d70 100644
--- a/spec/services/issuable/bulk_update_service_spec.rb
+++ b/spec/services/issuable/bulk_update_service_spec.rb
@@ -42,13 +42,11 @@ describe Issuable::BulkUpdateService do
     let(:issue_no_labels) { create(:issue, project: project) }
     let(:issues) { [issue_all_labels, issue_bug_and_regression, issue_bug_and_merge_requests, issue_no_labels] }
 
-    let(:labels) { [] }
     let(:add_labels) { [] }
     let(:remove_labels) { [] }
 
     let(:bulk_update_params) do
       {
-        label_ids:        labels.map(&:id),
         add_label_ids:    add_labels.map(&:id),
         remove_label_ids: remove_labels.map(&:id)
       }
@@ -58,27 +56,6 @@ describe Issuable::BulkUpdateService do
       bulk_update(issues, bulk_update_params)
     end
 
-    context 'when label_ids are passed' do
-      let(:issues) { [issue_all_labels, issue_no_labels] }
-      let(:labels) { [bug, regression] }
-
-      it 'updates the labels of all issues passed to the labels passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(match_array(labels.map(&:id)))
-      end
-
-      it 'does not update issues not passed in' do
-        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
-      end
-
-      context 'when those label IDs are empty' do
-        let(:labels) { [] }
-
-        it 'updates the issues passed to have no labels' do
-          expect(issues.map(&:reload).map(&:label_ids)).to all(be_empty)
-        end
-      end
-    end
-
     context 'when add_label_ids are passed' do
       let(:issues) { [issue_all_labels, issue_bug_and_merge_requests, issue_no_labels] }
       let(:add_labels) { [bug, regression, merge_requests] }
@@ -122,69 +99,21 @@ describe Issuable::BulkUpdateService do
         expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
       end
     end
+  end
 
-    context 'when add_label_ids and label_ids are passed' do
-      let(:issues) { [issue_all_labels, issue_bug_and_regression, issue_bug_and_merge_requests] }
-      let(:labels) { [merge_requests] }
-      let(:add_labels) { [regression] }
-
-      it 'adds the label IDs to all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(regression.id))
-      end
-
-      it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(bug.id))
-      end
-
-      it 'does not update issues not passed in' do
-        expect(issue_no_labels.label_ids).to be_empty
-      end
-    end
-
-    context 'when remove_label_ids and label_ids are passed' do
-      let(:issues) { [issue_no_labels, issue_bug_and_regression] }
-      let(:labels) { [merge_requests] }
-      let(:remove_labels) { [regression] }
-
-      it 'removes the label IDs from all issues passed' do
-        expect(issues.map(&:reload).flat_map(&:label_ids)).not_to include(regression.id)
-      end
-
-      it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).flat_map(&:label_ids)).not_to include(merge_requests.id)
-      end
-
-      it 'does not update issues not passed in' do
-        expect(issue_all_labels.label_ids).to contain_exactly(bug.id, regression.id, merge_requests.id)
-      end
-    end
-
-    context 'when add_label_ids, remove_label_ids, and label_ids are passed' do
-      let(:issues) { [issue_bug_and_merge_requests, issue_no_labels] }
-      let(:labels) { [regression] }
-      let(:add_labels) { [bug] }
-      let(:remove_labels) { [merge_requests] }
-
-      it 'adds the label IDs to all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(bug.id))
-      end
+  context 'with issuables at a project level' do
+    let(:parent) { project }
 
-      it 'removes the label IDs from all issues passed' do
-        expect(issues.map(&:reload).flat_map(&:label_ids)).not_to include(merge_requests.id)
-      end
+    context 'with unpermitted attributes' do
+      let(:issues) { create_list(:issue, 2, project: project) }
+      let(:label) { create(:label, project: project) }
 
-      it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).flat_map(&:label_ids)).not_to include(regression.id)
-      end
+      it 'does not update the issues' do
+        bulk_update(issues, label_ids: [label.id])
 
-      it 'does not update issues not passed in' do
-        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
+        expect(issues.map(&:reload).map(&:label_ids)).not_to include(label.id)
       end
     end
-  end
-
-  context 'with issuables at a project level' do
-    let(:parent) { project }
 
     describe 'close issues' do
       let(:issues) { create_list(:issue, 2, project: project) }