From f3352dd3f1ca21de0b489a97bae45e2e7043e207 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 18 Sep 2020 21:10:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/projects/blobs/edit_spec.rb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'spec/features/projects/blobs/edit_spec.rb') diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb index 5aca994f53e..3949c70e718 100644 --- a/spec/features/projects/blobs/edit_spec.rb +++ b/spec/features/projects/blobs/edit_spec.rb @@ -23,6 +23,19 @@ RSpec.describe 'Editing file blob', :js do def edit_and_commit(commit_changes: true) wait_for_requests find('.js-edit-blob').click + + fill_and_commit(commit_changes) + end + + def mr_edit_and_commit(commit_changes: true) + wait_for_requests + find('[data-testid="edit_file"]').click + click_link 'Edit in single-file editor' + + fill_and_commit(commit_changes) + end + + def fill_and_commit(commit_changes) fill_editor(content: 'class NextFeature\\nend\\n') if commit_changes @@ -38,7 +51,7 @@ RSpec.describe 'Editing file blob', :js do context 'from MR diff' do before do visit diffs_project_merge_request_path(project, merge_request) - edit_and_commit + mr_edit_and_commit end it 'returns me to the mr' do -- cgit v1.2.1