Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 33 insertions, 3 deletions

diff --git a/spec/controllers/dashboard/projects_controller_spec.rb b/spec/controllers/dashboard/projects_controller_spec.rb
index 1e1d9519f78..2719b7c8a24 100644
--- a/spec/controllers/dashboard/projects_controller_spec.rb
+++ b/spec/controllers/dashboard/projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Dashboard::ProjectsController do
+RSpec.describe Dashboard::ProjectsController, :aggregate_failures do
   include ExternalAuthorizationServiceHelpers
 
   let_it_be(:user) { create(:user) }
@@ -15,6 +15,7 @@ RSpec.describe Dashboard::ProjectsController do
     context 'user logged in' do
       let_it_be(:project) { create(:project) }
       let_it_be(:project2) { create(:project) }
+      let(:projects) { [project, project2] }
 
       before_all do
         project.add_developer(user)
@@ -41,7 +42,7 @@ RSpec.describe Dashboard::ProjectsController do
 
         get :index
 
-        expect(assigns(:projects)).to eq([project, project2])
+        expect(assigns(:projects)).to eq(projects)
       end
 
       context 'project sorting' do
@@ -66,6 +67,20 @@ RSpec.describe Dashboard::ProjectsController do
           it_behaves_like 'search and sort parameters', sort
         end
       end
+
+      context 'with deleted project' do
+        let!(:pending_delete_project) do
+          project.tap { |p| p.update!(pending_delete: true) }
+        end
+
+        it 'does not display deleted project' do
+          get :index
+          projects_result = assigns(:projects)
+
+          expect(projects_result).not_to include(pending_delete_project)
+          expect(projects_result).to include(project2)
+        end
+      end
     end
   end
 
@@ -153,7 +168,7 @@ RSpec.describe Dashboard::ProjectsController do
           project.add_developer(user)
         end
 
-        it 'renders all kinds of event without error', :aggregate_failures do
+        it 'renders all kinds of event without error' do
           get :index, format: :atom
 
           expect(assigns(:events)).to include(design_event, wiki_page_event, issue_event)
@@ -165,6 +180,21 @@ RSpec.describe Dashboard::ProjectsController do
             "closed issue #{issue.to_reference}"
           )
         end
+
+        context 'with deleted project' do
+          let(:pending_deleted_project) { projects.last.tap { |p| p.update!(pending_delete: true) } }
+
+          before do
+            pending_deleted_project.add_developer(user)
+          end
+
+          it 'does not display deleted project' do
+            get :index, format: :atom
+
+            expect(response.body).not_to include(pending_deleted_project.full_name)
+            expect(response.body).to include(project.full_name)
+          end
+        end
       end
     end
   end