root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

spec fixes

This commit is contained in:
Phil Hughes 2017-12-14 11:31:50 +00:00
parent 7d2affeff1
commit 9c132216b7
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/helpers/tree_helper_spec.rb
View File

@ -9,7 +9,7 @@ describe TreeHelper do
before do before do
@id = sha @id = sha
@project = project @project = project
@lfs_blobs = [] @lfs_blob_ids = []
end end
it 'displays all entries without a warning' do it 'displays all entries without a warning' do

4
spec/views/projects/tree/_blob_item.html.haml_spec.rb
View File

@ -9,7 +9,7 @@ describe 'projects/tree/_blob_item' do
assign(:project, project) assign(:project, project)
assign(:repository, repository) assign(:repository, repository)
assign(:id, File.join('master', '')) assign(:id, File.join('master', ''))
assign(:lfs_blobs, []) assign(:lfs_blob_ids, [])
end end
it 'renders blob item' do it 'renders blob item' do
@ -21,7 +21,7 @@ describe 'projects/tree/_blob_item' do
describe 'LFS blob' do describe 'LFS blob' do
before do before do
assign(:lfs_blobs, [blob_item]) assign(:lfs_blob_ids, [blob_item].map(&:id))
render_partial(blob_item) render_partial(blob_item)
end end

2
spec/views/projects/tree/show.html.haml_spec.rb
View File

@ -9,7 +9,7 @@ describe 'projects/tree/show' do
before do before do
assign(:project, project) assign(:project, project)
assign(:repository, repository) assign(:repository, repository)
assign(:lfs_blobs, []) assign(:lfs_blob_ids, [])
allow(view).to receive(:can?).and_return(true) allow(view).to receive(:can?).and_return(true)
allow(view).to receive(:can_collaborate_with_project?).and_return(true) allow(view).to receive(:can_collaborate_with_project?).and_return(true)