diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-21 12:10:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-21 12:10:16 +0300 |
commit | 34ad6d995bcab9f88a236bfed15aebdad76df960 (patch) | |
tree | 4e47f30ed36fbdebd15933b10a04b80ae98f0475 /spec/features | |
parent | 1cf90c700837637f7989bda8fe81c616f19e8150 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
4 files changed, 8 insertions, 14 deletions
diff --git a/spec/features/issues/csv_spec.rb b/spec/features/issues/csv_spec.rb index d41a41c4383..51e0d54ca5e 100644 --- a/spec/features/issues/csv_spec.rb +++ b/spec/features/issues/csv_spec.rb @@ -16,9 +16,7 @@ RSpec.describe 'Issues csv', :js do def request_csv(params = {}) visit project_issues_path(project, params) - page.within('.nav-controls') do - find('[data-testid="export-csv-button"]').click - end + click_button 'Export as CSV' click_on 'Export issues' end diff --git a/spec/features/issues/user_resets_their_incoming_email_token_spec.rb b/spec/features/issues/user_resets_their_incoming_email_token_spec.rb index 2b1c25174c2..9e47639d80f 100644 --- a/spec/features/issues/user_resets_their_incoming_email_token_spec.rb +++ b/spec/features/issues/user_resets_their_incoming_email_token_spec.rb @@ -16,11 +16,11 @@ RSpec.describe 'Issues > User resets their incoming email token' do end it 'changes incoming email address token', :js do - page.find('[data-testid="issuable-email-modal-btn"]').click + click_button 'Email a new issue to this project' page.within '#issuable-email-modal' do previous_token = page.find('input[type="text"]').value - page.find('[data-testid="incoming-email-token-reset"]').click + click_button 'reset it' wait_for_requests diff --git a/spec/features/merge_requests/user_exports_as_csv_spec.rb b/spec/features/merge_requests/user_exports_as_csv_spec.rb index 725b8366d04..351e714b612 100644 --- a/spec/features/merge_requests/user_exports_as_csv_spec.rb +++ b/spec/features/merge_requests/user_exports_as_csv_spec.rb @@ -12,15 +12,9 @@ RSpec.describe 'Merge Requests > Exports as CSV', :js do visit(project_merge_requests_path(project)) end - subject { page.find('.nav-controls') } - - it { is_expected.to have_selector '[data-testid="export-csv-button"]' } - context 'button is clicked' do before do - page.within('.nav-controls') do - find('[data-testid="export-csv-button"]').click - end + click_button 'Export as CSV' end it 'shows a success message' do diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb index bf90e86c263..862bae45fc6 100644 --- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb @@ -116,7 +116,8 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do click_on('Save changes') end - find('.flash-notice') + wait_for_all_requests + checkbox = find_field('project_printing_merge_request_link_enabled') expect(checkbox).not_to be_checked @@ -139,7 +140,8 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do click_on('Save changes') end - find('.flash-notice') + wait_for_all_requests + checkbox = find_field('project_remove_source_branch_after_merge') expect(checkbox).not_to be_checked |