Remove Namespace model default scope override and write additional test to Project searchrefactor-namespace-default-scope-override

2 files changed, 11 insertions, 3 deletions

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index efbed5a2ef5..743e0513e02 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -1,5 +1,5 @@
 class Namespace < ActiveRecord::Base
-  acts_as_paranoid
+  acts_as_paranoid without_default_scope: true
 
   include CacheMarkdownField
   include Sortable
@@ -47,8 +47,6 @@ class Namespace < ActiveRecord::Base
   before_destroy(prepend: true) { prepare_for_destroy }
   after_destroy :rm_dir
 
-  default_scope { with_deleted }
-
   scope :for_user, -> { where('type IS NULL') }
 
   scope :with_statistics, -> do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index ff4fe7f7e03..a807c3e6164 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1170,6 +1170,16 @@ describe Project, models: true do
 
       expect(relation.search(project.namespace.name)).to eq([project])
     end
+
+    describe 'with pending_delete project' do
+      let(:pending_delete_project) { create(:empty_project, pending_delete: true) }
+
+      it 'shows pending deletion project' do
+        search_result = described_class.search(pending_delete_project.name)
+
+        expect(search_result).to eq([pending_delete_project])
+      end
+    end
   end
 
   describe '#rename_repo' do