Commit 91157782 authored by Rémy Coutable's avatar Rémy Coutable Committed by Jan Provaznik

Merge branch 'ml-qa-code-owners' into 'master'

QA: Add support for pushing and viewing files

See merge request gitlab-org/gitlab-ce!21911
parent 59613191
.tree-content-holder.js-tree-content{ 'data-logs-path': @logs_path }
.table-holder
%table.table#tree-slider{ class: "table_#{@hex_path} tree-table" }
%table.table#tree-slider{ class: "table_#{@hex_path} tree-table qa-file-tree" }
%thead
%tr
%th= s_('ProjectFileTree|Name')
......
......@@ -30,6 +30,14 @@ module QA
@directory = dir
end
def files=(files)
if !files.is_a?(Array) || files.empty?
raise ArgumentError, "Please provide an array of hashes e.g.: [{name: 'file1', content: 'foo'}]"
end
@files = files
end
def fabricate!
Git::Repository.perform do |repository|
if ssh_key
......@@ -63,6 +71,10 @@ module QA
@directory.each_child do |f|
repository.add_file(f.basename, f.read) if f.file?
end
elsif @files
@files.each do |f|
repository.add_file(f[:name], f[:content])
end
else
repository.add_file(file_name, file_content)
end
......
......@@ -35,6 +35,10 @@ module QA
element :new_file_button, "_('New file'),"
end
view 'app/views/projects/tree/_tree_content.html.haml' do
element :file_tree
end
def project_name
find('.qa-project-name').text
end
......@@ -43,6 +47,12 @@ module QA
click_on 'New file'
end
def go_to_file(filename)
within_element(:file_tree) do
click_on filename
end
end
def switch_to_branch(branch_name)
find_element(:branches_select).click
......
# frozen_string_literal: true
describe QA::Factory::Repository::Push do
describe '.files=' do
let(:files) do
[
{
name: 'file.txt',
content: 'foo'
}
]
end
it 'raises an error if files is not an array' do
expect { subject.files = '' }.to raise_error(ArgumentError)
end
it 'raises an error if files is an empty array' do
expect { subject.files = [] }.to raise_error(ArgumentError)
end
it 'does not raise if files is an array' do
expect { subject.files = files }.not_to raise_error
end
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