diff options
Diffstat (limited to 'spec/features/boards/board_filters_spec.rb')
| -rw-r--r-- | spec/features/boards/board_filters_spec.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/spec/features/boards/board_filters_spec.rb b/spec/features/boards/board_filters_spec.rb index 49375e4b37b..e37bf515088 100644 --- a/spec/features/boards/board_filters_spec.rb +++ b/spec/features/boards/board_filters_spec.rb @@ -7,15 +7,15 @@ RSpec.describe 'Issue board filters', :js do let_it_be(:user) { create(:user) } let_it_be(:board) { create(:board, project: project) } let_it_be(:project_label) { create(:label, project: project, title: 'Label') } - let_it_be(:milestone_1) { create(:milestone, project: project) } - let_it_be(:milestone_2) { create(:milestone, project: project) } + let_it_be(:milestone_1) { create(:milestone, project: project, due_date: 3.days.from_now ) } + let_it_be(:milestone_2) { create(:milestone, project: project, due_date: Date.tomorrow ) } let_it_be(:release) { create(:release, tag: 'v1.0', project: project, milestones: [milestone_1]) } let_it_be(:release_2) { create(:release, tag: 'v2.0', project: project, milestones: [milestone_2]) } let_it_be(:issue_1) { create(:issue, project: project, milestone: milestone_1, author: user) } let_it_be(:issue_2) { create(:labeled_issue, project: project, milestone: milestone_2, assignees: [user], labels: [project_label], confidential: true) } let_it_be(:award_emoji1) { create(:award_emoji, name: 'thumbsup', user: user, awardable: issue_1) } - let(:filtered_search) { find('[data-testid="issue_1-board-filtered-search"]') } + let(:filtered_search) { find('[data-testid="issue-board-filtered-search"]') } let(:filter_input) { find('.gl-filtered-search-term-input')} let(:filter_dropdown) { find('.gl-filtered-search-suggestion-list') } let(:filter_first_suggestion) { find('.gl-filtered-search-suggestion-list').first('.gl-filtered-search-suggestion') } @@ -134,8 +134,11 @@ RSpec.describe 'Issue board filters', :js do expect(filter_dropdown).to have_content('Any') expect(filter_dropdown).to have_content('Started') expect(filter_dropdown).to have_content('Upcoming') - expect(filter_dropdown).to have_content(milestone_1.title) - expect(filter_dropdown).to have_content(milestone_2.title) + + dropdown_nodes = page.find_all('.gl-filtered-search-suggestion-list > .gl-filtered-search-suggestion') + + expect(dropdown_nodes[4]).to have_content(milestone_2.title) + expect(dropdown_nodes.last).to have_content(milestone_1.title) click_on milestone_1.title filter_submit.click |