[CE backport] Fix usages of boards dropdown

1fbe1455 · Michael Kozono · Douglas Barbosa Alexandre · c51c57d0 · 1fbe1455
--- a/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
+++ b/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
 # frozen_string_literal: true

 shared_examples_for 'multiple issue boards' do
-  dropdown_selector = '.js-boards-selector .dropdown-menu'
-
  context 'authorized user' do
    before do
      parent.add_maintainer(user)
@@ -20,18 +18,14 @@
    end

    it 'shows a list of boards' do
-      click_button board.name
-
-      page.within(dropdown_selector) do
+      in_boards_switcher_dropdown do
        expect(page).to have_content(board.name)
        expect(page).to have_content(board2.name)
      end
    end

    it 'switches current board' do
-      click_button board.name
-
-      page.within(dropdown_selector) do
+      in_boards_switcher_dropdown do
        click_link board2.name
      end

@@ -43,9 +37,7 @@
    end

    it 'creates new board without detailed configuration' do
-      click_button board.name
-
-      page.within(dropdown_selector) do
+      in_boards_switcher_dropdown do
        click_button 'Create new board'
      end

@@ -57,28 +49,23 @@
    end

    it 'deletes board' do
-      click_button board.name
-
-      wait_for_requests
-
-      page.within(dropdown_selector) do
+      in_boards_switcher_dropdown do
        click_button 'Delete board'
      end

      expect(page).to have_content('Are you sure you want to delete this board?')
      click_button 'Delete'

-      click_button board2.name
-      page.within(dropdown_selector) do
+      wait_for_requests
+
+      in_boards_switcher_dropdown do
        expect(page).not_to have_content(board.name)
        expect(page).to have_content(board2.name)
      end
    end

    it 'adds a list to the none default board' do
-      click_button board.name
-
-      page.within(dropdown_selector) do
+      in_boards_switcher_dropdown do
        click_link board2.name
      end

@@ -100,9 +87,7 @@

      expect(page).to have_selector('.board', count: 3)

-      click_button board2.name
-
-      page.within(dropdown_selector) do
+      in_boards_switcher_dropdown do
        click_link board.name
      end

@@ -114,9 +99,9 @@
    it 'maintains sidebar state over board switch' do
      assert_boards_nav_active

-      find('.boards-switcher').click
-      wait_for_requests
-      click_link board2.name
+      in_boards_switcher_dropdown do
+        click_link board2.name
+      end

      assert_boards_nav_active
    end
@@ -129,15 +114,24 @@
    end

    it 'does not show action links' do
-      click_button board.name
-
-      page.within(dropdown_selector) do
+      in_boards_switcher_dropdown do
        expect(page).not_to have_content('Create new board')
        expect(page).not_to have_content('Delete board')
      end
    end
  end

+  def in_boards_switcher_dropdown
+    find('.boards-switcher').click
+
+    wait_for_requests
+
+    dropdown_selector = '.js-boards-selector .dropdown-menu'
+    page.within(dropdown_selector) do
+      yield
+    end
+  end
+
  def assert_boards_nav_active
    expect(find('.nav-sidebar .active .active')).to have_selector('a', text: 'Boards')
  end