diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 18:17:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 18:17:13 +0300 |
commit | 4bdfcf93f224edb9c4daff90d95b0c6c92766ea3 (patch) | |
tree | cedf1f94561571d00033c48846ad3959af64449b /spec/features | |
parent | fb5d3cceb8d43f8c2dc22a5d8c74327e9397f2e8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues/user_bulk_edits_issues_labels_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/issues/user_bulk_edits_issues_spec.rb | 14 | ||||
-rw-r--r-- | spec/features/merge_requests/user_mass_updates_spec.rb | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/spec/features/issues/user_bulk_edits_issues_labels_spec.rb b/spec/features/issues/user_bulk_edits_issues_labels_spec.rb index 1fc6609d1f5..a01ae9ae0c2 100644 --- a/spec/features/issues/user_bulk_edits_issues_labels_spec.rb +++ b/spec/features/issues/user_bulk_edits_issues_labels_spec.rb @@ -406,7 +406,7 @@ RSpec.describe 'Issues > Labels bulk assignment', feature_category: :team_planni context 'cannot bulk assign labels' do it do - expect(page).not_to have_button 'Edit issues' + expect(page).not_to have_button 'Bulk edit' expect(page).not_to have_unchecked_field 'Select all' expect(page).not_to have_unchecked_field issue1.title end @@ -462,7 +462,7 @@ RSpec.describe 'Issues > Labels bulk assignment', feature_category: :team_planni def enable_bulk_update visit project_issues_path(project) wait_for_requests - click_button 'Edit issues' + click_button 'Bulk edit' end def disable_bulk_update diff --git a/spec/features/issues/user_bulk_edits_issues_spec.rb b/spec/features/issues/user_bulk_edits_issues_spec.rb index 5696bde4069..3e119d86c05 100644 --- a/spec/features/issues/user_bulk_edits_issues_spec.rb +++ b/spec/features/issues/user_bulk_edits_issues_spec.rb @@ -16,7 +16,7 @@ RSpec.describe 'Multiple issue updating from issues#index', :js, feature_categor it 'sets to closed', :js do visit project_issues_path(project) - click_button 'Edit issues' + click_button 'Bulk edit' check 'Select all' click_button 'Select status' click_button 'Closed' @@ -29,7 +29,7 @@ RSpec.describe 'Multiple issue updating from issues#index', :js, feature_categor create_closed visit project_issues_path(project, state: 'closed') - click_button 'Edit issues' + click_button 'Bulk edit' check 'Select all' click_button 'Select status' click_button 'Open' @@ -43,7 +43,7 @@ RSpec.describe 'Multiple issue updating from issues#index', :js, feature_categor it 'updates to current user' do visit project_issues_path(project) - click_button 'Edit issues' + click_button 'Bulk edit' check 'Select all' click_update_assignee_button click_button user.username @@ -61,7 +61,7 @@ RSpec.describe 'Multiple issue updating from issues#index', :js, feature_categor expect(find('.issue:first-of-type')).to have_link "Assigned to #{user.name}" - click_button 'Edit issues' + click_button 'Bulk edit' check 'Select all' click_update_assignee_button click_button 'Unassigned' @@ -77,7 +77,7 @@ RSpec.describe 'Multiple issue updating from issues#index', :js, feature_categor it 'updates milestone' do visit project_issues_path(project) - click_button 'Edit issues' + click_button 'Bulk edit' check 'Select all' click_button 'Select milestone' click_button milestone.title @@ -94,7 +94,7 @@ RSpec.describe 'Multiple issue updating from issues#index', :js, feature_categor expect(find('.issue:first-of-type')).to have_text milestone.title - click_button 'Edit issues' + click_button 'Bulk edit' check 'Select all' click_button 'Select milestone' click_button 'No milestone' @@ -110,7 +110,7 @@ RSpec.describe 'Multiple issue updating from issues#index', :js, feature_categor it 'after selecting all issues, unchecking one issue only unselects that one issue' do visit project_issues_path(project) - click_button 'Edit issues' + click_button 'Bulk edit' check 'Select all' uncheck issue.title diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb index b0be76d386a..45d57cf8374 100644 --- a/spec/features/merge_requests/user_mass_updates_spec.rb +++ b/spec/features/merge_requests/user_mass_updates_spec.rb @@ -44,7 +44,7 @@ RSpec.describe 'Merge requests > User mass updates', :js, feature_category: :cod merge_request.close visit project_merge_requests_path(project, state: 'merged') - click_button 'Edit merge requests' + click_button 'Bulk edit' expect(page).not_to have_button 'Select status' end @@ -108,7 +108,7 @@ RSpec.describe 'Merge requests > User mass updates', :js, feature_category: :cod end def change_status(text) - click_button 'Edit merge requests' + click_button 'Bulk edit' check 'Select all' click_button 'Select status' click_button text @@ -116,7 +116,7 @@ RSpec.describe 'Merge requests > User mass updates', :js, feature_category: :cod end def change_assignee(text) - click_button 'Edit merge requests' + click_button 'Bulk edit' check 'Select all' within 'aside[aria-label="Bulk update"]' do click_button 'Select assignee' @@ -127,7 +127,7 @@ RSpec.describe 'Merge requests > User mass updates', :js, feature_category: :cod end def change_milestone(text) - click_button 'Edit merge requests' + click_button 'Bulk edit' check 'Select all' click_button 'Select milestone' click_button text |