Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/finders/projects_finder_spec.rb')
-rw-r--r--spec/finders/projects_finder_spec.rb46
1 files changed, 9 insertions, 37 deletions
diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb
index 1fa2a975ec3..02153715eac 100644
--- a/spec/finders/projects_finder_spec.rb
+++ b/spec/finders/projects_finder_spec.rb
@@ -350,43 +350,6 @@ RSpec.describe ProjectsFinder do
end
end
- describe 'filter by without_deleted' do
- let_it_be(:pending_delete_project) { create(:project, :public, pending_delete: true) }
-
- let(:params) { { without_deleted: without_deleted } }
-
- shared_examples 'returns all projects' do
- it { expect(subject).to include(public_project, internal_project, pending_delete_project) }
- end
-
- context 'when without_deleted is true' do
- let(:without_deleted) { true }
-
- it 'returns projects that are not pending_delete' do
- expect(subject).not_to include(pending_delete_project)
- expect(subject).to include(public_project, internal_project)
- end
- end
-
- context 'when without_deleted is false' do
- let(:without_deleted) { false }
-
- it_behaves_like 'returns all projects'
- end
-
- context 'when without_deleted is nil' do
- let(:without_deleted) { nil }
-
- it_behaves_like 'returns all projects'
- end
-
- context 'when without_deleted is not present' do
- let(:params) { {} }
-
- it_behaves_like 'returns all projects'
- end
- end
-
describe 'filter by last_activity_after' do
let(:params) { { last_activity_after: 60.minutes.ago } }
@@ -398,6 +361,15 @@ RSpec.describe ProjectsFinder do
it { is_expected.to match_array([internal_project]) }
end
+ describe 'always filters by without_deleted' do
+ let_it_be(:pending_delete_project) { create(:project, :public, pending_delete: true) }
+
+ it 'returns projects that are not pending_delete' do
+ expect(subject).not_to include(pending_delete_project)
+ expect(subject).to include(public_project, internal_project)
+ end
+ end
+
describe 'filter by last_activity_before' do
let(:params) { { last_activity_before: 60.minutes.ago } }