1 files changed, 15 insertions, 4 deletions
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb
index 2cb2a23b7be..99285011405 100644
--- a/spec/features/projects/tree/create_directory_spec.rb
+++ b/spec/features/projects/tree/create_directory_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Multi-file editor new directory', :js do
@@ -30,10 +32,12 @@ describe 'Multi-file editor new directory', :js do
       click_button('Create directory')
     end
 
+    expect(page).to have_content('folder name')
+
     first('.ide-tree-actions button').click
 
-    page.within('.modal-dialog') do
-      find('.form-control').set('file name')
+    page.within('.modal') do
+      find('.form-control').set('folder name/file name')
 
       click_button('Create file')
     end
@@ -42,12 +46,19 @@ describe 'Multi-file editor new directory', :js do
 
     find('.js-ide-commit-mode').click
 
-    find('.multi-file-commit-list-item').hover
     click_button 'Stage'
 
     fill_in('commit-message', with: 'commit message ide')
 
-    click_button('Commit')
+    find(:css, ".js-ide-commit-new-mr input").set(false)
+
+    wait_for_requests
+
+    page.within '.multi-file-commit-form' do
+      click_button('Commit')
+
+      wait_for_requests
+    end
 
     find('.js-ide-edit-mode').click