diff options
Diffstat (limited to 'spec/features/merge_request')
12 files changed, 18 insertions, 18 deletions
diff --git a/spec/features/merge_request/maintainer_edits_fork_spec.rb b/spec/features/merge_request/maintainer_edits_fork_spec.rb index 7839b97122c..0195d37c515 100644 --- a/spec/features/merge_request/maintainer_edits_fork_spec.rb +++ b/spec/features/merge_request/maintainer_edits_fork_spec.rb @@ -29,7 +29,7 @@ describe 'a maintainer edits files on a source-branch of an MR from a fork', :js end it 'mentions commits will go to the source branch' do - expect(page).to have_content('Your changes can be committed to fix because a merge request is open.') + expect(page).to have_content(_('Your changes can be committed to fix because a merge request is open.')) end it 'allows committing to the source branch' do diff --git a/spec/features/merge_request/user_expands_diff_spec.rb b/spec/features/merge_request/user_expands_diff_spec.rb index 3560b8d90bb..9d1188d2324 100644 --- a/spec/features/merge_request/user_expands_diff_spec.rb +++ b/spec/features/merge_request/user_expands_diff_spec.rb @@ -15,11 +15,11 @@ describe 'User expands diff', :js do it 'allows user to expand diff' do page.within find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd"]') do - click_link 'Click to expand it.' + click_link _('Click to expand it.') wait_for_requests - expect(page).not_to have_content('Click to expand it.') + expect(page).not_to have_content(_('Click to expand it.')) expect(page).to have_selector('.code') end end diff --git a/spec/features/merge_request/user_locks_discussion_spec.rb b/spec/features/merge_request/user_locks_discussion_spec.rb index 76c759ab8d3..4cc3194a3a7 100644 --- a/spec/features/merge_request/user_locks_discussion_spec.rb +++ b/spec/features/merge_request/user_locks_discussion_spec.rb @@ -41,7 +41,7 @@ describe 'Merge request > User locks discussion', :js do page.within('.js-vue-notes-event') do expect(page).not_to have_selector('js-main-target-form') expect(page.find('.issuable-note-warning')) - .to have_content('This merge request is locked. Only project members can comment.') + .to have_content(_('This merge request is locked. Only project members can comment.')) end end end diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb index ee5f5377ca6..7ee4f017495 100644 --- a/spec/features/merge_request/user_posts_notes_spec.rb +++ b/spec/features/merge_request/user_posts_notes_spec.rb @@ -49,16 +49,16 @@ describe 'Merge request > User posts notes', :js do describe 'when posting a note' do before do page.within('.js-main-target-form') do - fill_in 'note[note]', with: 'This is awesome!' + fill_in 'note[note]', with: _('This is awesome!') find('.js-md-preview-button').click click_button 'Comment' end end it 'is added and form reset' do - is_expected.to have_content('This is awesome!') + is_expected.to have_content(_('This is awesome!')) page.within('.js-main-target-form') do - expect(page).to have_no_field('note[note]', with: 'This is awesome!') + expect(page).to have_no_field('note[note]', with: _('This is awesome!')) expect(page).to have_css('.js-vue-md-preview', visible: :hidden) end wait_for_requests diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb index 50c723776a3..fb4220addaf 100644 --- a/spec/features/merge_request/user_resolves_conflicts_spec.rb +++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb @@ -189,7 +189,7 @@ describe 'Merge request > User resolves conflicts', :js do visit current_url + '/conflicts' wait_for_requests - expect(find('#conflicts')).to have_content('Please try to resolve them locally.') + expect(find('#conflicts')).to have_content(_('Please try to resolve them locally.')) end end end diff --git a/spec/features/merge_request/user_reverts_merge_request_spec.rb b/spec/features/merge_request/user_reverts_merge_request_spec.rb index 67b6aefb2d8..b11b9708a2e 100644 --- a/spec/features/merge_request/user_reverts_merge_request_spec.rb +++ b/spec/features/merge_request/user_reverts_merge_request_spec.rb @@ -26,7 +26,7 @@ describe 'User reverts a merge request', :js do click_button('Revert') end - expect(page).to have_content('The merge request has been successfully reverted.') + expect(page).to have_content(_('The merge request has been successfully reverted.')) wait_for_requests end @@ -56,7 +56,7 @@ describe 'User reverts a merge request', :js do click_button('Revert') end - expect(page).to have_content('The merge request has been successfully reverted. You can now submit a merge request to get this change into the original branch.') + expect(page).to have_content(_('The merge request has been successfully reverted. You can now submit a merge request to get this change into the original branch.')) end it 'cannot revert a merge requests for an archived project' do diff --git a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb index f6b771facf8..24de4517528 100644 --- a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb +++ b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb @@ -19,7 +19,7 @@ describe 'Merge request > User sees merge button depending on unresolved discuss context 'with unresolved discussions' do it 'does not allow to merge' do expect(page).not_to have_button 'Merge' - expect(page).to have_content('There are unresolved discussions.') + expect(page).to have_content(_('There are unresolved discussions.')) end end diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index afb978d7c45..4729b7a3b8e 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -180,7 +180,7 @@ describe 'Merge request > User sees merge widget', :js do # Wait for the `ci_status` and `merge_check` requests wait_for_requests - expect(page).to have_text("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.") + expect(page).to have_text(_("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.")) end end diff --git a/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb b/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb index fd4175d5227..313d0bfbf86 100644 --- a/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb +++ b/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb @@ -15,7 +15,7 @@ describe 'Merge request > User sees MR with deleted source branch', :js do end it 'shows a message about missing source branch' do - expect(page).to have_content('Source branch does not exist.') + expect(page).to have_content(_('Source branch does not exist.')) end it 'still contains Discussion, Commits and Changes tabs' do @@ -29,6 +29,6 @@ describe 'Merge request > User sees MR with deleted source branch', :js do wait_for_requests expect(page).to have_selector('.diffs.tab-pane .file-holder') - expect(page).to have_content('Source branch does not exist.') + expect(page).to have_content(_('Source branch does not exist.')) end end diff --git a/spec/features/merge_request/user_sees_pipelines_spec.rb b/spec/features/merge_request/user_sees_pipelines_spec.rb index 8faddee4daa..a450f658c57 100644 --- a/spec/features/merge_request/user_sees_pipelines_spec.rb +++ b/spec/features/merge_request/user_sees_pipelines_spec.rb @@ -41,7 +41,7 @@ describe 'Merge request > User sees pipelines', :js do visit project_merge_request_path(project, merge_request) wait_for_requests - expect(page.find('.ci-widget')).to have_text("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.") + expect(page.find('.ci-widget')).to have_text(_("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.")) end end diff --git a/spec/features/merge_request/user_uses_quick_actions_spec.rb b/spec/features/merge_request/user_uses_quick_actions_spec.rb index b81478a481f..3289ade4ea1 100644 --- a/spec/features/merge_request/user_uses_quick_actions_spec.rb +++ b/spec/features/merge_request/user_uses_quick_actions_spec.rb @@ -106,7 +106,7 @@ describe 'Merge request > User uses quick actions', :js do it 'does not merge the MR' do add_note("/merge") - expect(page).not_to have_content 'Your commands have been executed!' + expect(page).not_to have_content _('Your commands have been executed!') expect(merge_request.reload).not_to be_merged end @@ -122,7 +122,7 @@ describe 'Merge request > User uses quick actions', :js do it 'does not merge the MR' do add_note("/merge") - expect(page).not_to have_content 'Your commands have been executed!' + expect(page).not_to have_content _('Your commands have been executed!') expect(merge_request.reload).not_to be_merged end diff --git a/spec/features/merge_request/user_views_open_merge_request_spec.rb b/spec/features/merge_request/user_views_open_merge_request_spec.rb index 71022c6bb08..0176469b101 100644 --- a/spec/features/merge_request/user_views_open_merge_request_spec.rb +++ b/spec/features/merge_request/user_views_open_merge_request_spec.rb @@ -43,7 +43,7 @@ describe 'User views an open merge request' do page.within('.gfm-form') do click_button('Preview') - expect(find('.js-md-preview')).to have_content('Nothing to preview.') + expect(find('.js-md-preview')).to have_content(_('Nothing to preview.')) end end |