1 files changed, 13 insertions, 6 deletions
diff --git a/spec/features/projects/user_edits_files_spec.rb b/spec/features/projects/user_edits_files_spec.rb
index 2798041fa0c..d26ee653415 100644
--- a/spec/features/projects/user_edits_files_spec.rb
+++ b/spec/features/projects/user_edits_files_spec.rb
@@ -18,11 +18,12 @@ describe 'User edits files' do
       visit(project_tree_path_root_ref)
     end
 
-    it 'inserts a content of a file', js: true do
+    it 'inserts a content of a file', :js do
       click_link('.gitignore')
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
 
       expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca')
@@ -35,11 +36,12 @@ describe 'User edits files' do
       expect(page).not_to have_link('edit')
     end
 
-    it 'commits an edited file', js: true do
+    it 'commits an edited file', :js do
       click_link('.gitignore')
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
       fill_in(:commit_message, with: 'New commit message', visible: true)
       click_button('Commit changes')
@@ -51,12 +53,13 @@ describe 'User edits files' do
       expect(page).to have_content('*.rbca')
     end
 
-    it 'commits an edited file to a new branch', js: true do
+    it 'commits an edited file to a new branch', :js do
       click_link('.gitignore')
       find('.js-edit-blob').click
 
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
       fill_in(:commit_message, with: 'New commit message', visible: true)
       fill_in(:branch_name, with: 'new_branch_name', visible: true)
@@ -69,11 +72,12 @@ describe 'User edits files' do
       expect(page).to have_content('*.rbca')
     end
 
-    it 'shows the diff of an edited file', js: true do
+    it 'shows the diff of an edited file', :js do
       click_link('.gitignore')
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
       click_link('Preview changes')
 
@@ -87,7 +91,7 @@ describe 'User edits files' do
       visit(project2_tree_path_root_ref)
     end
 
-    it 'inserts a content of a file in a forked project', js: true do
+    it 'inserts a content of a file in a forked project', :js do
       click_link('.gitignore')
       find('.js-edit-blob').click
 
@@ -103,12 +107,13 @@ describe 'User edits files' do
 
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
 
       expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca')
     end
 
-    it 'commits an edited file in a forked project', js: true do
+    it 'commits an edited file in a forked project', :js do
       click_link('.gitignore')
       find('.js-edit-blob').click
 
@@ -119,6 +124,7 @@ describe 'User edits files' do
 
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
       fill_in(:commit_message, with: 'New commit message', visible: true)
       click_button('Commit changes')
@@ -145,6 +151,7 @@ describe 'User edits files' do
         expect(page).not_to have_link('Fork')
         expect(page).not_to have_button('Cancel')
 
+        find('#editor')
         execute_script("ace.edit('editor').setValue('*.rbca')")
         fill_in(:commit_message, with: 'Another commit', visible: true)
         click_button('Commit changes')