Commit 2bde3442 authored by Clement Ho's avatar Clement Ho

Merge branch '22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master'

[#22826] Ensure find_file_link and download button is part of file tree header

Closes #22826

See merge request !9847
parents 8fbda3bf d2765b45
......@@ -160,7 +160,6 @@
.tree-controls {
float: right;
margin-top: 11px;
position: relative;
z-index: 2;
......
.tree-controls
= render 'projects/find_file_link'
= render 'projects/buttons/download', project: @project, ref: @ref
.tree-ref-holder
= render 'shared/ref_switcher', destination: 'tree', path: @path
......
......@@ -7,12 +7,4 @@
= render 'projects/last_push'
%div{ class: container_class }
.tree-controls
= render 'projects/find_file_link'
= render 'projects/buttons/download', project: @project, ref: @ref
#tree-holder.tree-holder.clearfix
.nav-block
= render 'projects/tree/tree_header', tree: @tree
= render 'projects/tree/tree_content', tree: @tree
= render 'projects/files'
---
title: Fix UI inconsistency different files view (find file button missing)
merge_request: 9847
author: TM Lee
require 'spec_helper'
feature 'Find files button in the tree header', feature: true do
given(:user) { create(:user) }
given(:project) { create(:project) }
background do
login_as(user)
project.team << [user, :developer]
end
scenario 'project main screen' do
visit namespace_project_path(
project.namespace,
project
)
expect(page).to have_selector('.tree-controls .shortcuts-find-file')
end
scenario 'project tree screen' do
visit namespace_project_tree_path(
project.namespace,
project,
project.default_branch
)
expect(page).to have_selector('.tree-controls .shortcuts-find-file')
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment