summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spec/helpers/tree_helper_spec.rb2
-rw-r--r--spec/views/projects/tree/_blob_item.html.haml_spec.rb4
-rw-r--r--spec/views/projects/tree/show.html.haml_spec.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/helpers/tree_helper_spec.rb b/spec/helpers/tree_helper_spec.rb
index c6ee06ef8d7..d3b1be599dd 100644
--- a/spec/helpers/tree_helper_spec.rb
+++ b/spec/helpers/tree_helper_spec.rb
@@ -9,7 +9,7 @@ describe TreeHelper do
before do
@id = sha
@project = project
- @lfs_blobs = []
+ @lfs_blob_ids = []
end
it 'displays all entries without a warning' do
diff --git a/spec/views/projects/tree/_blob_item.html.haml_spec.rb b/spec/views/projects/tree/_blob_item.html.haml_spec.rb
index 8fb89851a60..6a477c712ff 100644
--- a/spec/views/projects/tree/_blob_item.html.haml_spec.rb
+++ b/spec/views/projects/tree/_blob_item.html.haml_spec.rb
@@ -9,7 +9,7 @@ describe 'projects/tree/_blob_item' do
assign(:project, project)
assign(:repository, repository)
assign(:id, File.join('master', ''))
- assign(:lfs_blobs, [])
+ assign(:lfs_blob_ids, [])
end
it 'renders blob item' do
@@ -21,7 +21,7 @@ describe 'projects/tree/_blob_item' do
describe 'LFS blob' do
before do
- assign(:lfs_blobs, [blob_item])
+ assign(:lfs_blob_ids, [blob_item].map(&:id))
render_partial(blob_item)
end
diff --git a/spec/views/projects/tree/show.html.haml_spec.rb b/spec/views/projects/tree/show.html.haml_spec.rb
index 9769f28e546..44b32df0395 100644
--- a/spec/views/projects/tree/show.html.haml_spec.rb
+++ b/spec/views/projects/tree/show.html.haml_spec.rb
@@ -9,7 +9,7 @@ describe 'projects/tree/show' do
before do
assign(:project, project)
assign(:repository, repository)
- assign(:lfs_blobs, [])
+ assign(:lfs_blob_ids, [])
allow(view).to receive(:can?).and_return(true)
allow(view).to receive(:can_collaborate_with_project?).and_return(true)