Fixed up specsno-backlog-help

2 files changed, 16 insertions, 11 deletions

diff --git a/spec/features/boards/add_issues_modal_spec.rb b/spec/features/boards/add_issues_modal_spec.rb
index 2875fc1e533..d37d1581476 100644
--- a/spec/features/boards/add_issues_modal_spec.rb
+++ b/spec/features/boards/add_issues_modal_spec.rb
@@ -25,13 +25,13 @@ describe 'Issue Boards add issue modal', :feature, :js do
 
   context 'modal interaction' do
     it 'opens modal' do
-      click_button('Add issues')
+      click_add_issues
 
       expect(page).to have_selector('.add-issues-modal')
     end
 
     it 'closes modal' do
-      click_button('Add issues')
+      click_add_issues
 
       page.within('.add-issues-modal') do
         find('.close').click
@@ -41,7 +41,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
     end
 
     it 'closes modal if cancel button clicked' do
-      click_button('Add issues')
+      click_add_issues
 
       page.within('.add-issues-modal') do
         click_button 'Cancel'
@@ -53,7 +53,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
 
   context 'issues list' do
     before do
-      click_button('Add issues')
+      click_add_issues
 
       wait_for_vue_resource
     end
@@ -86,7 +86,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
 
         first('.board-delete').click
 
-        click_button('Add issues')
+        click_add_issues
 
         wait_for_vue_resource
 
@@ -230,4 +230,10 @@ describe 'Issue Boards add issue modal', :feature, :js do
       end
     end
   end
+
+  def click_add_issues
+    page.within('.issue-boards-search') do
+      click_button('Add issues')
+    end
+  end
 end
diff --git a/spec/features/boards/backlog_help_spec.rb b/spec/features/boards/backlog_help_spec.rb
index f93cd64ddfe..c074c71bced 100644
--- a/spec/features/boards/backlog_help_spec.rb
+++ b/spec/features/boards/backlog_help_spec.rb
@@ -6,6 +6,7 @@ describe 'Issue Boards', :feature, :js do
   let(:project) { create(:empty_project, :public) }
   let(:board) { create(:board, project: project) }
   let(:user) { create(:user) }
+  let!(:issue) { create(:issue, project: project) }
   let!(:planning) { create(:label, project: project, name: 'Planning') }
   let!(:list1) { create(:list, board: board, label: planning, position: 0) }
 
@@ -30,17 +31,15 @@ describe 'Issue Boards', :feature, :js do
     expect(page).not_to have_selector('.boards-backlog-help')
   end
 
-  it 'closes backlog help box when clicking add issues button inside box' do
+  it 'closes backlog help box after adding issues' do
     page.within '.boards-backlog-help' do
       click_button 'Add issues'
     end
 
-    expect(page).not_to have_selector('.boards-backlog-help')
-  end
+    page.within('.add-issues-modal') do
+      find('.card').click
 
-  it 'closes backlog help box when clicking add issues button' do
-    page.within '.issue-boards-search' do
-      click_button 'Add issues'
+      click_button 'Add 1 issue'
     end
 
     expect(page).not_to have_selector('.boards-backlog-help')