Merge branch 'use-graphql-boards-for-project-issue-boards-ee-sidebar-spec' into 'master'

Use graphql boards for project issue boards sidebar specs (EE)

See merge request gitlab-org/gitlab!59938

app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue

@@ -77,7 +77,12 @@ export default {
 </script>
 
 <template>
-  <board-editable-item ref="sidebarItem" :title="__('Labels')" :loading="loading">
+  <board-editable-item
+    ref="sidebarItem"
+    :title="__('Labels')"
+    :loading="loading"
+    data-testid="sidebar-labels"
+  >
     <template #collapsed>
       <gl-label
         v-for="label in issueLabels"

ee/app/assets/javascripts/boards/components/sidebar/board_sidebar_weight_input.vue

@@ -70,6 +70,7 @@ export default {
     ref="sidebarItem"
     :title="__('Weight')"
     :loading="loading"
+    data-testid="sidebar-weight"
     @close="setWeight()"
   >
     <template v-if="hasWeight" #collapsed>

ee/spec/features/boards/sidebar_deprecated_spec.rb

+# frozen_string_literal: true
+
+# To be removed as :graphql_board_lists defaults on
+# https://gitlab.com/gitlab-org/gitlab/-/issues/248908
+
+require 'spec_helper'
+
+RSpec.describe 'Issue Boards', :js do
+  include BoardHelpers
+
+  let_it_be(:user)         { create(:user) }
+  let_it_be(:user2)        { create(:user) }
+  let_it_be(:group)        { create(:group) }
+  let_it_be(:project)      { create(:project, :public, group: group) }
+  let_it_be(:milestone)    { create(:milestone, project: project) }
+  let_it_be(:development)  { create(:label, project: project, name: 'Development') }
+  let_it_be(:stretch)      { create(:label, project: project, name: 'Stretch') }
+  let_it_be(:issue1)       { create(:labeled_issue, project: project, assignees: [user], milestone: milestone, labels: [development], weight: 3, relative_position: 2) }
+  let_it_be(:issue2)       { create(:labeled_issue, project: project, labels: [development, stretch], relative_position: 1) }
+  let_it_be(:board)        { create(:board, project: project) }
+  let_it_be(:list)         { create(:list, board: board, label: development, position: 0) }
+  let_it_be(:scoped_label_1) { create(:label, project: project, name: 'Scoped1::Label1') }
+  let_it_be(:scoped_label_2) { create(:label, project: project, name: 'Scoped2::Label2') }
+
+  let(:card1) { find('.board:nth-child(2)').find('.board-card:nth-child(2)') }
+  let(:card2) { find('.board:nth-child(2)').find('.board-card:nth-child(1)') }
+
+  before do
+    stub_feature_flags(graphql_board_lists: false)
+    stub_licensed_features(multiple_issue_assignees: true)
+
+    project.add_maintainer(user)
+    project.team.add_developer(user2)
+
+    sign_in user
+
+    visit project_board_path(project, board)
+    wait_for_requests
+  end
+
+  context 'assignee' do
+    it 'updates the issues assignee' do
+      click_card(card2)
+
+      page.within('.assignee') do
+        click_button('Edit')
+        wait_for_requests
+
+        assignee = first('.gl-avatar-labeled').find('.gl-avatar-labeled-label').text
+
+        page.within('.dropdown-menu-user') do
+          first('.gl-avatar-labeled').click
+        end
+
+        click_button('Apply')
+        wait_for_requests
+
+        expect(page).to have_content(assignee)
+      end
+
+      expect(card2).to have_selector('.avatar')
+    end
+
+    it 'adds multiple assignees' do
+      click_card(card1)
+
+      page.within('.assignee') do
+        click_button('Edit')
+        wait_for_requests
+
+        assignee = all('.gl-avatar-labeled')[1].find('.gl-avatar-labeled-label').text
+
+        page.within('.dropdown-menu-user') do
+          find('[data-testid="unassign"]').click
+
+          all('.gl-avatar-labeled')[0].click
+          all('.gl-avatar-labeled')[1].click
+        end
+
+        click_button('Apply')
+        wait_for_requests
+
+        aggregate_failures do
+          expect(page).to have_link(nil, title: user.name)
+          expect(page).to have_link(nil, title: assignee)
+        end
+      end
+
+      expect(card1.all('.avatar').length).to eq(2)
+    end
+
+    it 'removes the assignee' do
+      click_card(card1)
+
+      page.within('.assignee') do
+        click_button('Edit')
+
+        page.within('.dropdown-menu-user') do
+          find('[data-testid="unassign"]').click
+        end
+
+        click_button('Apply')
+
+        expect(page).to have_content('None')
+      end
+
+      expect(card1).not_to have_selector('.avatar')
+    end
+
+    it 'assignees to current user' do
+      click_card(card2)
+
+      page.within('.assignee') do
+        expect(page).to have_content('None')
+
+        click_button 'assign yourself'
+
+        wait_for_requests
+
+        expect(page).to have_content(user.name)
+      end
+
+      expect(card2).to have_selector('.avatar')
+    end
+
+    it 'updates assignee dropdown' do
+      click_card(card2)
+
+      page.within('.assignee') do
+        click_button('Edit')
+        wait_for_requests
+
+        assignee = first('.gl-avatar-labeled').find('.gl-avatar-labeled-label').text
+
+        page.within('.dropdown-menu-user') do
+          first('.gl-avatar-labeled').click
+        end
+
+        click_button('Apply')
+        wait_for_requests
+
+        expect(page).to have_content(assignee)
+      end
+
+      click_card(card1)
+
+      page.within('.assignee') do
+        click_button('Edit')
+
+        expect(find('.dropdown-menu')).to have_selector('.gl-new-dropdown-item-check-icon')
+      end
+    end
+  end
+
+  context 'epic' do
+    before do
+      stub_licensed_features(epics: true)
+      group.add_owner(user)
+
+      visit project_board_path(project, board)
+      wait_for_requests
+    end
+
+    context 'when the issue is not associated with an epic' do
+      it 'displays `None` for value of epic' do
+        click_card(card1)
+
+        expect(find('.js-epic-label').text).to have_content('None')
+      end
+    end
+
+    context 'when the issue is associated with an epic' do
+      let(:epic1)         { create(:epic, group: group, title: 'Foo') }
+      let!(:epic2)        { create(:epic, group: group, title: 'Bar') }
+      let!(:epic_issue)   { create(:epic_issue, issue: issue1, epic: epic1) }
+
+      it 'displays name of epic and links to it' do
+        click_card(card1)
+
+        expect(find('.js-epic-label')).to have_link(epic1.title, href: epic_path(epic1))
+      end
+
+      it 'updates the epic associated with the issue' do
+        click_card(card1)
+
+        page.within('.js-epic-block') do
+          page.find('.sidebar-dropdown-toggle').click
+          wait_for_requests
+
+          find('.gl-new-dropdown-item', text: epic2.title).click
+          wait_for_requests
+
+          expect(page.find('.value')).to have_content(epic2.title)
+        end
+
+        # Ensure that boards_store is also updated the epic associated with the issue.
+        click_card(card1)
+
+        click_card(card1)
+
+        expect(find('.js-epic-label')).to have_content(epic2.title)
+      end
+    end
+  end
+
+  context 'weight' do
+    it 'displays weight async' do
+      click_card(card1)
+
+      expect(find('.js-weight-weight-label').text).to have_content(issue1.weight)
+    end
+
+    it 'updates weight in sidebar to 1' do
+      click_card(card1)
+
+      page.within '.weight' do
+        click_link 'Edit'
+        find('.block.weight input').send_keys 1, :enter
+
+        page.within '.value' do
+          expect(page).to have_content '1'
+        end
+      end
+
+      # Ensure the request was sent and things are persisted
+      visit project_board_path(project, board)
+      wait_for_requests
+
+      click_card(card1)
+
+      page.within '.weight .value' do
+        expect(page).to have_content '1'
+      end
+    end
+
+    it 'updates weight in sidebar to no weight' do
+      click_card(card1)
+
+      page.within '.weight' do
+        click_link 'remove weight'
+
+        page.within '.value' do
+          expect(page).to have_content 'None'
+        end
+      end
+
+      # Ensure the request was sent and things are persisted
+      visit project_board_path(project, board)
+      wait_for_requests
+
+      click_card(card1)
+
+      page.within '.weight .value' do
+        expect(page).to have_content 'None'
+      end
+    end
+
+    context 'unlicensed' do
+      before do
+        stub_licensed_features(issue_weights: false)
+        visit project_board_path(project, board)
+        wait_for_requests
+      end
+
+      it 'hides weight' do
+        click_card(card1)
+
+        expect(page).not_to have_selector('.js-weight-weight-label')
+      end
+    end
+  end
+
+  context 'scoped labels' do
+    before do
+      stub_licensed_features(scoped_labels: true)
+
+      visit project_board_path(project, board)
+      wait_for_requests
+    end
+
+    it 'adds multiple scoped labels' do
+      click_card(card1)
+
+      page.within('.labels') do
+        click_link 'Edit'
+
+        wait_for_requests
+
+        click_link scoped_label_1.title
+
+        wait_for_requests
+
+        click_link scoped_label_2.title
+
+        wait_for_requests
+
+        find('.dropdown-menu-close-icon').click
+
+        page.within('.value') do
+          aggregate_failures do
+            expect(page).to have_selector('.gl-label-scoped', count: 2)
+            expect(page).to have_content(scoped_label_1.scoped_label_key)
+            expect(page).to have_content(scoped_label_1.scoped_label_value)
+            expect(page).to have_content(scoped_label_2.scoped_label_key)
+            expect(page).to have_content(scoped_label_2.scoped_label_value)
+          end
+        end
+      end
+    end
+
+    context 'with scoped label assigned' do
+      let!(:issue3) { create(:labeled_issue, project: project, labels: [development, scoped_label_1, scoped_label_2], relative_position: 3) }
+      let(:card3) { find('.board:nth-child(2)').find('.board-card:nth-child(1)') }
+
+      before do
+        stub_licensed_features(scoped_labels: true)
+
+        visit project_board_path(project, board)
+        wait_for_requests
+      end
+
+      it 'removes existing scoped label' do
+        click_card(card3)
+
+        page.within('.labels') do
+          click_link 'Edit'
+
+          wait_for_requests
+
+          click_link scoped_label_2.title
+
+          wait_for_requests
+
+          find('.dropdown-menu-close-icon').click
+
+          page.within('.value') do
+            aggregate_failures do
+              expect(page).to have_selector('.gl-label-scoped', count: 1)
+              expect(page).not_to have_content(scoped_label_1.scoped_label_value)
+              expect(page).to have_content(scoped_label_2.scoped_label_key)
+              expect(page).to have_content(scoped_label_2.scoped_label_value)
+            end
+          end
+        end
+
+        aggregate_failures do
+          expect(card3).to have_selector('.gl-label-scoped', count: 1)
+          expect(card3).not_to have_content(scoped_label_1.scoped_label_key)
+          expect(card3).not_to have_content(scoped_label_1.scoped_label_value)
+          expect(card3).to have_content(scoped_label_2.scoped_label_key)
+          expect(card3).to have_content(scoped_label_2.scoped_label_value)
+        end
+      end
+    end
+  end
+
+  context 'when opening sidebars' do
+    let(:settings_button) { find('.js-board-settings-button') }
+
+    it 'closes card sidebar when opening settings sidebar' do
+      click_card(card1)
+
+      expect(page).to have_selector('.right-sidebar')
+
+      settings_button.click
+
+      expect(page).to have_selector('.js-board-settings-sidebar')
+      expect(page).not_to have_selector('.right-sidebar')
+    end
+
+    it 'closes settings sidebar when opening card sidebar' do
+      settings_button.click
+
+      expect(page).to have_selector('.js-board-settings-sidebar')
+
+      click_card(card1)
+
+      expect(page).to have_selector('.right-sidebar')
+      expect(page).not_to have_selector('.js-board-settings-sidebar')
+    end
+  end
+end

ee/spec/features/boards/sidebar_spec.rb

@@ -5,24 +5,31 @@ require 'spec_helper'
 RSpec.describe 'Issue Boards', :js do
   include BoardHelpers
 
-  let(:user)         { create(:user) }
-  let(:user2)        { create(:user) }
-  let(:group)        { create(:group) }
-  let(:project)      { create(:project, :public, group: group) }
-  let!(:milestone)   { create(:milestone, project: project) }
-  let!(:development) { create(:label, project: project, name: 'Development') }
-  let!(:stretch)     { create(:label, project: project, name: 'Stretch') }
-  let!(:issue1)      { create(:labeled_issue, project: project, assignees: [user], milestone: milestone, labels: [development], weight: 3, relative_position: 2) }
-  let!(:issue2)      { create(:labeled_issue, project: project, labels: [development, stretch], relative_position: 1) }
-  let!(:scoped_label_1) { create(:label, project: project, name: 'Scoped1::Label1') }
-  let!(:scoped_label_2) { create(:label, project: project, name: 'Scoped2::Label2') }
-  let(:board)        { create(:board, project: project) }
-  let!(:list)        { create(:list, board: board, label: development, position: 0) }
+  let_it_be(:user)         { create(:user) }
+  let_it_be(:user2)        { create(:user) }
+
+  let_it_be(:group)        { create(:group) }
+  let_it_be(:project)      { create(:project, :public, group: group) }
+
+  let_it_be(:milestone)    { create(:milestone, project: project) }
+  let_it_be(:development)  { create(:label, project: project, name: 'Development') }
+  let_it_be(:stretch)      { create(:label, project: project, name: 'Stretch') }
+  let_it_be(:scoped_label_1) { create(:label, project: project, name: 'Scoped1::Label1') }
+  let_it_be(:scoped_label_2) { create(:label, project: project, name: 'Scoped2::Label2') }
+
+  let_it_be(:issue1)       { create(:labeled_issue, project: project, assignees: [user], milestone: milestone, labels: [development], weight: 3, relative_position: 2) }
+  let_it_be(:issue2)       { create(:labeled_issue, project: project, labels: [development, stretch], relative_position: 1) }
+  let_it_be(:epic1) { create(:epic, group: group, title: 'Foo') }
+  let_it_be(:epic2) { create(:epic, group: group, title: 'Bar') }
+  let_it_be(:epic_issue) { create(:epic_issue, issue: issue2, epic: epic1) }
+
+  let_it_be(:board)        { create(:board, project: project) }
+  let_it_be(:list)         { create(:list, board: board, label: development, position: 0) }
+
   let(:card1) { find('.board:nth-child(2)').find('.board-card:nth-child(2)') }
   let(:card2) { find('.board:nth-child(2)').find('.board-card:nth-child(1)') }
 
   before do
-    stub_feature_flags(graphql_board_lists: false)
     stub_licensed_features(multiple_issue_assignees: true)
 
     project.add_maintainer(user)
@@ -30,15 +37,16 @@ RSpec.describe 'Issue Boards', :js do
 
     sign_in user
 
-    visit project_board_path(project, board)
-    wait_for_requests
+    visit_project_board
   end
 
   context 'assignee' do
+    let(:assignee_widget) { '[data-testid="issue-boards-sidebar"] [data-testid="assignees-widget"]' }
+
     it 'updates the issues assignee' do
       click_card(card2)
 
-      page.within('.assignee') do
+      page.within(assignee_widget) do
         click_button('Edit')
         wait_for_requests
 
@@ -60,7 +68,7 @@ RSpec.describe 'Issue Boards', :js do
     it 'adds multiple assignees' do
       click_card(card1)
 
-      page.within('.assignee') do
+      page.within(assignee_widget) do
         click_button('Edit')
         wait_for_requests
 
@@ -76,9 +84,11 @@ RSpec.describe 'Issue Boards', :js do
         click_button('Apply')
         wait_for_requests
 
+        aggregate_failures do
           expect(page).to have_link(nil, title: user.name)
           expect(page).to have_link(nil, title: assignee)
         end
+      end
 
       expect(card1.all('.avatar').length).to eq(2)
     end
@@ -86,7 +96,7 @@ RSpec.describe 'Issue Boards', :js do
     it 'removes the assignee' do
       click_card(card1)
 
-      page.within('.assignee') do
+      page.within(assignee_widget) do
         click_button('Edit')
         wait_for_requests
 
@@ -106,9 +116,7 @@ RSpec.describe 'Issue Boards', :js do
     it 'assignees to current user' do
       click_card(card2)
 
-      wait_for_requests
-
-      page.within(find('.assignee')) do
+      page.within(assignee_widget) do
         expect(page).to have_content('None')
 
         click_button 'assign yourself'
@@ -124,7 +132,7 @@ RSpec.describe 'Issue Boards', :js do
     it 'updates assignee dropdown' do
       click_card(card2)
 
-      page.within('.assignee') do
+      page.within(assignee_widget) do
         click_button('Edit')
         wait_for_requests
 
@@ -140,11 +148,9 @@ RSpec.describe 'Issue Boards', :js do
         expect(page).to have_content(assignee)
       end
 
-      page.within(find('.board:nth-child(2)')) do
-        find('.board-card:nth-child(2)').click
-      end
+      click_card(card1)
 
-      page.within('.assignee') do
+      page.within(assignee_widget) do
         click_button('Edit')
 
         expect(find('.dropdown-menu')).to have_selector('.gl-new-dropdown-item-check-icon')
@@ -153,134 +159,102 @@ RSpec.describe 'Issue Boards', :js do
   end
 
   context 'epic' do
+    let(:epic_widget) { find('[data-testid="sidebar-epic"]') }
+
     before do
       stub_licensed_features(epics: true)
       group.add_owner(user)
 
-      visit project_board_path(project, board)
-      wait_for_requests
+      visit_project_board
     end
 
     context 'when the issue is not associated with an epic' do
       it 'displays `None` for value of epic' do
         click_card(card1)
-        wait_for_requests
 
-        expect(find('.js-epic-label').text).to have_content('None')
+        expect(epic_widget.text).to have_content('None')
       end
     end
 
     context 'when the issue is associated with an epic' do
-      let(:epic1)         { create(:epic, group: group, title: 'Foo') }
-      let!(:epic2)        { create(:epic, group: group, title: 'Bar') }
-      let!(:epic_issue)   { create(:epic_issue, issue: issue1, epic: epic1) }
-
       it 'displays name of epic and links to it' do
-        click_card(card1)
-        wait_for_requests
+        click_card(card2)
 
-        expect(find('.js-epic-label')).to have_link(epic1.title, href: epic_path(epic1))
+        expect(epic_widget).to have_link(epic1.title, href: epic_path(epic1))
       end
 
       it 'updates the epic associated with the issue' do
-        click_card(card1)
-        wait_for_requests
+        click_card(card2)
 
-        page.within(find('.js-epic-block')) do
-          page.find('.sidebar-dropdown-toggle').click
+        within(epic_widget) do
+          click_button 'Edit'
           wait_for_requests
 
           find('.gl-new-dropdown-item', text: epic2.title).click
           wait_for_requests
 
-          expect(page.find('.value')).to have_content(epic2.title)
+          expect(page).to have_content(epic2.title)
         end
-
-        # Ensure that boards_store is also updated the epic associated with the issue.
-        click_card(card1)
-        wait_for_requests
-
-        click_card(card1)
-        wait_for_requests
-
-        expect(find('.js-epic-label')).to have_content(epic2.title)
       end
     end
   end
 
   context 'weight' do
+    let(:weight_widget) { find('[data-testid="sidebar-weight"]') }
+    let(:weight_value) { find('[data-testid="sidebar-weight"] .value') }
+
     it 'displays weight async' do
       click_card(card1)
-      wait_for_requests
 
-      expect(find('.js-weight-weight-label').text).to have_content(issue1.weight)
+      expect(weight_value).to have_content(issue1.weight)
     end
 
     it 'updates weight in sidebar to 1' do
       click_card(card1)
-      wait_for_requests
-
-      page.within '.weight' do
-        click_link 'Edit'
-        find('.block.weight input').send_keys 1, :enter
 
-        page.within '.value' do
-          expect(page).to have_content '1'
-        end
+      within weight_widget do
+        click_button 'Edit'
+        find('.weight input').send_keys 1, :enter
       end
 
+      expect(weight_value).to have_content '1'
+
       # Ensure the request was sent and things are persisted
-      visit project_board_path(project, board)
-      wait_for_requests
+      visit_project_board
 
       click_card(card1)
-      wait_for_requests
 
-      page.within '.weight' do
-        page.within '.value' do
-          expect(page).to have_content '1'
-        end
-      end
+      expect(weight_value).to have_content '1'
     end
 
     it 'updates weight in sidebar to no weight' do
       click_card(card1)
-      wait_for_requests
-
-      page.within '.weight' do
-        click_link 'remove weight'
 
-        page.within '.value' do
-          expect(page).to have_content 'None'
-        end
+      within weight_widget do
+        click_button 'remove weight'
       end
 
+      expect(weight_value).to have_content 'None'
+
       # Ensure the request was sent and things are persisted
-      visit project_board_path(project, board)
-      wait_for_requests
+      visit_project_board
 
       click_card(card1)
-      wait_for_requests
 
-      page.within '.weight' do
-        page.within '.value' do
-          expect(page).to have_content 'None'
-        end
-      end
+      expect(weight_value).to have_content 'None'
     end
 
     context 'unlicensed' do
       before do
         stub_licensed_features(issue_weights: false)
-        visit project_board_path(project, board)
-        wait_for_requests
+
+        visit_project_board
       end
 
       it 'hides weight' do
         click_card(card1)
-        wait_for_requests
 
-        expect(page).not_to have_selector('.js-weight-weight-label')
+        expect(page).not_to have_selector('[data-testid="sidebar-weight"]')
       end
     end
   end
@@ -289,15 +263,14 @@ RSpec.describe 'Issue Boards', :js do
     before do
       stub_licensed_features(scoped_labels: true)
 
-      visit project_board_path(project, board)
-      wait_for_requests
+      visit_project_board
     end
 
     it 'adds multiple scoped labels' do
       click_card(card1)
 
-      page.within('.labels') do
-        click_link 'Edit'
+      page.within('[data-testid="sidebar-labels"]') do
+        click_button 'Edit'
 
         wait_for_requests
 
@@ -309,9 +282,10 @@ RSpec.describe 'Issue Boards', :js do
 
         wait_for_requests
 
-        find('.dropdown-menu-close-icon').click
+        find('[data-testid="close-icon"]').click
 
         page.within('.value') do
+          aggregate_failures do
             expect(page).to have_selector('.gl-label-scoped', count: 2)
             expect(page).to have_content(scoped_label_1.scoped_label_key)
             expect(page).to have_content(scoped_label_1.scoped_label_value)
@@ -320,24 +294,23 @@ RSpec.describe 'Issue Boards', :js do
           end
         end
       end
+    end
 
     context 'with scoped label assigned' do
       let!(:issue3) { create(:labeled_issue, project: project, labels: [development, scoped_label_1, scoped_label_2], relative_position: 3) }
-      let(:board) { create(:board, project: project) }
       let(:card3) { find('.board:nth-child(2)').find('.board-card:nth-child(1)') }
 
       before do
         stub_licensed_features(scoped_labels: true)
 
-        visit project_board_path(project, board)
-        wait_for_requests
+        visit_project_board
       end
 
       it 'removes existing scoped label' do
         click_card(card3)
 
-        page.within('.labels') do
-          click_link 'Edit'
+        page.within('[data-testid="sidebar-labels"]') do
+          click_button 'Edit'
 
           wait_for_requests
 
@@ -345,16 +318,19 @@ RSpec.describe 'Issue Boards', :js do
 
           wait_for_requests
 
-          find('.dropdown-menu-close-icon').click
+          find('[data-testid="close-icon"]').click
 
           page.within('.value') do
+            aggregate_failures do
               expect(page).to have_selector('.gl-label-scoped', count: 1)
               expect(page).not_to have_content(scoped_label_1.scoped_label_value)
               expect(page).to have_content(scoped_label_2.scoped_label_key)
               expect(page).to have_content(scoped_label_2.scoped_label_value)
             end
           end
+        end
 
+        aggregate_failures do
           expect(card3).to have_selector('.gl-label-scoped', count: 1)
           expect(card3).not_to have_content(scoped_label_1.scoped_label_key)
           expect(card3).not_to have_content(scoped_label_1.scoped_label_value)
@@ -363,6 +339,7 @@ RSpec.describe 'Issue Boards', :js do
         end
       end
     end
+  end
 
   context 'when opening sidebars' do
     let(:settings_button) { find('.js-board-settings-button') }
@@ -370,12 +347,12 @@ RSpec.describe 'Issue Boards', :js do
     it 'closes card sidebar when opening settings sidebar' do
       click_card(card1)
 
-      expect(page).to have_selector('.right-sidebar')
+      expect(page).to have_selector('[data-testid="issue-boards-sidebar"]')
 
       settings_button.click
 
       expect(page).to have_selector('.js-board-settings-sidebar')
-      expect(page).not_to have_selector('.right-sidebar')
+      expect(page).not_to have_selector('[data-testid="issue-boards-sidebar"]')
     end
 
     it 'closes settings sidebar when opening card sidebar' do
@@ -385,8 +362,13 @@ RSpec.describe 'Issue Boards', :js do
 
       click_card(card1)
 
-      expect(page).to have_selector('.right-sidebar')
+      expect(page).to have_selector('[data-testid="issue-boards-sidebar"]')
       expect(page).not_to have_selector('.js-board-settings-sidebar')
     end
   end
+
+  def visit_project_board
+    visit project_board_path(project, board)
+    wait_for_requests
+  end
 end

spec/support/helpers/board_helpers.rb

@@ -4,6 +4,7 @@ module BoardHelpers
   def click_card(card)
     within card do
       first('.board-card-number').click
+      wait_for_requests
     end
   end
 end