Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 19 deletions

diff --git a/spec/models/label_link_spec.rb b/spec/models/label_link_spec.rb
index e5753b34e72..c6bec215145 100644
--- a/spec/models/label_link_spec.rb
+++ b/spec/models/label_link_spec.rb
@@ -13,27 +13,14 @@ RSpec.describe LabelLink do
     let(:invalid_items_for_bulk_insertion) { [] } # class does not have any validations defined
   end
 
-  describe 'scopes' do
-    describe '.for_target' do
-      it 'returns the label links for a given target' do
-        label_link = create(:label_link, target: create(:merge_request))
+  describe '.for_target' do
+    it 'returns the label links for a given target' do
+      label_link = create(:label_link, target: create(:merge_request))
 
-        create(:label_link, target: create(:issue))
+      create(:label_link, target: create(:issue))
 
-        expect(described_class.for_target(label_link.target_id, label_link.target_type))
-          .to contain_exactly(label_link)
-      end
-    end
-
-    describe '.with_remove_on_close_labels' do
-      it 'responds with label_links that can be removed when an issue is closed' do
-        issue = create(:issue)
-        removable_label = create(:label, project: issue.project, remove_on_close: true)
-        create(:label_link, target: issue)
-        removable_issue_label_link = create(:label_link, label: removable_label, target: issue)
-
-        expect(described_class.with_remove_on_close_labels).to contain_exactly(removable_issue_label_link)
-      end
+      expect(described_class.for_target(label_link.target_id, label_link.target_type))
+        .to contain_exactly(label_link)
     end
   end
 end