Add latest changes from gitlab-org/gitlab@master

1 files changed, 33 insertions, 0 deletions

diff --git a/spec/features/ide/user_commits_changes_spec.rb b/spec/features/ide/user_commits_changes_spec.rb
new file mode 100644
index 00000000000..f53abde1523
--- /dev/null
+++ b/spec/features/ide/user_commits_changes_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'IDE user commits changes', :js do
+  include WebIdeSpecHelpers
+
+  let(:project) { create(:project, :public, :repository) }
+  let(:user) { project.owner }
+
+  before do
+    sign_in(user)
+
+    ide_visit(project)
+  end
+
+  it 'user updates nested files' do
+    content = <<~HEREDOC
+      Lorem ipsum
+      Dolar sit
+      Amit
+    HEREDOC
+
+    ide_create_new_file('foo/bar/lorem_ipsum.md', content: content)
+    ide_delete_file('foo/bar/.gitkeep')
+
+    ide_commit
+
+    expect(page).to have_content('All changes are committed')
+    expect(project.repository.blob_at('master', 'foo/bar/.gitkeep')).to be_nil
+    expect(project.repository.blob_at('master', 'foo/bar/lorem_ipsum.md').data).to eql(content)
+  end
+end