diff options
Diffstat (limited to 'spec/features/boards')
-rw-r--r-- | spec/features/boards/boards_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/boards/sidebar_spec.rb | 44 |
2 files changed, 30 insertions, 22 deletions
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb index b3cc2eb418d..2d6b669f28b 100644 --- a/spec/features/boards/boards_spec.rb +++ b/spec/features/boards/boards_spec.rb @@ -13,12 +13,14 @@ RSpec.describe 'Issue Boards', :js do let_it_be(:user2) { create(:user) } before do + stub_feature_flags(board_new_list: false) + project.add_maintainer(user) project.add_maintainer(user2) - set_cookie('sidebar_collapsed', 'true') - sign_in(user) + + set_cookie('sidebar_collapsed', 'true') end context 'no lists' do @@ -573,7 +575,7 @@ RSpec.describe 'Issue Boards', :js do end it 'shows the button' do - expect(page).to have_link('Toggle focus mode') + expect(page).to have_button('Toggle focus mode') end end diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb index 2af5b787a78..08bc70d7116 100644 --- a/spec/features/boards/sidebar_spec.rb +++ b/spec/features/boards/sidebar_spec.rb @@ -107,17 +107,20 @@ RSpec.describe 'Issue Boards', :js do click_card(card) page.within('.assignee') do - click_link 'Edit' + click_button('Edit') wait_for_requests - page.within('.dropdown-menu-user') do - click_link user.name + assignee = first('.gl-avatar-labeled').find('.gl-avatar-labeled-label').text - wait_for_requests + page.within('.dropdown-menu-user') do + first('.gl-avatar-labeled').click end - expect(page).to have_content(user.name) + click_button('Edit') + wait_for_requests + + expect(page).to have_content(assignee) end expect(card).to have_selector('.avatar') @@ -128,15 +131,15 @@ RSpec.describe 'Issue Boards', :js do click_card(card_two) page.within('.assignee') do - click_link 'Edit' + click_button('Edit') wait_for_requests page.within('.dropdown-menu-user') do - click_link 'Unassigned' + find('[data-testid="unassign"]').click end - close_dropdown_menu_if_visible + click_button('Edit') wait_for_requests expect(page).to have_content('None') @@ -165,17 +168,20 @@ RSpec.describe 'Issue Boards', :js do click_card(card) page.within('.assignee') do - click_link 'Edit' + click_button('Edit') wait_for_requests - page.within('.dropdown-menu-user') do - click_link user.name + assignee = first('.gl-avatar-labeled').find('.gl-avatar-labeled-label').text - wait_for_requests + page.within('.dropdown-menu-user') do + first('.gl-avatar-labeled').click end - expect(page).to have_content(user.name) + click_button('Edit') + wait_for_requests + + expect(page).to have_content(assignee) end page.within(find('.board:nth-child(2)')) do @@ -183,9 +189,9 @@ RSpec.describe 'Issue Boards', :js do end page.within('.assignee') do - click_link 'Edit' + click_button('Edit') - expect(find('.dropdown-menu')).to have_selector('.is-active') + expect(find('.dropdown-menu')).to have_selector('.gl-new-dropdown-item-check-icon') end end end @@ -411,10 +417,10 @@ RSpec.describe 'Issue Boards', :js do wait_for_requests page.within('.subscriptions') do - find('.js-issuable-subscribe-button button:not(.is-checked)').click + find('[data-testid="subscription-toggle"] button:not(.is-checked)').click wait_for_requests - expect(page).to have_css('.js-issuable-subscribe-button button.is-checked') + expect(page).to have_css('[data-testid="subscription-toggle"] button.is-checked') end end @@ -427,10 +433,10 @@ RSpec.describe 'Issue Boards', :js do wait_for_requests page.within('.subscriptions') do - find('.js-issuable-subscribe-button button.is-checked').click + find('[data-testid="subscription-toggle"] button.is-checked').click wait_for_requests - expect(page).to have_css('.js-issuable-subscribe-button button:not(.is-checked)') + expect(page).to have_css('[data-testid="subscription-toggle"] button:not(.is-checked)') end end end |