diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 12:08:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 12:08:09 +0000 |
commit | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (patch) | |
tree | 64f91b4d4ca74aa09d2a62ac5910820d087ed7cb /spec/views/projects/tree | |
parent | 6044caed20964a70c1ac6c5a3365d567ed96dfde (diff) | |
download | gitlab-ce-0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views/projects/tree')
-rw-r--r-- | spec/views/projects/tree/_tree_row.html.haml_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/views/projects/tree/_tree_row.html.haml_spec.rb b/spec/views/projects/tree/_tree_row.html.haml_spec.rb index ff2fe8aeb6c..864272fc146 100644 --- a/spec/views/projects/tree/_tree_row.html.haml_spec.rb +++ b/spec/views/projects/tree/_tree_row.html.haml_spec.rb @@ -5,7 +5,11 @@ require 'spec_helper' describe 'projects/tree/_tree_row' do let(:project) { create(:project, :repository) } let(:repository) { project.repository } + + # rubocop: disable Rails/FindBy + # This is not ActiveRecord where..first let(:blob_item) { Gitlab::Git::Tree.where(repository, SeedRepo::Commit::ID, 'files/ruby').first } + # rubocop: enable Rails/FindBy before do assign(:project, project) |