Commit ebe09147 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'ss/fix-epic-board-count' into 'master'

Fix filter count on epic board lists

See merge request gitlab-org/gitlab!63458
parents d0e635a0 71a0f073
#import "./epic_board_list.fragment.graphql" #import "./epic_board_list.fragment.graphql"
query ListEpics($fullPath: ID!, $boardId: BoardsEpicBoardID!) { query ListEpics($fullPath: ID!, $boardId: BoardsEpicBoardID!, $filters: EpicFilters) {
group(fullPath: $fullPath) { group(fullPath: $fullPath) {
board: epicBoard(id: $boardId) { board: epicBoard(id: $boardId) {
lists { lists(epicFilters: $filters) {
nodes { nodes {
...EpicBoardListFragment ...EpicBoardListFragment
} }
......
...@@ -249,6 +249,7 @@ RSpec.describe 'epic boards', :js do ...@@ -249,6 +249,7 @@ RSpec.describe 'epic boards', :js do
wait_for_requests wait_for_requests
expect(list_header(label_list)).to have_content('0')
expect(page).not_to have_content('Epic1') expect(page).not_to have_content('Epic1')
expect(page).to have_content('Epic2') expect(page).to have_content('Epic2')
expect(page).to have_content('Epic3') expect(page).to have_content('Epic3')
...@@ -265,6 +266,7 @@ RSpec.describe 'epic boards', :js do ...@@ -265,6 +266,7 @@ RSpec.describe 'epic boards', :js do
wait_for_requests wait_for_requests
expect(list_header(label_list)).to have_content('1')
expect(page).to have_content('Epic1') expect(page).to have_content('Epic1')
expect(page).not_to have_content('Epic2') expect(page).not_to have_content('Epic2')
expect(page).not_to have_content('Epic3') expect(page).not_to have_content('Epic3')
...@@ -281,6 +283,7 @@ RSpec.describe 'epic boards', :js do ...@@ -281,6 +283,7 @@ RSpec.describe 'epic boards', :js do
wait_for_requests wait_for_requests
expect(list_header(label_list)).to have_content('1')
expect(page).to have_content('Epic1') expect(page).to have_content('Epic1')
expect(page).not_to have_content('Epic2') expect(page).not_to have_content('Epic2')
expect(page).not_to have_content('Epic3') expect(page).not_to have_content('Epic3')
...@@ -297,6 +300,7 @@ RSpec.describe 'epic boards', :js do ...@@ -297,6 +300,7 @@ RSpec.describe 'epic boards', :js do
wait_for_requests wait_for_requests
expect(list_header(label_list)).to have_content('0')
expect(page).not_to have_content('Epic1') expect(page).not_to have_content('Epic1')
expect(page).to have_content('Epic2') expect(page).to have_content('Epic2')
expect(page).to have_content('Epic3') expect(page).to have_content('Epic3')
...@@ -311,6 +315,7 @@ RSpec.describe 'epic boards', :js do ...@@ -311,6 +315,7 @@ RSpec.describe 'epic boards', :js do
wait_for_requests wait_for_requests
expect(list_header(label_list)).to have_content('1')
expect(page).to have_content('Epic1') expect(page).to have_content('Epic1')
expect(page).not_to have_content('Epic2') expect(page).not_to have_content('Epic2')
expect(page).not_to have_content('Epic3') expect(page).not_to have_content('Epic3')
......
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