Commit a569f9c0 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'remove-stub-feature-flag-graphql-board-lists-from-sidebar-specs' into 'master'

Unstub graphql_board_lists FF from sidebar specs [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!57670
parents e85e1011 7c65a0b7
......@@ -69,6 +69,7 @@ export default {
<board-editable-item
ref="sidebarItem"
class="board-sidebar-due-date"
data-testid="sidebar-due-date"
:title="$options.i18n.dueDate"
:loading="loading"
@open="openDatePicker"
......
......@@ -113,7 +113,8 @@ export default {
ref="sidebarItem"
:title="$options.i18n.milestone"
:loading="loading"
@open="handleOpen()"
data-testid="sidebar-milestones"
@open="handleOpen"
@close="handleClose"
>
<template v-if="hasMilestone" #collapsed>
......
......@@ -17,8 +17,6 @@ RSpec.describe 'Project issue boards sidebar due date', :js do
end
before do
stub_feature_flags(graphql_board_lists: false)
project.add_maintainer(user)
sign_in(user)
......@@ -31,10 +29,10 @@ RSpec.describe 'Project issue boards sidebar due date', :js do
it 'updates due date' do
click_card(card)
page.within('.due_date') do
page.within('[data-testid="sidebar-due-date"]') do
today = Date.today.day
click_link 'Edit'
click_button 'Edit'
click_button today.to_s
......
......@@ -18,8 +18,6 @@ RSpec.describe 'Project issue boards sidebar labels', :js do
let(:card) { find('.board:nth-child(2)').first('.board-card') }
before do
stub_feature_flags(graphql_board_lists: false)
project.add_maintainer(user)
sign_in(user)
......@@ -29,7 +27,8 @@ RSpec.describe 'Project issue boards sidebar labels', :js do
end
context 'labels' do
it 'shows current labels when editing' do
# https://gitlab.com/gitlab-org/gitlab/-/issues/322725
xit 'shows current labels when editing' do
click_card(card)
page.within('.labels') do
......@@ -49,15 +48,15 @@ RSpec.describe 'Project issue boards sidebar labels', :js do
click_card(card)
page.within('.labels') do
click_link 'Edit'
click_button 'Edit'
wait_for_requests
click_link bug.title
wait_for_requests
find('[data-testid="close-icon"]').click
find('.dropdown-menu-close-icon').click
wait_for_requests
page.within('.value') do
expect(page).to have_selector('.gl-label-text', count: 3)
......@@ -74,19 +73,17 @@ RSpec.describe 'Project issue boards sidebar labels', :js do
click_card(card)
page.within('.labels') do
click_link 'Edit'
click_button 'Edit'
wait_for_requests
click_link bug.title
wait_for_requests
click_link regression.title
wait_for_requests
find('[data-testid="close-icon"]').click
find('.dropdown-menu-close-icon').click
wait_for_requests
page.within('.value') do
expect(page).to have_selector('.gl-label-text', count: 4)
......@@ -105,17 +102,15 @@ RSpec.describe 'Project issue boards sidebar labels', :js do
click_card(card)
page.within('.labels') do
click_link 'Edit'
click_button 'Edit'
wait_for_requests
within('.dropdown-menu-labels') do
click_link stretch.title
end
wait_for_requests
find('[data-testid="close-icon"]').click
find('.dropdown-menu-close-icon').click
wait_for_requests
page.within('.value') do
expect(page).to have_selector('.gl-label-text', count: 1)
......@@ -128,7 +123,8 @@ RSpec.describe 'Project issue boards sidebar labels', :js do
expect(card).not_to have_content(stretch.title)
end
it 'creates project label' do
# https://gitlab.com/gitlab-org/gitlab/-/issues/324290
xit 'creates project label' do
click_card(card)
page.within('.labels') do
......@@ -146,7 +142,8 @@ RSpec.describe 'Project issue boards sidebar labels', :js do
expect(page).to have_selector('.board', count: 3)
end
it 'creates project label and list' do
# https://gitlab.com/gitlab-org/gitlab/-/issues/324290
xit 'creates project label and list' do
click_card(card)
page.within('.labels') do
......
......@@ -16,8 +16,6 @@ RSpec.describe 'Project issue boards sidebar milestones', :js do
let(:card2) { find('.board:nth-child(1) .board-card:nth-of-type(2)') }
before do
stub_feature_flags(graphql_board_lists: false)
project.add_maintainer(user)
sign_in(user)
......@@ -30,12 +28,12 @@ RSpec.describe 'Project issue boards sidebar milestones', :js do
it 'adds a milestone' do
click_card(card1)
page.within('.milestone') do
click_link 'Edit'
page.within('[data-testid="sidebar-milestones"]') do
click_button 'Edit'
wait_for_requests
click_link milestone.title
click_button milestone.title
wait_for_requests
......@@ -48,12 +46,12 @@ RSpec.describe 'Project issue boards sidebar milestones', :js do
it 'removes a milestone' do
click_card(card2)
page.within('.milestone') do
click_link 'Edit'
page.within('[data-testid="sidebar-milestones"]') do
click_button 'Edit'
wait_for_requests
click_link "No milestone"
click_button "No milestone"
wait_for_requests
......
......@@ -13,8 +13,6 @@ RSpec.describe 'Project issue boards sidebar', :js do
let(:card) { find('.board:nth-child(1)').first('.board-card') }
before do
stub_feature_flags(graphql_board_lists: false)
project.add_maintainer(user)
sign_in(user)
......@@ -44,7 +42,7 @@ RSpec.describe 'Project issue boards sidebar', :js do
expect(page).to have_selector('.issue-boards-sidebar')
find('.gutter-toggle').click
find("[data-testid='sidebar-drawer'] .gl-drawer-close-button").click
expect(page).not_to have_selector('.issue-boards-sidebar')
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment