Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 31 insertions, 12 deletions

diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index efa1f8cfc0d..f434ea0c66f 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -130,24 +130,43 @@ RSpec.describe 'Issue Boards new issue', :js do
 
   context 'group boards' do
     let_it_be(:group) { create(:group, :public) }
-    let_it_be(:project) { create(:project, namespace: group) }
+    let_it_be(:project) { create(:project, :public, namespace: group) }
     let_it_be(:group_board) { create(:board, group: group) }
-    let_it_be(:list) { create(:list, board: group_board, position: 0) }
+    let_it_be(:project_label) { create(:label, project: project, name: 'label') }
+    let_it_be(:list) { create(:list, board: group_board, label: project_label, position: 0) }
 
     context 'for unauthorized users' do
-      before do
-        sign_in(user)
-        visit group_board_path(group, group_board)
-        wait_for_requests
-      end
+      context 'when backlog does not exist' do
+        before do
+          sign_in(user)
+          visit group_board_path(group, group_board)
+          wait_for_requests
+        end
 
-      it 'displays new issue button in open list' do
-        expect(first('.board')).to have_selector('.issue-count-badge-add-button', count: 1)
+        it 'does not display new issue button in label list' do
+          page.within('.board.is-draggable') do
+            expect(page).not_to have_selector('.issue-count-badge-add-button')
+          end
+        end
       end
 
-      it 'does not display new issue button in label list' do
-        page.within('.board.is-draggable') do
-          expect(page).not_to have_selector('.issue-count-badge-add-button')
+      context 'when backlog list already exists' do
+        let!(:backlog_list) { create(:backlog_list, board: group_board) }
+
+        before do
+          sign_in(user)
+          visit group_board_path(group, group_board)
+          wait_for_requests
+        end
+
+        it 'displays new issue button in open list' do
+          expect(first('.board')).to have_selector('.issue-count-badge-add-button', count: 1)
+        end
+
+        it 'does not display new issue button in label list' do
+          page.within('.board.is-draggable') do
+            expect(page).not_to have_selector('.issue-count-badge-add-button')
+          end
         end
       end
     end