diff options
author | Phil Hughes <me@iamphill.com> | 2017-12-14 11:31:50 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-12-14 11:31:50 +0000 |
commit | 9c132216b74258d900d7bbfb88f158d53ede90b7 (patch) | |
tree | e78aff2b05cabd499ce820809a09343a6e24472c /spec | |
parent | 7d2affeff1885fb9984fed1088c8dffdc41a7320 (diff) | |
download | gitlab-ce-9c132216b74258d900d7bbfb88f158d53ede90b7.tar.gz |
spec fixes
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/tree_helper_spec.rb | 2 | ||||
-rw-r--r-- | spec/views/projects/tree/_blob_item.html.haml_spec.rb | 4 | ||||
-rw-r--r-- | spec/views/projects/tree/show.html.haml_spec.rb | 2 |
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) |