Merge branch 'master' into 'email-in-slash-commands'email-in-slash-commands

# Conflicts:
#   doc/user/project/slash_commands.md
#   doc/workflow/README.md

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/services/boards/issues/list_service_spec.rb b/spec/services/boards/issues/list_service_spec.rb
index f7f45983d26..cf4c5f13635 100644
--- a/spec/services/boards/issues/list_service_spec.rb
+++ b/spec/services/boards/issues/list_service_spec.rb
@@ -30,7 +30,7 @@ describe Boards::Issues::ListService, services: true do
     let!(:closed_issue1) { create(:labeled_issue, :closed, project: project, labels: [bug]) }
     let!(:closed_issue2) { create(:labeled_issue, :closed, project: project, labels: [p3]) }
     let!(:closed_issue3) { create(:issue, :closed, project: project) }
-    let!(:closed_issue4) { create(:labeled_issue, :closed, project: project, labels: [p1]) }
+    let!(:closed_issue4) { create(:labeled_issue, :closed, project: project, labels: [p1, development]) }
 
     before do
       project.team << [user, :developer]
@@ -58,15 +58,15 @@ describe Boards::Issues::ListService, services: true do
 
         issues = described_class.new(project, user, params).execute
 
-        expect(issues).to eq [closed_issue4, closed_issue2, closed_issue3, closed_issue1]
+        expect(issues).to eq [closed_issue2, closed_issue3, closed_issue1]
       end
 
-      it 'returns opened issues that have label list applied when listing issues from a label list' do
+      it 'returns opened/closed issues that have label list applied when listing issues from a label list' do
         params = { id: list1.id }
 
         issues = described_class.new(project, user, params).execute
 
-        expect(issues).to eq [list1_issue3, list1_issue1, list1_issue2]
+        expect(issues).to eq [closed_issue4, list1_issue3, list1_issue1, list1_issue2]
       end
     end
   end