Add latest changes from gitlab-org/gitlab@master

1 files changed, 30 insertions, 0 deletions

diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 5259c612bbd..9ae1277de26 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -289,6 +289,36 @@ describe ProjectsController do
           .not_to exceed_query_limit(2).for_query(expected_query)
       end
     end
+
+    context 'lfs_blob_ids instance variable' do
+      let(:project) { create(:project, :public, :repository) }
+
+      before do
+        sign_in(user)
+      end
+
+      context 'with vue tree view enabled' do
+        before do
+          get :show, params: { namespace_id: project.namespace, id: project }
+        end
+
+        it 'is not set' do
+          expect(assigns[:lfs_blob_ids]).to be_nil
+        end
+      end
+
+      context 'with vue tree view disabled' do
+        before do
+          stub_feature_flags(vue_file_list: false)
+
+          get :show, params: { namespace_id: project.namespace, id: project }
+        end
+
+        it 'is set' do
+          expect(assigns[:lfs_blob_ids]).not_to be_nil
+        end
+      end
+    end
   end
 
   describe 'GET edit' do