3 files changed, 17 insertions, 3 deletions
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb
index 9e58280b868..2cb2a23b7be 100644
--- a/spec/features/projects/tree/create_directory_spec.rb
+++ b/spec/features/projects/tree/create_directory_spec.rb
@@ -43,7 +43,7 @@ describe 'Multi-file editor new directory', :js do
     find('.js-ide-commit-mode').click
 
     find('.multi-file-commit-list-item').hover
-    first('.multi-file-discard-btn .btn').click
+    click_button 'Stage'
 
     fill_in('commit-message', with: 'commit message ide')
 
diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb
index a04d3566a7e..9f5524da8e9 100644
--- a/spec/features/projects/tree/create_file_spec.rb
+++ b/spec/features/projects/tree/create_file_spec.rb
@@ -35,7 +35,7 @@ describe 'Multi-file editor new file', :js do
     find('.js-ide-commit-mode').click
 
     find('.multi-file-commit-list-item').hover
-    first('.multi-file-discard-btn .btn').click
+    click_button 'Stage'
 
     fill_in('commit-message', with: 'commit message ide')
 
diff --git a/spec/features/projects/tree/tree_show_spec.rb b/spec/features/projects/tree/tree_show_spec.rb
index 8ae036cd29f..45e81e1c040 100644
--- a/spec/features/projects/tree/tree_show_spec.rb
+++ b/spec/features/projects/tree/tree_show_spec.rb
@@ -4,16 +4,30 @@ describe 'Projects tree', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
+  # This commit has a known state on the master branch of gitlab-test
+  let(:test_sha) { '7975be0116940bf2ad4321f79d02a55c5f7779aa' }
+
   before do
     project.add_maintainer(user)
     sign_in(user)
   end
 
   it 'renders tree table without errors' do
-    visit project_tree_path(project, 'master')
+    visit project_tree_path(project, test_sha)
+    wait_for_requests
+
+    expect(page).to have_selector('.tree-item')
+    expect(page).to have_content('add tests for .gitattributes custom highlighting')
+    expect(page).not_to have_selector('.flash-alert')
+    expect(page).not_to have_selector('.label-lfs', text: 'LFS')
+  end
+
+  it 'renders tree table for a subtree without errors' do
+    visit project_tree_path(project, File.join(test_sha, 'files'))
     wait_for_requests
 
     expect(page).to have_selector('.tree-item')
+    expect(page).to have_content('add spaces in whitespace file')
     expect(page).not_to have_selector('.label-lfs', text: 'LFS')
     expect(page).not_to have_selector('.flash-alert')
   end