diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-31 18:10:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-31 18:10:29 +0300 |
commit | d7918f34666a538be467cb9db04630960e3659d3 (patch) | |
tree | a1e937ec7569d081a4382ca8d2ca9f6968e0a38f /spec/features | |
parent | a9ae162270049d3a183024e0b1f1626dbe14e847 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/boards/multi_select_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/boards/sidebar_labels_spec.rb | 3 | ||||
-rw-r--r-- | spec/features/boards/user_adds_lists_to_board_spec.rb | 17 | ||||
-rw-r--r-- | spec/features/groups/board_sidebar_spec.rb | 26 | ||||
-rw-r--r-- | spec/features/labels_hierarchy_spec.rb | 38 |
5 files changed, 7 insertions, 81 deletions
diff --git a/spec/features/boards/multi_select_spec.rb b/spec/features/boards/multi_select_spec.rb index 057464326fa..9148fb23214 100644 --- a/spec/features/boards/multi_select_spec.rb +++ b/spec/features/boards/multi_select_spec.rb @@ -43,12 +43,12 @@ RSpec.describe 'Multi Select Issue', :js do # Multi select drag&drop support is temporarily disabled # https://gitlab.com/gitlab-org/gitlab/-/issues/289797 - stub_feature_flags(graphql_board_lists: false, board_multi_select: project) + stub_feature_flags(board_multi_select: project) sign_in(user) end - context 'with lists' do + xcontext 'with lists' do let(:label1) { create(:label, project: project, name: 'Label 1', description: 'Test') } let(:label2) { create(:label, project: project, name: 'Label 2', description: 'Test') } let!(:list1) { create(:list, board: board, label: label1, position: 0) } diff --git a/spec/features/boards/sidebar_labels_spec.rb b/spec/features/boards/sidebar_labels_spec.rb index 2f0230c61d8..fa16f47f69a 100644 --- a/spec/features/boards/sidebar_labels_spec.rb +++ b/spec/features/boards/sidebar_labels_spec.rb @@ -5,8 +5,9 @@ require 'spec_helper' RSpec.describe 'Project issue boards sidebar labels', :js do include BoardHelpers + let_it_be(:group) { create(:group, :public) } let_it_be(:user) { create(:user) } - let_it_be(:project) { create(:project, :public) } + let_it_be(:project) { create(:project, :public, namespace: group) } let_it_be(:development) { create(:label, project: project, name: 'Development') } let_it_be(:bug) { create(:label, project: project, name: 'Bug') } let_it_be(:regression) { create(:label, project: project, name: 'Regression') } diff --git a/spec/features/boards/user_adds_lists_to_board_spec.rb b/spec/features/boards/user_adds_lists_to_board_spec.rb index 0db3fe12a3e..26c310a6f56 100644 --- a/spec/features/boards/user_adds_lists_to_board_spec.rb +++ b/spec/features/boards/user_adds_lists_to_board_spec.rb @@ -3,8 +3,6 @@ require 'spec_helper' RSpec.describe 'User adds lists', :js do - using RSpec::Parameterized::TableSyntax - let_it_be(:group) { create(:group, :nested) } let_it_be(:project) { create(:project, :public, namespace: group) } let_it_be(:group_board) { create(:board, group: group) } @@ -27,11 +25,8 @@ RSpec.describe 'User adds lists', :js do group.add_owner(user) end - where(:board_type, :graphql_board_lists_enabled) do - :project | true - :project | false - :group | true - :group | false + where(:board_type) do + [[:project], [:group]] end with_them do @@ -40,10 +35,6 @@ RSpec.describe 'User adds lists', :js do set_cookie('sidebar_collapsed', 'true') - stub_feature_flags( - graphql_board_lists: graphql_board_lists_enabled - ) - if board_type == :project visit project_board_path(project, project_board) elsif board_type == :group @@ -53,14 +44,12 @@ RSpec.describe 'User adds lists', :js do wait_for_all_requests end - it 'creates new column for label containing labeled issue' do + it 'creates new column for label containing labeled issue', :aggregate_failures do click_button 'Create list' wait_for_all_requests select_label(group_label) - wait_for_all_requests - expect(page).to have_selector('.board', text: group_label.title) expect(find('.board:nth-child(2) .board-card')).to have_content(issue.title) end diff --git a/spec/features/groups/board_sidebar_spec.rb b/spec/features/groups/board_sidebar_spec.rb index e2dd2fecab7..69a6788e438 100644 --- a/spec/features/groups/board_sidebar_spec.rb +++ b/spec/features/groups/board_sidebar_spec.rb @@ -42,30 +42,4 @@ RSpec.describe 'Group Issue Boards', :js do end end end - - context 'when graphql_board_lists FF disabled' do - before do - stub_feature_flags(graphql_board_lists: false) - sign_in(user) - - visit group_board_path(group, board) - wait_for_requests - end - - it 'only shows valid labels for the issue project and group' do - click_card(card) - - page.within('.labels') do - click_link 'Edit' - - wait_for_requests - - page.within('.selectbox') do - expect(page).to have_content(project_1_label.title) - expect(page).to have_content(group_label.title) - expect(page).not_to have_content(project_2_label.title) - end - end - end - end end diff --git a/spec/features/labels_hierarchy_spec.rb b/spec/features/labels_hierarchy_spec.rb index 378af53dd79..a9e695ad15b 100644 --- a/spec/features/labels_hierarchy_spec.rb +++ b/spec/features/labels_hierarchy_spec.rb @@ -214,44 +214,6 @@ RSpec.describe 'Labels Hierarchy', :js do end end - context 'issuable sidebar when graphql_board_lists FF disabled' do - let!(:issue) { create(:issue, project: project_1) } - - before do - stub_feature_flags(graphql_board_lists: false) - end - - context 'on project board issue sidebar' do - before do - project_1.add_developer(user) - board = create(:board, project: project_1) - - visit project_board_path(project_1, board) - - wait_for_requests - - find('.board-card').click - end - - it_behaves_like 'assigning labels from sidebar' - end - - context 'on group board issue sidebar' do - before do - parent.add_developer(user) - board = create(:board, group: parent) - - visit group_board_path(parent, board) - - wait_for_requests - - find('.board-card').click - end - - it_behaves_like 'assigning labels from sidebar' - end - end - context 'issuable filtering' do let!(:labeled_issue) { create(:labeled_issue, project: project_1, labels: [grandparent_group_label, parent_group_label, project_label_1]) } let!(:issue) { create(:issue, project: project_1) } |