Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 14 deletions

diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb
index 3949c70e718..90d9263b515 100644
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
@@ -20,22 +20,14 @@ RSpec.describe 'Editing file blob', :js do
       sign_in(user)
     end
 
-    def edit_and_commit(commit_changes: true)
+    def edit_and_commit(commit_changes: true, is_diff: false)
       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
+      if is_diff
+        first('.js-diff-more-actions').click
+      end
 
-    def fill_and_commit(commit_changes)
+      first('.js-edit-blob').click
       fill_editor(content: 'class NextFeature\\nend\\n')
 
       if commit_changes
@@ -51,7 +43,7 @@ RSpec.describe 'Editing file blob', :js do
     context 'from MR diff' do
       before do
         visit diffs_project_merge_request_path(project, merge_request)
-        mr_edit_and_commit
+        edit_and_commit(is_diff: true)
       end
 
       it 'returns me to the mr' do